[hackers] [dmenu] overlapping code || Connor Lane Smith

changeset: 316:9f507f16e461
tag: tip
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Wed Jun 23 12:42:08 2010 +0100
files: dinput.c dmenu.c draw.c
description:
overlapping code

diff -r 21b592be1838 -r 9f507f16e461 dinput.c
--- a/dinput.c Wed Jun 23 12:15:07 2010 +0100
+++ b/dinput.c Wed Jun 23 12:42:08 2010 +0100
@@ -278,11 +278,6 @@
                 }
         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 @@
                         DefaultVisual(dpy, screen),
                         CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
- /* pixmap */
         dcsetup();
         if(prompt)
                 promptw = MIN(textw(prompt), mw / 5);
diff -r 21b592be1838 -r 9f507f16e461 dmenu.c
--- a/dmenu.c Wed Jun 23 12:15:07 2010 +0100
+++ b/dmenu.c Wed Jun 23 12:42:08 2010 +0100
@@ -489,11 +489,6 @@
                 }
         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 @@
                         DefaultVisual(dpy, screen),
                         CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
- /* pixmap */
         dcsetup();
         if(maxname)
                 cmdw = MIN(textw(maxname), mw / 3);
diff -r 21b592be1838 -r 9f507f16e461 draw.c
--- a/draw.c Wed Jun 23 12:15:07 2010 +0100
+++ b/draw.c Wed Jun 23 12:42:08 2010 +0100
@@ -47,7 +47,6 @@
         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));
Received on Wed Jun 23 2010 - 11:42:13 UTC