comparison draw.c @ 570:f05cfa7d5128

applied Gottox patches
author arg@mig29
date Tue, 21 Nov 2006 14:49:13 +0100
parents 651f2c868b31
children f0688a69f17f
comparison
equal deleted inserted replaced
569:cdd763e9ac26 570:f05cfa7d5128
97 } 97 }
98 dc.w = bmw; 98 dc.w = bmw;
99 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False); 99 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
100 x = dc.x + dc.w; 100 x = dc.x + dc.w;
101 dc.w = textw(stext); 101 dc.w = textw(stext);
102 dc.x = bx + bw - dc.w; 102 dc.x = bw - dc.w;
103 if(dc.x < x) { 103 if(dc.x < x) {
104 dc.x = x; 104 dc.x = x;
105 dc.w = bw - x; 105 dc.w = bw - x;
106 } 106 }
107 drawtext(stext, dc.status, False); 107 drawtext(stext, dc.status, False);
108 if((dc.w = dc.x - x) > bh) { 108 if((dc.w = dc.x - x) > bh) {
109 dc.x = x; 109 dc.x = x;
110 if(sel) 110 drawtext(sel ? sel->name : NULL, dc.sel, False);
111 drawtext(sel->name, dc.sel, False);
112 else
113 drawtext(NULL, dc.norm, False);
114 } 111 }
115 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); 112 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
116 XSync(dpy, False); 113 XSync(dpy, False);
117 } 114 }
118 115