Commit 3238ef6

nsxiv3238ef6

Fixed issue #41, added WIN_FS_COLOR to config.h

+7 −7

4 files changed

−Context 3+

M config.def.h View

M thumbs.c View

M window.c View

M window.h View

		@@ -15,6 +15,7 @@ static const char * const BAR_FONT = "fixed";
15	15		* (see X(7) section "COLOR NAMES" for valid values)
16	16		*/
17	17		static const char * const WIN_BG_COLOR = "#777777";
	18	+	static const char * const WIN_FS_COLOR = "#000000";
18	19		static const char * const SEL_COLOR = "#DDDDDD";
19	20		static const char * const BAR_BG_COLOR = "#222222";
20	21		static const char * const BAR_FG_COLOR = "#EEEEEE";

		@@ -379,7 +379,7 @@ void tns_highlight(tns_t *tns, int n, bool hl) {
379	379		if (hl)
380	380		col = win->selcol;
381	381		else if (win->fullscreen)
382		−	col = win->black;
	382	+	col = win->fscol;
383	383		else
384	384		col = win->bgcol;
385	385

		@@ -110,10 +110,9 @@ void win_init(win_t *win) {
110	110		e->cmap = DefaultColormap(e->dpy, e->scr);
111	111		e->depth = DefaultDepth(e->dpy, e->scr);
112	112
113		−	win->black = BlackPixel(e->dpy, e->scr);
114		−	win->white = WhitePixel(e->dpy, e->scr);
115		−
	113	+	win->white = WhitePixel(e->dpy, e->scr);
116	114		win->bgcol = win_alloc_color(win, WIN_BG_COLOR);
	115	+	win->fscol = win_alloc_color(win, WIN_FS_COLOR);
117	116		win->selcol = win_alloc_color(win, SEL_COLOR);
118	117		win->barbgcol = win_alloc_color(win, BAR_BG_COLOR);
119	118		win->barfgcol = win_alloc_color(win, BAR_FG_COLOR);
		@@ -195,7 +194,7 @@ void win_open(win_t *win) {
195	194		cwatch = XCreateFontCursor(e->dpy, XC_watch);
196	195
197	196		if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), "black",
198		−	&col, &col) == 0)
	197	+	&col, &col) == 0)
199	198		{
200	199		die("could not allocate color: black");
201	200		}
		@@ -334,7 +333,7 @@ void win_clear(win_t *win) {
334	333		XFreePixmap(e->dpy, win->pm);
335	334		win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth);
336	335
337		−	XSetForeground(e->dpy, gc, win->fullscreen ? win->black : win->bgcol);
	336	+	XSetForeground(e->dpy, gc, win->fullscreen ? win->fscol : win->bgcol);
338	337		XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh);
339	338		}
340	339