Commit 919ada1

nsxiv919ada1

Align compile-time color options with X resource colors

Two colors are more than enough!

Author: Bert Münnich
Date: 2019-01-23 21:18 +0100
Committer: Bert Münnich · 2019-01-23 21:21 +0100
Parent: 9d244da
Commit: 919ada11232781e3624363d834a6b9851c3a2bcb

+37 −32

5 files changed

Browse files Patch

−Context 3+

M config.def.h +2 −5
M image.c +1 −1
M sxiv.h +4 −5
M thumbs.c +4 −4
M window.c +26 −17

M config.def.h View

M image.c View

M sxiv.h View

M thumbs.c View

M window.c View

		@@ -14,11 +14,8 @@ static const char * const BAR_FONT = "monospace:size=8";
14	14		/* colors:
15	15		* (see X(7) section "COLOR NAMES" for valid values)
16	16		*/
17		−	static const char * const WIN_BG_COLOR = "#555555";
18		−	static const char * const WIN_FS_COLOR = "#000000";
19		−	static const char * const SEL_COLOR = "#EEEEEE";
20		−	static const char * const BAR_BG_COLOR = "#222222";
21		−	static const char * const BAR_FG_COLOR = "#EEEEEE";
	17	+	static const char * const BG_COLOR = "#555555";
	18	+	static const char * const FG_COLOR = "#EEEEEE";
22	19
23	20		#endif
24	21		#ifdef _IMAGE_CONFIG

		@@ -497,7 +497,7 @@ void img_render(img_t *img)
497	497		}
498	498		imlib_image_put_back_data(data);
499	499		} else {
500		−	c = win->fullscreen ? win->fscol.pixel : win->bgcol.pixel;
	500	+	c = win->fullscreen ? win->black.pixel : win->bg.pixel;
501	501		imlib_context_set_color(c >> 16 & 0xFF, c >> 8 & 0xFF, c & 0xFF, 0xFF);
502	502		imlib_image_fill_rectangle(0, 0, dw, dh);
503	503		}

		@@ -408,9 +408,10 @@ struct win {
408	408		Window xwin;
409	409		win_env_t env;
410	410
411		−	XftColor bgcol;
412		−	XftColor fscol;
413		−	XftColor selcol;
	411	+	bool light; /* bg is lighter than fg */
	412	+	XftColor bg;
	413	+	XftColor fg;
	414	+	XftColor black;
414	415
415	416		int x;
416	417		int y;
		@@ -430,8 +431,6 @@ struct win {
430	431		unsigned int h;
431	432		win_bar_t l;
432	433		win_bar_t r;
433		−	XftColor bgcol;
434		−	XftColor fgcol;
435	434		} bar;
436	435		};
437	436

		@@ -468,14 +468,14 @@ void tns_mark(tns_t *tns, int n, bool mark)
468	468		if (n >= 0 && n < *tns->cnt && tns->thumbs[n].im != NULL) {
469	469		win_t *win = tns->win;
470	470		thumb_t *t = &tns->thumbs[n];
471		−	unsigned long col = win->fullscreen ? win->fscol.pixel : win->bgcol.pixel;
	471	+	unsigned long col = win->fullscreen ? win->black.pixel : win->bg.pixel;
472	472		int x = t->x + t->w, y = t->y + t->h;
473	473
474	474		win_draw_rect(win, x - 1, y + 1, 1, tns->bw, true, 1, col);
475	475		win_draw_rect(win, x + 1, y - 1, tns->bw, 1, true, 1, col);
476	476
477	477		if (mark)
478		−	col = win->selcol.pixel;
	478	+	col = win->fullscreen && win->light ? win->bg.pixel : win->fg.pixel;
479	479
480	480		win_draw_rect(win, x, y, tns->bw + 2, tns->bw + 2, true, 1, col);
481	481
		@@ -493,9 +493,9 @@ void tns_highlight(tns_t *tns, int n, bool hl)
493	493		int oxy = (tns->bw + 1) / 2 + 1, owh = tns->bw + 2;
494	494
495	495		if (hl)
496		−	col = win->selcol.pixel;
	496	+	col = win->fullscreen && win->light ? win->bg.pixel : win->fg.pixel;
497	497		else
498		−	col = win->fullscreen ? win->fscol.pixel : win->bgcol.pixel;
	498	+	col = win->fullscreen ? win->black.pixel : win->bg.pixel;
499	499
500	500		win_draw_rect(win, t->x - oxy, t->y - oxy, t->w + owh, t->h + owh,
501	501		false, tns->bw, col);

		@@ -121,12 +121,18 @@ const char* win_res(Display dpy, const char name, const char *def)
121	121		}
122	122		}
123	123
	124	+	unsigned int win_luminance(const XftColor *col)
	125	+	{
	126	+	return (col->color.red + col->color.green + col->color.blue) / 3;
	127	+	}
	128	+
