dood 6e72d781
arg@mig29 · 2006-12-01 16:55 1 file(s) · +9 −8
draw.c +9 −8
30 30
}
31 31
32 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 34
	int x, y, w, h;
35 35
	static char buf[256];
36 36
	unsigned int len, olen;
73 73
		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
74 74
		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
75 75
	}
76 -
	if(dot) {
77 -
		r.x = dc.x + 1;
78 -
		r.y = dc.y + 2;
79 -
		r.width = r.height = (h + 2) / 4;
80 -
		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
76 +
	if(vborder) {
77 +
		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1);
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 +
	}
80 +
	if(hborder) {
81 +
		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1);
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);
81 83
	}
82 -
	if(line)
83 -
		XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 1, dc.y + 1); }
84 +
}
84 85
85 86
/* extern */
86 87