comparison draw.c @ 371:fc9d35252ab4

applied sanders somepatches.patch
author Anselm R. Garbe <arg@10kloc.org>
date Mon, 28 Aug 2006 08:02:29 +0200
parents ba6c55e1b9b2
children b1159a638d0a
comparison
equal deleted inserted replaced
370:615b8b2e9457 371:fc9d35252ab4
95 drawstatus() 95 drawstatus()
96 { 96 {
97 int i, x; 97 int i, x;
98 98
99 dc.x = dc.y = 0; 99 dc.x = dc.y = 0;
100 dc.w = bw; 100
101
102 drawtext(NULL, dc.status, False);
103 for(i = 0; i < ntags; i++) { 101 for(i = 0; i < ntags; i++) {
104 dc.w = textw(tags[i]); 102 dc.w = textw(tags[i]);
105 if(seltag[i]) 103 if(seltag[i])
106 drawtext(tags[i], dc.sel, sel && sel->tags[i]); 104 drawtext(tags[i], dc.sel, sel && sel->tags[i]);
107 else 105 else
119 dc.x = x; 117 dc.x = x;
120 dc.w = bw - x; 118 dc.w = bw - x;
121 } 119 }
122 drawtext(stext, dc.status, False); 120 drawtext(stext, dc.status, False);
123 121
124 if(sel && ((dc.w = dc.x - x) > bh)) { 122 if((dc.w = dc.x - x) > bh) {
125 dc.x = x; 123 dc.x = x;
126 drawtext(sel->name, dc.sel, False); 124 if(sel)
125 drawtext(sel->name, dc.sel, False);
126 else
127 drawtext(NULL, dc.norm, False);
127 } 128 }
128 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); 129 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
129 XSync(dpy, False); 130 XSync(dpy, False);
130 } 131 }
131 132