comparison client.c @ 502:9aa3d06199cb

applied Jukkas patch
author Anselm R. Garbe <arg@10kloc.org>
date Thu, 28 Sep 2006 14:03:39 +0200
parents d5ad819f2a66
children 2b4bd49fc155
comparison
equal deleted inserted replaced
501:a067c5550e6f 502:9aa3d06199cb
212 c->th = bh; 212 c->th = bh;
213 213
214 c->border = 0; 214 c->border = 0;
215 updatesize(c); 215 updatesize(c);
216 216
217 if(c->x + c->w + 2 > sw) 217 if(c->x + c->w + 2 * BORDERPX > sw)
218 c->x = sw - c->w - 2; 218 c->x = sw - c->w - 2 * BORDERPX;
219 if(c->x < 0) 219 if(c->x < 0)
220 c->x = 0; 220 c->x = 0;
221 if(c->y + c->h + 2 > sh) 221 if(c->y + c->h + 2 * BORDERPX > sh)
222 c->y = sh - c->h - 2; 222 c->y = sh - c->h - 2;
223 if(c->h != sh && c->y < bh) 223 if(c->h != sh && c->y < bh)
224 c->y = bh; 224 c->y = bh;
225 225
226 c->proto = getproto(c->win); 226 c->proto = getproto(c->win);
300 wc.width = c->w; 300 wc.width = c->w;
301 wc.height = c->h; 301 wc.height = c->h;
302 if(c->w == sw && c->h == sh) 302 if(c->w == sw && c->h == sh)
303 wc.border_width = 0; 303 wc.border_width = 0;
304 else 304 else
305 wc.border_width = 1; 305 wc.border_width = BORDERPX;
306 XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); 306 XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
307 configure(c); 307 configure(c);
308 XSync(dpy, False); 308 XSync(dpy, False);
309 } 309 }
310 310
311 void 311 void
312 resizetitle(Client *c) { 312 resizetitle(Client *c) {
313 c->tw = textw(c->name); 313 c->tw = textw(c->name);
314 if(c->tw > c->w) 314 if(c->tw > c->w)
315 c->tw = c->w + 2; 315 c->tw = c->w + 2 * BORDERPX;
316 c->tx = c->x + c->w - c->tw + 2; 316 c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
317 c->ty = c->y; 317 c->ty = c->y;
318 if(isvisible(c)) 318 if(isvisible(c))
319 XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th); 319 XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
320 else 320 else
321 XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th); 321 XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);