Xinqi Bao's Git
projects
/
dwm.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
6e72d78
)
sander1 proposal
author
arg@mig29 <unknown>
Fri, 1 Dec 2006 16:36:37 +0000
(17:36 +0100)
committer
arg@mig29 <unknown>
Fri, 1 Dec 2006 16:36:37 +0000
(17:36 +0100)
draw.c
diff
|
blob
|
history
diff --git
a/draw.c
b/draw.c
index
0237b40
..
77ffd87
100644
(file)
--- a/
draw.c
+++ b/
draw.c
@@
-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 vbord
er) {
+drawtext(const char *text, unsigned long col[ColLast], Bool
dot, Bool corn
er) {
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ XPoint pt[3];
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
XSetForeground(dpy, dc.gc, col[ColBG]);
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);
XDrawString(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(vborder) {
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1);
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1);
+ if(dot) {
+ 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);
}
}
- if(hborder) {
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 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);
+ if(corner) {
+ pt[0].x = dc.x + 1;
+ 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);
}
}
}
}