applied Gottox patches
931e712e
3 file(s) · +6 −8
| 1 | 1 | # dwm version |
|
| 2 | - | VERSION = 2.2 |
|
| 2 | + | VERSION = 2.3 |
|
| 3 | 3 | ||
| 4 | 4 | # Customize below to fit your system |
|
| 5 | 5 |
| 99 | 99 | drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False); |
|
| 100 | 100 | x = dc.x + dc.w; |
|
| 101 | 101 | dc.w = textw(stext); |
|
| 102 | - | dc.x = bx + bw - dc.w; |
|
| 102 | + | dc.x = bw - dc.w; |
|
| 103 | 103 | if(dc.x < x) { |
|
| 104 | 104 | dc.x = x; |
|
| 105 | 105 | dc.w = bw - x; |
|
| 107 | 107 | drawtext(stext, dc.status, False); |
|
| 108 | 108 | if((dc.w = dc.x - x) > bh) { |
|
| 109 | 109 | dc.x = x; |
|
| 110 | - | if(sel) |
|
| 111 | - | drawtext(sel->name, dc.sel, False); |
|
| 112 | - | else |
|
| 113 | - | drawtext(NULL, dc.norm, False); |
|
| 110 | + | drawtext(sel ? sel->name : NULL, dc.sel, False); |
|
| 114 | 111 | } |
|
| 115 | 112 | XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); |
|
| 116 | 113 | XSync(dpy, False); |
|
| 130 | 130 | sh = DisplayHeight(dpy, screen); |
|
| 131 | 131 | master = MASTER; |
|
| 132 | 132 | /* bar */ |
|
| 133 | - | bx = by = 0; |
|
| 133 | + | bx = sx; |
|
| 134 | + | by = sy; |
|
| 134 | 135 | bw = sw; |
|
| 135 | 136 | dc.h = bh = dc.font.height + 2; |
|
| 136 | 137 | wa.override_redirect = 1; |
|
| 144 | 145 | strcpy(stext, "dwm-"VERSION); |
|
| 145 | 146 | /* windowarea */ |
|
| 146 | 147 | wax = sx; |
|
| 147 | - | way = bh; |
|
| 148 | + | way = sy + bh; |
|
| 148 | 149 | wah = sh - bh; |
|
| 149 | 150 | waw = sw; |
|
| 150 | 151 | /* pixmap for everything */ |
|