mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2025-03-28 17:42:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some repetative code in wmii9menu.

Browse Source
This commit is contained in:
Kris Maglione 2007-04-06 01:44:50 -04:00
parent f43d50d2aa
commit 90f9413671
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/wmii9menu.c
View File

@ -150,6 +150,16 @@ args(int argc, char **argv)
return i;
}
unsigned long
getcolor(char *name, unsigned long def) {
if ((name != nil)
&& (XParseColor(dpy, defcmap, name, &color) != 0)
&& (XAllocColor(dpy, defcmap, &color) != 0))
return color.pixel;
else
return def;
}
/* main --- crack arguments, set up X stuff, run the main menu loop */
int
@ -286,40 +296,12 @@ main(int argc, char **argv)
* white = WhitePixel(dpy, screen);
*/
defcmap = DefaultColormap(dpy, screen);
if (sbgname == nil
|| XParseColor(dpy, defcmap, sbgname, &color) == 0
|| XAllocColor(dpy, defcmap, &color) == 0)
selbg = BlackPixel(dpy, screen);
else
selbg = color.pixel;
if (sfgname == nil
|| XParseColor(dpy, defcmap, sfgname, &color) == 0
|| XAllocColor(dpy, defcmap, &color) == 0)
selfg = WhitePixel(dpy, screen);
else
selfg = color.pixel;
if (nbgname == nil
|| XParseColor(dpy, defcmap, nbgname, &color) == 0
|| XAllocColor(dpy, defcmap, &color) == 0)
normbg = selfg;
else
normbg = color.pixel;
if (nfgname == nil
|| XParseColor(dpy, defcmap, nfgname, &color) == 0
|| XAllocColor(dpy, defcmap, &color) == 0)
normfg = selbg;
else
normfg = color.pixel;
if (brcname == nil
|| XParseColor(dpy, defcmap, brcname, &color) == 0
|| XAllocColor(dpy, defcmap, &color) == 0)
border = selbg;
else
border = color.pixel;
selbg = getcolor(sbgname, BlackPixel(dpy, screen));
selfg = getcolor(sfgname, WhitePixel(dpy, screen));
normbg = getcolor(nbgname, selfg);
normfg = getcolor(nfgname, selbg);
border = getcolor(brcname, selbg);
/* try user's font first */
if (fontname != nil) {