git.stevedylan.dev

removed unnecessary bx, by, bw variables 3c35b90d

Anselm R. Garbe · 2007-01-16 11:33 3 file(s) · +6 −9

draw.c +3 −3

114	114		drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
115	115		x = dc.x + dc.w;
116	116		dc.w = textw(stext);
117		-	dc.x = bw - dc.w;
	117	+	dc.x = sw - dc.w;
118	118		if(dc.x < x) {
119	119		dc.x = x;
120		-	dc.w = bw - x;
	120	+	dc.w = sw - x;
121	121		}
122	122		drawtext(stext, dc.norm, False, False);
123	123		if((dc.w = dc.x - x) > bh) {
124	124		dc.x = x;
125	125		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
126	126		}
127		-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
	127	+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
128	128		XSync(dpy, False);
129	129		}
130	130

dwm.h +1 −1


extern const char *tags[];			/* all tags */
extern char stext[256];				/* status text */
extern int bx, by, bw, bh, bmw;			/* bar geometry, bar mode label width */
extern int bh, bmw;				/* bar height, bar mode label width */
extern int screen, sx, sy, sw, sh;		/* screen geometry */
extern int wax, way, wah, waw;			/* windowarea geometry */
extern unsigned int master, nmaster;		/* master percent, number of master clients */

main.c +2 −5


char stext[256];
Bool *seltag;
int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
unsigned int master, nmaster, ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;

	nmaster = NMASTER;
	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
	/* bar */
	bx = sx;
	by = sy;
	bw = sw;
	dc.h = bh = dc.font.height + 2;
	wa.override_redirect = 1;
	wa.background_pixmap = ParentRelative;
	wa.event_mask = ButtonPressMask | ExposureMask;
	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
			CopyFromParent, DefaultVisual(dpy, screen),
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
	XDefineCursor(dpy, barwin, cursor[CurNormal]);

90	90
91	91		extern const char tags[]; / all tags */
92	92		extern char stext[256]; /* status text */
93		-	extern int bx, by, bw, bh, bmw; /* bar geometry, bar mode label width */
	93	+	extern int bh, bmw; /* bar height, bar mode label width */
94	94		extern int screen, sx, sy, sw, sh; /* screen geometry */
95	95		extern int wax, way, wah, waw; /* windowarea geometry */
96	96		extern unsigned int master, nmaster; /* master percent, number of master clients */

19	19
20	20		char stext[256];
21	21		Bool *seltag;
22		-	int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
	22	+	int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
23	23		unsigned int master, nmaster, ntags, numlockmask;
24	24		Atom wmatom[WMLast], netatom[NetLast];
25	25		Bool running = True;

136	136		nmaster = NMASTER;
137	137		bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
138	138		/* bar */
139		-	bx = sx;
140		-	by = sy;
141		-	bw = sw;
142	139		dc.h = bh = dc.font.height + 2;
143	140		wa.override_redirect = 1;
144	141		wa.background_pixmap = ParentRelative;
145	142		wa.event_mask = ButtonPressMask \| ExposureMask;
146		-	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
	143	+	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
147	144		CopyFromParent, DefaultVisual(dpy, screen),
148	145		CWOverrideRedirect \| CWBackPixmap \| CWEventMask, &wa);
149	146		XDefineCursor(dpy, barwin, cursor[CurNormal]);