git.stevedylan.dev

removed bx and bw, unnecessary 32c50466

Anselm R Garbe · 2008-05-26 10:28 1 file(s) · +8 −10

dwm.c +8 −10

/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
int bx, by, bw, bh, blw, wx, wy, ww, wh;
int by, bh, blw, wx, wy, ww, wh;
uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
uint numlockmask = 0;

	else
		x = dc.x;
	dc.w = TEXTW(stext);
	dc.x = bw - dc.w;
	dc.x = ww - dc.w;
	if(dc.x < x) {
		dc.x = x;
		dc.w = bw - x;
		dc.w = ww - x;
	}
	drawtext(stext, dc.norm, False);
	if((dc.w = dc.x - x) > bh) {

		else
			drawtext(NULL, dc.norm, False);
	}
	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
	XSync(dpy, False);
}


	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, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
			CopyFromParent, DefaultVisual(dpy, screen),
			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
	XDefineCursor(dpy, barwin, cursor[CurNormal]);

updatebar(void) {
	if(dc.drawable != 0)
		XFreePixmap(dpy, dc.drawable);
	dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
	XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
	dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
	XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
}

void

		wh = showbar ? sh - bh : sh;
	}

	/* bar geometry */
	bx = wx;
	/* bar position */
	by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
	bw = ww;
}

void

193	193		/* variables */
194	194		char stext[256];
195	195		int screen, sx, sy, sw, sh;
196		-	int bx, by, bw, bh, blw, wx, wy, ww, wh;
	196	+	int by, bh, blw, wx, wy, ww, wh;
197	197		uint seltags = 0;
198	198		int (xerrorxlib)(Display , XErrorEvent *);
199	199		uint numlockmask = 0;

506	506		else
507	507		x = dc.x;
508	508		dc.w = TEXTW(stext);
509		-	dc.x = bw - dc.w;
	509	+	dc.x = ww - dc.w;
510	510		if(dc.x < x) {
511	511		dc.x = x;
512		-	dc.w = bw - x;
	512	+	dc.w = ww - x;
513	513		}
514	514		drawtext(stext, dc.norm, False);
515	515		if((dc.w = dc.x - x) > bh) {

521	521		else
522	522		drawtext(NULL, dc.norm, False);
523	523		}
524		-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
	524	+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
525	525		XSync(dpy, False);
526	526		}
527	527

1372	1372		wa.background_pixmap = ParentRelative;
1373	1373		wa.event_mask = ButtonPressMask\|ExposureMask;
1374	1374
1375		-	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
	1375	+	barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
1376	1376		CopyFromParent, DefaultVisual(dpy, screen),
1377	1377		CWOverrideRedirect\|CWBackPixmap\|CWEventMask, &wa);
1378	1378		XDefineCursor(dpy, barwin, cursor[CurNormal]);

1567	1567		updatebar(void) {
1568	1568		if(dc.drawable != 0)
1569	1569		XFreePixmap(dpy, dc.drawable);
1570		-	dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
1571		-	XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
	1570	+	dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
	1571	+	XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
1572	1572		}
1573	1573
1574	1574		void

1595	1595		wh = showbar ? sh - bh : sh;
1596	1596		}
1597	1597
1598		-	/* bar geometry */
1599		-	bx = wx;
	1598	+	/* bar position */
1600	1599		by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
1601		-	bw = ww;
1602	1600		}
1603	1601
1604	1602		void