dwm-meillo
changeset 570:f05cfa7d5128
applied Gottox patches
| author | arg@mig29 |
|---|---|
| date | Tue, 21 Nov 2006 14:49:13 +0100 |
| parents | cdd763e9ac26 |
| children | f0688a69f17f |
| files | config.mk draw.c main.c |
| diffstat | 3 files changed, 6 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/config.mk Tue Nov 21 12:17:47 2006 +0100 1.2 +++ b/config.mk Tue Nov 21 14:49:13 2006 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 # dwm version 1.5 -VERSION = 2.2 1.6 +VERSION = 2.3 1.7 1.8 # Customize below to fit your system 1.9
2.1 --- a/draw.c Tue Nov 21 12:17:47 2006 +0100 2.2 +++ b/draw.c Tue Nov 21 14:49:13 2006 +0100 2.3 @@ -99,7 +99,7 @@ 2.4 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False); 2.5 x = dc.x + dc.w; 2.6 dc.w = textw(stext); 2.7 - dc.x = bx + bw - dc.w; 2.8 + dc.x = bw - dc.w; 2.9 if(dc.x < x) { 2.10 dc.x = x; 2.11 dc.w = bw - x; 2.12 @@ -107,10 +107,7 @@ 2.13 drawtext(stext, dc.status, False); 2.14 if((dc.w = dc.x - x) > bh) { 2.15 dc.x = x; 2.16 - if(sel) 2.17 - drawtext(sel->name, dc.sel, False); 2.18 - else 2.19 - drawtext(NULL, dc.norm, False); 2.20 + drawtext(sel ? sel->name : NULL, dc.sel, False); 2.21 } 2.22 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); 2.23 XSync(dpy, False);
3.1 --- a/main.c Tue Nov 21 12:17:47 2006 +0100 3.2 +++ b/main.c Tue Nov 21 14:49:13 2006 +0100 3.3 @@ -130,7 +130,8 @@ 3.4 sh = DisplayHeight(dpy, screen); 3.5 master = MASTER; 3.6 /* bar */ 3.7 - bx = by = 0; 3.8 + bx = sx; 3.9 + by = sy; 3.10 bw = sw; 3.11 dc.h = bh = dc.font.height + 2; 3.12 wa.override_redirect = 1; 3.13 @@ -144,7 +145,7 @@ 3.14 strcpy(stext, "dwm-"VERSION); 3.15 /* windowarea */ 3.16 wax = sx; 3.17 - way = bh; 3.18 + way = sy + bh; 3.19 wah = sh - bh; 3.20 waw = sw; 3.21 /* pixmap for everything */