sander1 proposal

This commit is contained in:
arg@mig29 2006-12-01 17:36:37 +01:00
parent 6e72d781f7
commit 6458803d21

22
draw.c
View File

@ -30,12 +30,13 @@ textnw(const char *text, unsigned int len) {
} }
static void static void
drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborder) { drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool corner) {
int x, y, w, h; int x, y, w, h;
static char buf[256]; static char buf[256];
unsigned int len, olen; unsigned int len, olen;
XGCValues gcv; XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XPoint pt[3];
XSetForeground(dpy, dc.gc, col[ColBG]); XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@ -73,13 +74,20 @@ drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborde
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
} }
if(vborder) { if(dot) {
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1); r.x = dc.x + 2;
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1); r.y = dc.y + 2;
r.width = r.height = (h + 2) / 4;
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
} }
if(hborder) { if(corner) {
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1); pt[0].x = dc.x + 1;
XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2); pt[0].y = dc.y + dc.h / 2 + 1;
pt[1].x = 0;
pt[1].y = - dc.h / 2;
pt[2].x = dc.h / 2;
pt[2].y = 0;
XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious);
} }
} }