|
|
@ -114,16 +114,16 @@ drawstatus()
|
|
|
|
|
|
|
|
|
|
|
|
dc.x = dc.y = 0;
|
|
|
|
dc.x = dc.y = 0;
|
|
|
|
dc.w = bw;
|
|
|
|
dc.w = bw;
|
|
|
|
drawtext(NULL, !istile, False);
|
|
|
|
drawtext(NULL, istile ? 1 : 0, False);
|
|
|
|
|
|
|
|
|
|
|
|
dc.w = 0;
|
|
|
|
dc.w = 0;
|
|
|
|
for(i = 0; i < ntags; i++) {
|
|
|
|
for(i = 0; i < ntags; i++) {
|
|
|
|
dc.x += dc.w;
|
|
|
|
dc.x += dc.w;
|
|
|
|
dc.w = textw(tags[i]);
|
|
|
|
dc.w = textw(tags[i]);
|
|
|
|
if(istile)
|
|
|
|
if(istile)
|
|
|
|
drawtext(tags[i], seltag[i], sel && sel->tags[i]);
|
|
|
|
drawtext(tags[i], seltag[i] ? 0 : 1, sel && sel->tags[i]);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
drawtext(tags[i], !seltag[i], sel && sel->tags[i]);
|
|
|
|
drawtext(tags[i], seltag[i] ? 1 : 0, sel && sel->tags[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
x = dc.x + dc.w;
|
|
|
|
x = dc.x + dc.w;
|
|
|
|
dc.w = textw(stext);
|
|
|
|
dc.w = textw(stext);
|
|
|
@ -132,11 +132,11 @@ drawstatus()
|
|
|
|
dc.x = x;
|
|
|
|
dc.x = x;
|
|
|
|
dc.w = bw - x;
|
|
|
|
dc.w = bw - x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
drawtext(stext, !istile, False);
|
|
|
|
drawtext(stext, istile ? 1 : 0, False);
|
|
|
|
|
|
|
|
|
|
|
|
if(sel && ((dc.w = dc.x - x) > bh)) {
|
|
|
|
if(sel && ((dc.w = dc.x - x) > bh)) {
|
|
|
|
dc.x = x;
|
|
|
|
dc.x = x;
|
|
|
|
drawtext(sel->name, istile, False);
|
|
|
|
drawtext(sel->name, istile ? 0 : 1, False);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
|
|
|
|
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
|
|
|
|
XSync(dpy, False);
|
|
|
|
XSync(dpy, False);
|
|
|
@ -159,7 +159,7 @@ drawtitle(Client *c)
|
|
|
|
XMapWindow(dpy, c->twin);
|
|
|
|
XMapWindow(dpy, c->twin);
|
|
|
|
dc.x = dc.y = 0;
|
|
|
|
dc.x = dc.y = 0;
|
|
|
|
dc.w = c->tw;
|
|
|
|
dc.w = c->tw;
|
|
|
|
drawtext(c->name, !istile, False);
|
|
|
|
drawtext(c->name, istile ? 1 : 0, False);
|
|
|
|
XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
|
|
|
|
XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
|
|
|
|
XSync(dpy, False);
|
|
|
|
XSync(dpy, False);
|
|
|
|
}
|
|
|
|
}
|
|
|
|