28 } |
28 } |
29 return XTextWidth(dc.font.xfont, text, len); |
29 return XTextWidth(dc.font.xfont, text, len); |
30 } |
30 } |
31 |
31 |
32 static void |
32 static void |
33 drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool line) { |
33 drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborder) { |
34 int x, y, w, h; |
34 int x, y, w, h; |
35 static char buf[256]; |
35 static char buf[256]; |
36 unsigned int len, olen; |
36 unsigned int len, olen; |
37 XGCValues gcv; |
37 XGCValues gcv; |
38 XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
38 XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
71 else { |
71 else { |
72 gcv.font = dc.font.xfont->fid; |
72 gcv.font = dc.font.xfont->fid; |
73 XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
73 XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
74 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
74 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
75 } |
75 } |
76 if(dot) { |
76 if(vborder) { |
77 r.x = dc.x + 1; |
77 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1); |
78 r.y = dc.y + 2; |
78 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1); |
79 r.width = r.height = (h + 2) / 4; |
79 } |
80 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
80 if(hborder) { |
81 } |
81 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1); |
82 if(line) |
82 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2); |
83 XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 1, dc.y + 1); } |
83 } |
|
84 } |
84 |
85 |
85 /* extern */ |
86 /* extern */ |
86 |
87 |
87 void |
88 void |
88 drawall(void) { |
89 drawall(void) { |