swytch
/
dmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drawing border around sel item

This commit is contained in:
Anselm R.Garbe 2006-08-10 11:07:06 +02:00
parent 4318bf2905
commit dd902868df
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmenu.h
View File

@ -34,7 +34,7 @@ extern Display *dpy;
extern DC dc; extern DC dc;
/* draw.c */ /* 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 unsigned long getcolor(const char *colstr);
extern void setfont(const char *fontstr); extern void setfont(const char *fontstr);
extern unsigned int textw(const char *text); extern unsigned int textw(const char *text);

25
draw.c
View File

@ -24,18 +24,18 @@ textnw(const char *text, unsigned int len)
/* extern */ /* extern */
void void
drawtext(const char *text, Bool invert) drawtext(const char *text, Bool sel)
{ {
int x, y, w, h; int x, y, w, h;
static char buf[256]; static char buf[256];
unsigned int len; unsigned int len;
XGCValues gcv; XGCValues gcv;
XPoint points[5];
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; 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); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
w = 0; w = 0;
if(!text) if(!text)
return; return;
@ -56,8 +56,8 @@ drawtext(const char *text, Bool invert)
if(w > dc.w) if(w > dc.w)
return; /* too long */ return; /* too long */
gcv.foreground = invert ? dc.bg : dc.fg; gcv.foreground = sel ? dc.bg : dc.fg;
gcv.background = invert ? dc.fg : dc.bg; gcv.background = sel ? dc.fg : dc.bg;
if(dc.font.set) { if(dc.font.set) {
XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, 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); XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); 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 unsigned long