diff options
author | Connor Lane Smith <cls@lubutu.com> | 2010-06-23 12:42:08 +0100 |
---|---|---|
committer | Connor Lane Smith <cls@lubutu.com> | 2010-06-23 12:42:08 +0100 |
commit | bba30e26863c75e66678f9d028d394883d86150a (patch) | |
tree | a2ca09eb5c113b772d986e38301a56b276e306bf | |
parent | 08b264393d41321c1b7ae3644f73c67cb825c95c (diff) |
overlapping code
-rw-r--r-- | dinput.c | 6 | ||||
-rw-r--r-- | dmenu.c | 6 | ||||
-rw-r--r-- | draw.c | 1 |
3 files changed, 0 insertions, 13 deletions
@@ -278,11 +278,6 @@ setup(Bool topbar) { | |||
278 | } | 278 | } |
279 | XFreeModifiermap(modmap); | 279 | XFreeModifiermap(modmap); |
280 | 280 | ||
281 | /* style */ | ||
282 | dc.norm[ColBG] = getcolor(normbgcolor); | ||
283 | dc.norm[ColFG] = getcolor(normfgcolor); | ||
284 | dc.sel[ColBG] = getcolor(selbgcolor); | ||
285 | dc.sel[ColFG] = getcolor(selfgcolor); | ||
286 | initfont(font); | 281 | initfont(font); |
287 | 282 | ||
288 | /* menu window */ | 283 | /* menu window */ |
@@ -323,7 +318,6 @@ setup(Bool topbar) { | |||
323 | DefaultVisual(dpy, screen), | 318 | DefaultVisual(dpy, screen), |
324 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); | 319 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
325 | 320 | ||
326 | /* pixmap */ | ||
327 | dcsetup(); | 321 | dcsetup(); |
328 | if(prompt) | 322 | if(prompt) |
329 | promptw = MIN(textw(prompt), mw / 5); | 323 | promptw = MIN(textw(prompt), mw / 5); |
@@ -489,11 +489,6 @@ setup(Bool topbar) { | |||
489 | } | 489 | } |
490 | XFreeModifiermap(modmap); | 490 | XFreeModifiermap(modmap); |
491 | 491 | ||
492 | /* style */ | ||
493 | dc.norm[ColBG] = getcolor(normbgcolor); | ||
494 | dc.norm[ColFG] = getcolor(normfgcolor); | ||
495 | dc.sel[ColBG] = getcolor(selbgcolor); | ||
496 | dc.sel[ColFG] = getcolor(selfgcolor); | ||
497 | initfont(font); | 492 | initfont(font); |
498 | 493 | ||
499 | /* menu window */ | 494 | /* menu window */ |
@@ -534,7 +529,6 @@ setup(Bool topbar) { | |||
534 | DefaultVisual(dpy, screen), | 529 | DefaultVisual(dpy, screen), |
535 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); | 530 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
536 | 531 | ||
537 | /* pixmap */ | ||
538 | dcsetup(); | 532 | dcsetup(); |
539 | if(maxname) | 533 | if(maxname) |
540 | cmdw = MIN(textw(maxname), mw / 3); | 534 | cmdw = MIN(textw(maxname), mw / 3); |
@@ -47,7 +47,6 @@ dcsetup(void) { | |||
47 | dc.norm[ColFG] = getcolor(normfgcolor); | 47 | dc.norm[ColFG] = getcolor(normfgcolor); |
48 | dc.sel[ColBG] = getcolor(selbgcolor); | 48 | dc.sel[ColBG] = getcolor(selbgcolor); |
49 | dc.sel[ColFG] = getcolor(selfgcolor); | 49 | dc.sel[ColFG] = getcolor(selfgcolor); |
50 | initfont(font); | ||
51 | 50 | ||
52 | /* pixmap */ | 51 | /* pixmap */ |
53 | dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen)); | 52 | dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen)); |