applied Gottox patches

This commit is contained in:
arg@mig29 2006-11-21 14:49:13 +01:00
parent 4ec04209e0
commit 931e712eac
3 changed files with 6 additions and 8 deletions

View File

@ -1,5 +1,5 @@
# dwm version
VERSION = 2.2
VERSION = 2.3
# Customize below to fit your system

7
draw.c
View File

@ -99,7 +99,7 @@ drawstatus(void) {
drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = bx + bw - dc.w;
dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
dc.w = bw - x;
@ -107,10 +107,7 @@ drawstatus(void) {
drawtext(stext, dc.status, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if(sel)
drawtext(sel->name, dc.sel, False);
else
drawtext(NULL, dc.norm, False);
drawtext(sel ? sel->name : NULL, dc.sel, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);

5
main.c
View File

@ -130,7 +130,8 @@ setup(void) {
sh = DisplayHeight(dpy, screen);
master = MASTER;
/* bar */
bx = by = 0;
bx = sx;
by = sy;
bw = sw;
dc.h = bh = dc.font.height + 2;
wa.override_redirect = 1;
@ -144,7 +145,7 @@ setup(void) {
strcpy(stext, "dwm-"VERSION);
/* windowarea */
wax = sx;
way = bh;
way = sy + bh;
wah = sh - bh;
waw = sw;
/* pixmap for everything */