124	129		#define INIT_ATOM_(atom) \
125	130		atoms[ATOM_##atom] = XInternAtom(e->dpy, #atom, False);
126	131
127	132		void win_init(win_t *win)
128	133		{
129	134		win_env_t *e;
	135	+	const char bg, fg;
130	136
131	137		memset(win, 0, sizeof(win_t));
132	138
		@@ -146,15 +152,12 @@ void win_init(win_t *win)
146	152
147	153		win_init_font(e, BAR_FONT);
148	154
149		−	win_alloc_color(e, win_res(e->dpy, RES_CLASS ".background", WIN_BG_COLOR),
150		−	&win->bgcol);
151		−	win_alloc_color(e, WIN_FS_COLOR, &win->fscol);
152		−	win_alloc_color(e, win_res(e->dpy, RES_CLASS ".foreground", SEL_COLOR),
153		−	&win->selcol);
154		−	win_alloc_color(e, win_res(e->dpy, RES_CLASS ".foreground", BAR_BG_COLOR),
155		−	&win->bar.bgcol);
156		−	win_alloc_color(e, win_res(e->dpy, RES_CLASS ".background", BAR_FG_COLOR),
157		−	&win->bar.fgcol);
	155	+	bg = win_res(e->dpy, RES_CLASS ".background", BG_COLOR);
	156	+	fg = win_res(e->dpy, RES_CLASS ".foreground", FG_COLOR);
	157	+	win_alloc_color(e, bg, &win->bg);
	158	+	win_alloc_color(e, fg, &win->fg);
	159	+	win_alloc_color(e, "black", &win->black);
	160	+	win->light = win_luminance(&win->bg) > win_luminance(&win->fg);
158	161
159	162		win->bar.l.size = BAR_L_LEN;
160	163		win->bar.r.size = BAR_R_LEN;
		@@ -294,7 +297,7 @@ void win_open(win_t *win)
294	297		win->buf.h = e->scrh;
295	298		win->buf.pm = XCreatePixmap(e->dpy, win->xwin,
296	299		win->buf.w, win->buf.h, e->depth);
297		−	XSetForeground(e->dpy, gc, fullscreen ? win->fscol.pixel : win->bgcol.pixel);
	300	+	XSetForeground(e->dpy, gc, fullscreen ? win->black.pixel : win->bg.pixel);
298	301		XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
299	302		XSetWindowBackgroundPixmap(e->dpy, win->xwin, win->buf.pm);
300	303
		@@ -386,14 +389,14 @@ void win_clear(win_t *win)
386	389		win->buf.pm = XCreatePixmap(e->dpy, win->xwin,
387	390		win->buf.w, win->buf.h, e->depth);
388	391		}
389		−	XSetForeground(e->dpy, gc, win->fullscreen ? win->fscol.pixel : win->bgcol.pixel);
	392	+	XSetForeground(e->dpy, gc, win->fullscreen ? win->black.pixel : win->bg.pixel);
390	393		XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
391	394		}
392	395
393	396		#define TEXTWIDTH(win, text, len) \
394	397		win_draw_text(win, NULL, NULL, 0, 0, text, len, 0)
395	398
396		−	int win_draw_text(win_t win, XftDraw d, XftColor *color, int x, int y,
	399	+	int win_draw_text(win_t win, XftDraw d, const XftColor *color, int x, int y,
397	400		char *text, int len, int w)
398	401		{
399	402		int err, tw = 0;
		@@ -432,6 +435,7 @@ void win_draw_bar(win_t *win)
432	435		win_env_t *e;
433	436		win_bar_t l, r;
434	437		XftDraw *d;
	438	+	const XftColor bg, fg;
435	439
436	440		if ((l = &win->bar.l)->buf == NULL \|\| (r = &win->bar.r)->buf == NULL)
437	441		return;
		@@ -442,23 +446,28 @@ void win_draw_bar(win_t *win)
442	446		d = XftDrawCreate(e->dpy, win->buf.pm, DefaultVisual(e->dpy, e->scr),
443	447		DefaultColormap(e->dpy, e->scr));
444	448
445		−	XSetForeground(e->dpy, gc, win->bar.bgcol.pixel);
	449	+	if (win->fullscreen && !win->light)
	450	+	bg = &win->bg, fg = &win->fg;
	451	+	else
	452	+	bg = &win->fg, fg = &win->bg;
	453	+
	454	+	XSetForeground(e->dpy, gc, bg->pixel);
446	455		XFillRectangle(e->dpy, win->buf.pm, gc, 0, win->h, win->w, win->bar.h);
447	456
448		−	XSetForeground(e->dpy, gc, win->bar.fgcol.pixel);
449		−	XSetBackground(e->dpy, gc, win->bar.bgcol.pixel);
	457	+	XSetForeground(e->dpy, gc, fg->pixel);
	458	+	XSetBackground(e->dpy, gc, bg->pixel);
450	459
451	460		if ((len = strlen(r->buf)) > 0) {
452	461		if ((tw = TEXTWIDTH(win, r->buf, len)) > w)
453	462		return;
454	463		x = win->w - tw - H_TEXT_PAD;
455	464		w -= tw;
456		−	win_draw_text(win, d, &win->bar.fgcol, x, y, r->buf, len, tw);
	465	+	win_draw_text(win, d, fg, x, y, r->buf, len, tw);
457	466		}
458	467		if ((len = strlen(l->buf)) > 0) {
459	468		x = H_TEXT_PAD;
460	469		w -= 2 * H_TEXT_PAD; /* gap between left and right parts */
461		−	win_draw_text(win, d, &win->bar.fgcol, x, y, l->buf, len, w);
	470	+	win_draw_text(win, d, fg, x, y, l->buf, len, w);
462	471		}
463	472		XftDrawDestroy(d);
464	473		}

nsxiv/919ada1

Align compile-time color options with X resource colors

nsxiv919ada1