commit dd902868dfbb32f3520abe30c640f06bedf4ca9b
parent 4318bf2905a8da290ec83cb67f26bd06ba2e4dc9
Author: Anselm R.Garbe <arg@10ksloc.org>
Date: Thu, 10 Aug 2006 11:07:06 +0200
drawing border around sel item
Diffstat:
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/dmenu.h b/dmenu.h
@@ -34,7 +34,7 @@ extern Display *dpy;
extern DC dc;
/* draw.c */
-extern void drawtext(const char *text, Bool invert);
+extern void drawtext(const char *text, Bool sel);
extern unsigned long getcolor(const char *colstr);
extern void setfont(const char *fontstr);
extern unsigned int textw(const char *text);
diff --git a/draw.c b/draw.c
@@ -24,18 +24,18 @@ textnw(const char *text, unsigned int len)
/* extern */
void
-drawtext(const char *text, Bool invert)
+drawtext(const char *text, Bool sel)
{
int x, y, w, h;
static char buf[256];
unsigned int len;
XGCValues gcv;
+ XPoint points[5];
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+ XSetForeground(dpy, dc.gc, sel ? dc.fg : dc.bg);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
w = 0;
-
if(!text)
return;
@@ -56,8 +56,8 @@ drawtext(const char *text, Bool invert)
if(w > dc.w)
return; /* too long */
- gcv.foreground = invert ? dc.bg : dc.fg;
- gcv.background = invert ? dc.fg : dc.bg;
+ gcv.foreground = sel ? dc.bg : dc.fg;
+ gcv.background = sel ? dc.fg : dc.bg;
if(dc.font.set) {
XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
@@ -68,6 +68,21 @@ drawtext(const char *text, Bool invert)
XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
+ if(sel) {
+ XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ 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);
+ }
+
}
unsigned long
