[hackers] [wmii] Fix the default colors in wmii9menu.

changeset: 1977:f1bf18948bea
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Wed Feb 28 20:06:43 2007 -0500
summary: Fix the default colors in wmii9menu.

diff -r d434a645b241 -r f1bf18948bea 9menu.c
--- a/9menu.c Wed Feb 28 17:32:12 2007 -0500
+++ b/9menu.c Wed Feb 28 20:06:43 2007 -0500
@@ -289,20 +289,6 @@ main(int argc, char **argv)
          * white = WhitePixel(dpy, screen);
          */
         defcmap = DefaultColormap(dpy, screen);
- if (nbgname == NULL
- || XParseColor(dpy, defcmap, nbgname, &color) == 0
- || XAllocColor(dpy, defcmap, &color) == 0)
- normbg = BlackPixel(dpy, screen);
- else
- normbg = color.pixel;
-
- if (nfgname == NULL
- || XParseColor(dpy, defcmap, nfgname, &color) == 0
- || XAllocColor(dpy, defcmap, &color) == 0)
- normfg = BlackPixel(dpy, screen);
- else
- normfg = color.pixel;
-
         if (sbgname == NULL
             || XParseColor(dpy, defcmap, sbgname, &color) == 0
             || XAllocColor(dpy, defcmap, &color) == 0)
@@ -313,9 +299,23 @@ main(int argc, char **argv)
         if (sfgname == NULL
             || XParseColor(dpy, defcmap, sfgname, &color) == 0
             || XAllocColor(dpy, defcmap, &color) == 0)
- selfg = BlackPixel(dpy, screen);
+ selfg = WhitePixel(dpy, screen);
         else
                 selfg = color.pixel;
+
+ if (nbgname == NULL
+ || XParseColor(dpy, defcmap, nbgname, &color) == 0
+ || XAllocColor(dpy, defcmap, &color) == 0)
+ normbg = selfg;
+ else
+ normbg = color.pixel;
+
+ if (nfgname == NULL
+ || XParseColor(dpy, defcmap, nfgname, &color) == 0
+ || XAllocColor(dpy, defcmap, &color) == 0)
+ normfg = selbg;
+ else
+ normfg = color.pixel;
 
         if (brcname == NULL
             || XParseColor(dpy, defcmap, brcname, &color) == 0
Received on Thu Mar 01 2007 - 02:09:29 UTC