| changeset 689 | cbec08a54a15 |
| parent 688 | 39fa5308d73f |
| child 690 | 399f08187c27 |
| 688:39fa5308d73f | 689:cbec08a54a15 |
|---|---|
118 else |
118 else |
119 drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i)); |
119 drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i)); |
120 dc.x += dc.w; |
120 dc.x += dc.w; |
121 } |
121 } |
122 dc.w = bmw; |
122 dc.w = bmw; |
123 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); |
123 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); |
124 x = dc.x + dc.w; |
124 x = dc.x + dc.w; |
125 dc.w = textw(stext); |
125 dc.w = textw(stext); |
126 dc.x = bw - dc.w; |
126 dc.x = bw - dc.w; |
127 if(dc.x < x) { |
127 if(dc.x < x) { |
128 dc.x = x; |
128 dc.x = x; |
129 dc.w = bw - x; |
129 dc.w = bw - x; |
130 } |
130 } |
131 drawtext(stext, dc.status, False, False); |
131 drawtext(stext, dc.norm, False, False); |
132 if((dc.w = dc.x - x) > bh) { |
132 if((dc.w = dc.x - x) > bh) { |
133 dc.x = x; |
133 dc.x = x; |
134 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); |
134 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); |
135 } |
135 } |
136 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); |
136 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); |
139 |
139 |
140 void |
140 void |
141 drawclient(Client *c) { |
141 drawclient(Client *c) { |
142 if(c == sel && issel) { |
142 if(c == sel && issel) { |
143 drawstatus(); |
143 drawstatus(); |
144 XSetWindowBorder(dpy, c->win, dc.sel[ColBG]); |
144 XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); |
145 return; |
145 return; |
146 } |
146 } |
147 XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); |
147 XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); |
148 XSync(dpy, False); |
148 XSync(dpy, False); |
149 } |
149 } |
150 |
150 |
151 unsigned long |
151 unsigned long |
152 getcolor(const char *colstr) { |
152 getcolor(const char *colstr) { |