diff options
| author | arg@mig29 <unknown> | 2006-11-21 14:49:13 +0100 |
|---|---|---|
| committer | arg@mig29 <unknown> | 2006-11-21 14:49:13 +0100 |
| commit | 931e712eac3dad86e9447944ac70f7b238f8a58d (patch) | |
| tree | 094a2bcc36937099d60fded7a18673f1bda86eb5 | |
| parent | 4ec04209e0b63c76bc607ed963707ef0640c9ed4 (diff) | |
| download | dwm-931e712eac3dad86e9447944ac70f7b238f8a58d.tar.gz | |
applied Gottox patches
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | draw.c | 7 | ||||
| -rw-r--r-- | main.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/config.mk b/config.mk index 63ffb69..dd70d38 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # dwm version -VERSION = 2.2 +VERSION = 2.3 # Customize below to fit your system diff --git a/draw.c b/draw.c index 178f1d2..c2c47dc 100644 --- a/draw.c +++ b/draw.c @@ -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); diff --git a/main.c b/main.c index 0f22c44..f114bae 100644 --- a/main.c +++ b/main.c @@ -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 */ |