removed unnecessary border color

diff --git a/config.arg.h b/config.arg.h
index c5e1874..30c422d 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -6,4 +6,3 @@
 #define FONT                   "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
 #define BGCOLOR                        "#eeeeee"
 #define FGCOLOR                        "#666699"
-#define BORDERCOLOR            "#9999CC"

diff --git a/config.default.h b/config.default.h
index cf1baea..0b1abb4 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -6,4 +6,3 @@
 #define FONT                   "fixed"
 #define BGCOLOR                        "#666699"
 #define FGCOLOR                        "#eeeeee"
-#define BORDERCOLOR            "#9999CC"

diff --git a/dmenu.h b/dmenu.h
index 2a8796f..f118196 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -24,7 +24,6 @@ struct DC { /* draw context */
        int x, y, w, h;
        unsigned long bg;
        unsigned long fg;
-       unsigned long border;
        Drawable drawable;
        Fnt font;
        GC gc;
@@ -35,7 +34,7 @@ extern Display *dpy;
 extern DC dc;
 
 /* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
+extern void drawtext(const char *text, Bool invert);
 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
index 7507595..4e079e5 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,26 +9,6 @@
 
 /* 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)
 {
@@ -44,7 +24,7 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, Bool invert)
 {
        int x, y, w, h;
        static char buf[256];
@@ -54,10 +34,7 @@ drawtext(const char *text, Bool invert, Bool border)
 
        XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
        w = 0;
-       if(border)
-               drawborder();
 
        if(!text)
                return;

diff --git a/main.c b/main.c
index 3b9a24b..14581c4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -77,17 +77,17 @@ drawmenu()
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(NULL, False, False);
+       drawtext(NULL, False);
 
        /* print command */
        if(cmdw && item)
                dc.w = cmdw;
-       drawtext(text[0] ? text : NULL, False, False);
+       drawtext(text[0] ? text : NULL, False);
        dc.x += cmdw;
 
        if(curr) {
                dc.w = SPACE;
-               drawtext((curr && curr->left) ? "<" : NULL, False, False);
+               drawtext((curr && curr->left) ? "<" : NULL, False);
                dc.x += dc.w;
 
                /* determine maximum items */
@@ -95,13 +95,13 @@ drawmenu()
                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;
-                       drawtext(i->text, sel == i, sel == i);
+                       drawtext(i->text, sel == i);
                        dc.x += dc.w;
                }
 
                dc.x = mw - SPACE;
                dc.w = SPACE;
-               drawtext(next ? ">" : NULL, False, False);
+               drawtext(next ? ">" : NULL, False);
        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
@@ -316,7 +316,6 @@ main(int argc, char *argv[])
        /* style */
        dc.bg = getcolor(BGCOLOR);
        dc.fg = getcolor(FGCOLOR);
-       dc.border = getcolor(BORDERCOLOR);
        setfont(FONT);
 
        wa.override_redirect = 1;