dwm-meillo
changeset 697:4d12382fef8e
removed unnecessary bx, by, bw variables
| author | Anselm R. Garbe <arg@suckless.org> |
|---|---|
| date | Tue, 16 Jan 2007 11:33:42 +0100 |
| parents | b63bc9c26b2f |
| children | e1c8bef05e6e |
| files | draw.c dwm.h main.c |
| diffstat | 3 files changed, 6 insertions(+), 9 deletions(-) [+] |
line diff
1.1 --- a/draw.c Tue Jan 16 11:28:17 2007 +0100 1.2 +++ b/draw.c Tue Jan 16 11:33:42 2007 +0100 1.3 @@ -114,17 +114,17 @@ 1.4 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); 1.5 x = dc.x + dc.w; 1.6 dc.w = textw(stext); 1.7 - dc.x = bw - dc.w; 1.8 + dc.x = sw - dc.w; 1.9 if(dc.x < x) { 1.10 dc.x = x; 1.11 - dc.w = bw - x; 1.12 + dc.w = sw - x; 1.13 } 1.14 drawtext(stext, dc.norm, False, False); 1.15 if((dc.w = dc.x - x) > bh) { 1.16 dc.x = x; 1.17 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); 1.18 } 1.19 - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); 1.20 + XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); 1.21 XSync(dpy, False); 1.22 } 1.23
2.1 --- a/dwm.h Tue Jan 16 11:28:17 2007 +0100 2.2 +++ b/dwm.h Tue Jan 16 11:33:42 2007 +0100 2.3 @@ -90,7 +90,7 @@ 2.4 2.5 extern const char *tags[]; /* all tags */ 2.6 extern char stext[256]; /* status text */ 2.7 -extern int bx, by, bw, bh, bmw; /* bar geometry, bar mode label width */ 2.8 +extern int bh, bmw; /* bar height, bar mode label width */ 2.9 extern int screen, sx, sy, sw, sh; /* screen geometry */ 2.10 extern int wax, way, wah, waw; /* windowarea geometry */ 2.11 extern unsigned int master, nmaster; /* master percent, number of master clients */
3.1 --- a/main.c Tue Jan 16 11:28:17 2007 +0100 3.2 +++ b/main.c Tue Jan 16 11:33:42 2007 +0100 3.3 @@ -19,7 +19,7 @@ 3.4 3.5 char stext[256]; 3.6 Bool *seltag; 3.7 -int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; 3.8 +int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah; 3.9 unsigned int master, nmaster, ntags, numlockmask; 3.10 Atom wmatom[WMLast], netatom[NetLast]; 3.11 Bool running = True; 3.12 @@ -136,14 +136,11 @@ 3.13 nmaster = NMASTER; 3.14 bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); 3.15 /* bar */ 3.16 - bx = sx; 3.17 - by = sy; 3.18 - bw = sw; 3.19 dc.h = bh = dc.font.height + 2; 3.20 wa.override_redirect = 1; 3.21 wa.background_pixmap = ParentRelative; 3.22 wa.event_mask = ButtonPressMask | ExposureMask; 3.23 - barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen), 3.24 + barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen), 3.25 CopyFromParent, DefaultVisual(dpy, screen), 3.26 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); 3.27 XDefineCursor(dpy, barwin, cursor[CurNormal]);