| changeset 697 | 4d12382fef8e |
| parent 690 | 399f08187c27 |
| child 728 | 295c8ca7a27a |
| 696:b63bc9c26b2f | 697:4d12382fef8e |
|---|---|
112 } |
112 } |
113 dc.w = bmw; |
113 dc.w = bmw; |
114 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); |
114 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); |
115 x = dc.x + dc.w; |
115 x = dc.x + dc.w; |
116 dc.w = textw(stext); |
116 dc.w = textw(stext); |
117 dc.x = bw - dc.w; |
117 dc.x = sw - dc.w; |
118 if(dc.x < x) { |
118 if(dc.x < x) { |
119 dc.x = x; |
119 dc.x = x; |
120 dc.w = bw - x; |
120 dc.w = sw - x; |
121 } |
121 } |
122 drawtext(stext, dc.norm, False, False); |
122 drawtext(stext, dc.norm, False, False); |
123 if((dc.w = dc.x - x) > bh) { |
123 if((dc.w = dc.x - x) > bh) { |
124 dc.x = x; |
124 dc.x = x; |
125 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); |
125 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); |
126 } |
126 } |
127 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); |
127 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); |
128 XSync(dpy, False); |
128 XSync(dpy, False); |
129 } |
129 } |
130 |
130 |
131 unsigned long |
131 unsigned long |
132 getcolor(const char *colstr) { |
132 getcolor(const char *colstr) { |