trinity/src
1
0
Fork 0
Code

added fallback to color initialization

Browse Source
This commit is contained in:
arg@mmvi 2006-09-26 13:37:36 +02:00
parent 1e0d10fe28
commit e86ca83a63
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dmenubar/dmenu.h
View File

@ -43,7 +43,8 @@ extern DC dc; /* global drawing context */
/* draw.c */
extern void drawtext(const char *text,
unsigned long col[ColLast]); /* draws text with the defined color tuple */
extern unsigned long getcolor(const char *colstr); /* returns color of colstr */
extern unsigned long getcolor(
const char *colstr, const char *alternate); /* returns color of colstr */
extern void setfont(const char *fontstr); /* sets global font */
extern unsigned int textw(const char *text); /* returns width of text in px */

5
dmenubar/draw.c
View File

@ -76,11 +76,12 @@ drawtext(const char *text, unsigned long col[ColLast]) {
}
unsigned long
getcolor(const char *colstr) {
getcolor(const char *colstr, const char *alternate) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
XAllocNamedColor(dpy, cmap, colstr, &color, &color);
if(XAllocNamedColor(dpy, cmap, colstr, &color, &color) != Success)
XAllocNamedColor(dpy, cmap, alternate, &color, &color);
return color.pixel;
}

8
dmenubar/main.c
View File

@ -341,10 +341,10 @@ main(int argc, char *argv[]) {
maxname = readstdin();
/* style */
dc.sel[ColBG] = getcolor(selbg);
dc.sel[ColFG] = getcolor(selfg);
dc.norm[ColBG] = getcolor(normbg);
dc.norm[ColFG] = getcolor(normfg);
dc.norm[ColBG] = getcolor(normbg, NORMBGCOLOR);
dc.norm[ColFG] = getcolor(normfg, NORMFGCOLOR);
dc.sel[ColBG] = getcolor(selbg, SELBGCOLOR);
dc.sel[ColFG] = getcolor(selfg, SELFGCOLOR);
setfont(font);
wa.override_redirect = 1;