wmii

commit 89d4b45642f67104928c7f3bc5c051c06b994788
parent eaf1ad0cc2d9a1785aa2f1ef924b160eda43648a
Author: Kris Maglione <jg@suckless.org>
Date:   Wed, 28 Feb 2007 20:06:43 -0500

Fix the default colors in wmii9menu.

Diffstat:
9menu.c
 | 
30
+++++++++++++++---------------

1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/9menu.c b/9menu.c
@@ -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,10 +299,24 @@ 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
 	    || XAllocColor(dpy, defcmap, &color) == 0)