/* static */
-static void
-drawborder(void)
-{
- XPoint points[5];
-
- XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
- XSetForeground(dpy, dc.gc, dc.border);
- points[0].x = dc.x;
- points[0].y = dc.y;
- points[1].x = dc.w - 1;
- points[1].y = 0;
- points[2].x = 0;
- points[2].y = dc.h - 1;
- points[3].x = -(dc.w - 1);
- points[3].y = 0;
- points[4].x = 0;
- points[4].y = -(dc.h - 1);
- XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
static unsigned int
-textnw(char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
XRectangle r;
if(dc.font.set) {
}
static void
-drawtext(const char *text, Bool invert, Bool border)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
int x, y, w, h;
static char buf[256];
- unsigned int len;
+ unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+ XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- w = 0;
- if(border)
- drawborder();
-
if(!text)
return;
- len = strlen(text);
+ w = 0;
+ olen = len = strlen(text);
if(len >= sizeof(buf))
len = sizeof(buf) - 1;
memcpy(buf, text, len);
/* shorten text if necessary */
while(len && (w = textnw(buf, len)) > dc.w - h)
buf[--len] = 0;
+ if(len < olen) {
+ if(len > 1)
+ buf[len - 1] = '.';
+ if(len > 2)
+ buf[len - 2] = '.';
+ if(len > 3)
+ buf[len - 3] = '.';
+ }
if(w > dc.w)
return; /* too long */
-
- gcv.foreground = invert ? dc.bg : dc.fg;
- gcv.background = invert ? dc.fg : dc.bg;
+ gcv.foreground = col[ColFG];
if(dc.font.set) {
- XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
- XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
- x, y, buf, len);
+ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
}
else {
gcv.font = dc.font.xfont->fid;
- XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
- XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+ XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+ }
+ if(highlight) {
+ r.x = dc.x + 2;
+ r.y = dc.y + 2;
+ r.width = r.height = (h + 2) / 4;
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
}
/* extern */
void
-drawall()
-{
+drawall(void) {
Client *c;
for(c = clients; c; c = getnext(c->next))
}
void
-drawstatus()
-{
+drawstatus(void) {
int i, x;
- Bool istile = arrange == dotile;
dc.x = dc.y = 0;
- dc.w = bw;
- drawtext(NULL, !istile, False);
- dc.w = 0;
- for(i = 0; i < TLast; i++) {
- dc.x += dc.w;
+ for(i = 0; i < ntags; i++) {
dc.w = textw(tags[i]);
- if(istile)
- drawtext(tags[i], (i == tsel), True);
+ if(seltag[i])
+ drawtext(tags[i], dc.sel, sel && sel->tags[i]);
else
- drawtext(tags[i], (i != tsel), True);
+ drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+ dc.x += dc.w;
}
+
+ dc.w = bmw;
+ drawtext(arrange == dofloat ?
+ FLOATSYMBOL : stackpos == StackBottom ?
+ BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
+
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = bx + bw - dc.w;
- drawtext(stext, !istile, False);
- if(sel && ((dc.w = dc.x - x) >= bh)) {
+ if(dc.x < x) {
+ dc.x = x;
+ dc.w = bw - x;
+ }
+ drawtext(stext, dc.status, False);
+
+ if((dc.w = dc.x - x) > bh) {
dc.x = x;
- drawtext(sel->name, istile, True);
+ if(sel)
+ drawtext(sel->name, dc.sel, False);
+ else
+ drawtext(NULL, dc.norm, False);
}
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
XSync(dpy, False);
}
void
-drawtitle(Client *c)
-{
- int i;
- Bool istile = arrange == dotile;
-
- if(c == sel) {
+drawtitle(Client *c) {
+ if(c == sel && issel) {
drawstatus();
- XUnmapWindow(dpy, c->title);
- XSetWindowBorder(dpy, c->win, dc.fg);
+ XUnmapWindow(dpy, c->twin);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
return;
}
- XSetWindowBorder(dpy, c->win, dc.bg);
- XMapWindow(dpy, c->title);
-
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+ XMapWindow(dpy, c->twin);
dc.x = dc.y = 0;
-
- dc.w = 0;
- for(i = 0; i < TLast; i++) {
- if(c->tags[i]) {
- dc.x += dc.w;
- dc.w = textw(c->tags[i]);
- drawtext(c->tags[i], !istile, True);
- }
- }
- dc.x += dc.w;
- dc.w = textw(c->name);
- drawtext(c->name, !istile, True);
- XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+ dc.w = c->tw;
+ drawtext(c->name, dc.norm, False);
+ XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
XSync(dpy, False);
}
unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
- XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
return color.pixel;
}
void
-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
char **missing, *def;
int i, n;
}
unsigned int
-textw(char *text)
-{
+textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height;
}
Got questions, comments, patches, etc.? Contact Jason Woofenden