diff options
author | Bert Münnich <ber.t@gmx.com> | 2012-03-02 19:42:14 +0100 |
---|---|---|
committer | Bert Münnich <ber.t@gmx.com> | 2012-03-02 19:42:14 +0100 |
commit | 3238ef6bf6a4a0e1842aff565f4286ef9de6ce3c (patch) | |
tree | 4b21b5eab39dd770a67d4674f011cfb93dae78f4 | |
parent | 37a42dba34db11374315951a72dc287a6f1a2129 (diff) |
Fixed issue #41, added WIN_FS_COLOR to config.h
-rw-r--r-- | config.def.h | 1 | ||||
-rw-r--r-- | thumbs.c | 2 | ||||
-rw-r--r-- | window.c | 9 | ||||
-rw-r--r-- | window.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/config.def.h b/config.def.h index 1a38e84..95562a3 100644 --- a/config.def.h +++ b/config.def.h @@ -15,6 +15,7 @@ static const char * const BAR_FONT = "fixed"; * (see X(7) section "COLOR NAMES" for valid values) */ static const char * const WIN_BG_COLOR = "#777777"; +static const char * const WIN_FS_COLOR = "#000000"; static const char * const SEL_COLOR = "#DDDDDD"; static const char * const BAR_BG_COLOR = "#222222"; static const char * const BAR_FG_COLOR = "#EEEEEE"; @@ -379,7 +379,7 @@ void tns_highlight(tns_t *tns, int n, bool hl) { if (hl) col = win->selcol; else if (win->fullscreen) - col = win->black; + col = win->fscol; else col = win->bgcol; @@ -110,10 +110,9 @@ void win_init(win_t *win) { e->cmap = DefaultColormap(e->dpy, e->scr); e->depth = DefaultDepth(e->dpy, e->scr); - win->black = BlackPixel(e->dpy, e->scr); - win->white = WhitePixel(e->dpy, e->scr); - + win->white = WhitePixel(e->dpy, e->scr); win->bgcol = win_alloc_color(win, WIN_BG_COLOR); + win->fscol = win_alloc_color(win, WIN_FS_COLOR); win->selcol = win_alloc_color(win, SEL_COLOR); win->barbgcol = win_alloc_color(win, BAR_BG_COLOR); win->barfgcol = win_alloc_color(win, BAR_FG_COLOR); @@ -195,7 +194,7 @@ void win_open(win_t *win) { cwatch = XCreateFontCursor(e->dpy, XC_watch); if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), "black", - &col, &col) == 0) + &col, &col) == 0) { die("could not allocate color: black"); } @@ -334,7 +333,7 @@ void win_clear(win_t *win) { XFreePixmap(e->dpy, win->pm); win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth); - XSetForeground(e->dpy, gc, win->fullscreen ? win->black : win->bgcol); + XSetForeground(e->dpy, gc, win->fullscreen ? win->fscol : win->bgcol); XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh); } @@ -38,9 +38,9 @@ typedef struct { Window xwin; win_env_t env; - unsigned long black; unsigned long white; unsigned long bgcol; + unsigned long fscol; unsigned long selcol; unsigned long barbgcol; unsigned long barfgcol; |