summaryrefslogtreecommitdiffstats
path: root/window.c
diff options
context:
space:
mode:
authorBert Münnich <ber.t@gmx.com>2012-03-02 19:42:14 +0100
committerBert Münnich <ber.t@gmx.com>2012-03-02 19:42:14 +0100
commit3238ef6bf6a4a0e1842aff565f4286ef9de6ce3c (patch)
tree4b21b5eab39dd770a67d4674f011cfb93dae78f4 /window.c
parent37a42dba34db11374315951a72dc287a6f1a2129 (diff)
downloadnsxiv-3238ef6bf6a4a0e1842aff565f4286ef9de6ce3c.tar.zst
Fixed issue #41, added WIN_FS_COLOR to config.h
Diffstat (limited to 'window.c')
-rw-r--r--window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/window.c b/window.c
index 5d2eff3..455e216 100644
--- a/window.c
+++ b/window.c
@@ -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);
}