dmenu

Index Commits Files Refs README LICENSE

commit bba30e26863c75e66678f9d028d394883d86150a
parent 08b264393d41321c1b7ae3644f73c67cb825c95c
Author: Connor Lane Smith <cls@lubutu.com>
Date:   Wed, 23 Jun 2010 12:42:08 +0100

overlapping code
Diffstat:
M
dinput.c
 | 
6
------
M
dmenu.c
 | 
6
------
M
draw.c
 | 
1
-

3 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/dinput.c b/dinput.c
@@ -278,11 +278,6 @@ setup(Bool topbar) {
         }
     XFreeModifiermap(modmap);
 
-    /* style */
-    dc.norm[ColBG] = getcolor(normbgcolor);
-    dc.norm[ColFG] = getcolor(normfgcolor);
-    dc.sel[ColBG] = getcolor(selbgcolor);
-    dc.sel[ColFG] = getcolor(selfgcolor);
     initfont(font);
 
     /* menu window */
@@ -323,7 +318,6 @@ setup(Bool topbar) {
             DefaultVisual(dpy, screen),
             CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-    /* pixmap */
     dcsetup();
     if(prompt)
         promptw = MIN(textw(prompt), mw / 5);
diff --git a/dmenu.c b/dmenu.c
@@ -489,11 +489,6 @@ setup(Bool topbar) {
         }
     XFreeModifiermap(modmap);
 
-    /* style */
-    dc.norm[ColBG] = getcolor(normbgcolor);
-    dc.norm[ColFG] = getcolor(normfgcolor);
-    dc.sel[ColBG] = getcolor(selbgcolor);
-    dc.sel[ColFG] = getcolor(selfgcolor);
     initfont(font);
 
     /* menu window */
@@ -534,7 +529,6 @@ setup(Bool topbar) {
             DefaultVisual(dpy, screen),
             CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-    /* pixmap */
     dcsetup();
     if(maxname)
         cmdw = MIN(textw(maxname), mw / 3);
diff --git a/draw.c b/draw.c
@@ -47,7 +47,6 @@ dcsetup(void) {
     dc.norm[ColFG] = getcolor(normfgcolor);
     dc.sel[ColBG] = getcolor(selbgcolor);
     dc.sel[ColFG] = getcolor(selfgcolor);
-    initfont(font);
 
     /* pixmap */
     dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));