all repos — dmenu @ bba30e26863c75e66678f9d028d394883d86150a

my build of dmenu 

overlapping code
Connor Lane Smith cls@lubutu.com
Wed, 23 Jun 2010 12:42:08 +0100
commit

bba30e26863c75e66678f9d028d394883d86150a

parent

08b264393d41321c1b7ae3644f73c67cb825c95c

3 files changed, 0 insertions(+), 13 deletions(-)

jump to
M dinput.c → dinput.c 
@@ -278,11 +278,6 @@ numlockmask = (1 << i);
 		}
 	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 @@ DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-	/* pixmap */
 	dcsetup();
 	if(prompt)
 		promptw = MIN(textw(prompt), mw / 5);
M dmenu.c → dmenu.c 
@@ -489,11 +489,6 @@ numlockmask = (1 << i);
 		}
 	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 @@ DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-	/* pixmap */
 	dcsetup();
 	if(maxname)
 		cmdw = MIN(textw(maxname), mw / 3);
M draw.c → draw.c 
@@ -47,7 +47,6 @@ dc.norm[ColBG] = getcolor(normbgcolor);
 	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));