Added tag 0.3 for changeset d352e9dc112ee96aa5cad961a0ed880ae9ce7276

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 4e079e5..7507595 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,6 +9,26 @@
 
 /* static */
 
 
 /* static */
 

+static void
+drawborder(void)
+{
+       XPoint points[5];
+
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       XSetForeground(dpy, dc.gc, dc.border);
+       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);
+}
+

 static unsigned int
 textnw(const char *text, unsigned int len)
 {
 static unsigned int
 textnw(const char *text, unsigned int len)
 {


@@ -24,7 +44,7 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
 /* extern */
 
 void

-drawtext(const char *text, Bool invert)
+drawtext(const char *text, Bool invert, Bool border)

 {
        int x, y, w, h;
        static char buf[256];
 {
        int x, y, w, h;
        static char buf[256];


@@ -34,7 +54,10 @@ drawtext(const char *text, Bool invert)
 
        XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

+

        w = 0;
        w = 0;

+       if(border)
+               drawborder();

 
        if(!text)
                return;
 
        if(!text)
                return;