overlapping code

15 years ago · bba30e2686
3 changed files with 0 additions and 13 deletions
--- 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);
--- 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);
--- 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));