overlapping code

diff --git a/dinput.c b/dinput.c
index 490380d..52118e5 100644 (file)
--- a/dinput.c
+++ b/dinput.c
@@ -278,11 +278,6 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
                }
        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 */
        initfont(font);
 
        /* menu window */


@@ -323,7 +318,6 @@ setup(Bool topbar) {
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       /* pixmap */

        dcsetup();
        if(prompt)
                promptw = MIN(textw(prompt), mw / 5);
        dcsetup();
        if(prompt)
                promptw = MIN(textw(prompt), mw / 5);

diff --git a/dmenu.c b/dmenu.c
index 5434eab..7672eac 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -489,11 +489,6 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
                }
        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 */
        initfont(font);
 
        /* menu window */


@@ -534,7 +529,6 @@ setup(Bool topbar) {
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       /* pixmap */

        dcsetup();
        if(maxname)
                cmdw = MIN(textw(maxname), mw / 3);
        dcsetup();
        if(maxname)
                cmdw = MIN(textw(maxname), mw / 3);

diff --git a/draw.c b/draw.c
index 41022f0..932b2f6 100644 (file)
--- 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);
        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));
 
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));