Commit 675db4b

nsxiv675db4b

Make statusbar optional (#95)

libXft and libfontconfig are now optional dependencies which can be
disabled via `HAVE_LIBFONTS=0`. Disabling them means disabling the
statusbar. This also does not search for freetype2 header if disabled.

Author: Arthur Williams
Date: 2021-09-19 01:49 -0700
Committer: NRK · 2021-10-10 02:17 +0600
Parent: 6ce94e3
Commit: 675db4bbb646ff51cc3ecc8ba7d587670872580a

+63 −34

6 files changed

Browse files Patch

−Context 3+

M Makefile +10 −4
M README.md +2 −3
M image.c +1 −1
M nsxiv.h +7 −3
M thumbs.c +3 −3
M window.c +40 −20

M Makefile View

M README.md View

M image.c View

M nsxiv.h View

M thumbs.c View

M window.c View

		@@ -13,6 +13,7 @@ OPT_DEP_DEFAULT ?= 1
13	13		HAVE_INOTIFY ?= $(OPT_DEP_DEFAULT)
14	14
15	15		# optional dependencies, see README for more info
	16	+	HAVE_LIBFONTS ?= $(OPT_DEP_DEFAULT)
16	17		HAVE_LIBGIF ?= $(OPT_DEP_DEFAULT)
17	18		HAVE_LIBEXIF ?= $(OPT_DEP_DEFAULT)
18	19		HAVE_LIBWEBP ?= $(OPT_DEP_DEFAULT)
		@@ -23,11 +24,16 @@ CFLAGS ?= -std=c99 -Wall -pedantic
23	24		# icons that will be installed via `make icon`
24	25		ICONS = 16x16.png 32x32.png 48x48.png 64x64.png 128x128.png
25	26
	27	+	inc_fonts_0 =
	28	+	inc_fonts_1 = -I/usr/include/freetype2 -I$(PREFIX)/include/freetype2
	29	+
26	30		CPPFLAGS = -D_XOPEN_SOURCE=700 \
27	31		-DHAVE_LIBGIF=$(HAVE_LIBGIF) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) \
28		−	-DHAVE_LIBWEBP=$(HAVE_LIBWEBP) \
29		−	-I/usr/include/freetype2 -I$(PREFIX)/include/freetype2
	32	+	-DHAVE_LIBWEBP=$(HAVE_LIBWEBP) -DHAVE_LIBFONTS=$(HAVE_LIBFONTS) \
	33	+	$(inc_fonts_$(HAVE_LIBFONTS))
30	34
	35	+	lib_fonts_0 =
	36	+	lib_fonts_1 = -lXft -lfontconfig
31	37		lib_exif_0 =
32	38		lib_exif_1 = -lexif
33	39		lib_gif_0 =
		@@ -37,9 +43,9 @@ lib_webp_1 = -lwebpdemux -lwebp
37	43		autoreload_0 = nop
38	44		autoreload_1 = inotify
39	45		# using += because certain *BSD distros may need to add additional flags
40		−	LDLIBS += -lImlib2 -lX11 -lXft -lfontconfig \
	46	+	LDLIBS += -lImlib2 -lX11 \
41	47		$(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_LIBGIF)) \
42		−	$(lib_webp_$(HAVE_LIBWEBP))
	48	+	$(lib_webp_$(HAVE_LIBWEBP)) $(lib_fonts_$(HAVE_LIBFONTS))
43	49
44	50		OBJS = autoreload_$(autoreload_$(HAVE_INOTIFY)).o commands.o image.o main.o options.o \
45	51		thumbs.o util.o window.o

		@@ -45,14 +45,13 @@ nsxiv requires the following software to be installed:
45	45
46	46		* Imlib2
47	47		* X11
48		−	* Xft
49		−	* freetype2
50		−	* fontconfig
51	48
52	49		The following dependencies are optional.
53	50
54	51		* inotify : Used for auto-reloading images on change.
55	52		Disabled via `HAVE_INOTIFY=0`
	53	+	* libXft, freetype2, fontconfig : Used for the status bar.
	54	+	Disabled via `HAVE_LIBFONTS=0`
56	55		* giflib : Used for animated gif playback.
57	56		Disabled via `HAVE_LIBGIF=0`.
58	57		* libexif : Used for auto-orientation and exif thumbnails.

		@@ -643,7 +643,7 @@ void img_render(img_t *img)
643	643		}
644	644		imlib_image_put_back_data(data);
645	645		} else {
646		−	c = win->win_bg.pixel;
	646	+	c = win->win_bg;
647	647		imlib_context_set_color(c >> 16 & 0xFF, c >> 8 & 0xFF, c & 0xFF, 0xFF);
648	648		imlib_image_fill_rectangle(0, 0, dw, dh);
649	649		}

		@@ -383,7 +383,9 @@ int r_mkdir(char*);
383	383		/* window.c */
384	384
385	385		#include <X11/Xutil.h>
	386	+	#if HAVE_LIBFONTS
386	387		#include <X11/Xft/Xft.h>
	388	+	#endif
387	389
388	390		enum {
389	391		BAR_L_LEN = 512,
		@@ -420,11 +422,13 @@ struct win {
420	422		Window xwin;
421	423		win_env_t env;
422	424
423		−	XftColor win_bg;
424		−	XftColor win_fg;
	425	+	unsigned long win_bg;
	426	+	unsigned long win_fg;
	427	+	unsigned long mrk_fg;
	428	+	#if HAVE_LIBFONTS
425	429		XftColor bar_bg;
426	430		XftColor bar_fg;
427		−	XftColor mrk_fg;
	431	+	#endif
428	432
429	433		int x;
430	434		int y;

		@@ -471,14 +471,14 @@ void tns_mark(tns_t *tns, int n, bool mark)
471	471		if (n >= 0 && n < *tns->cnt && tns->thumbs[n].im != NULL) {
472	472		win_t *win = tns->win;
473	473		thumb_t *t = &tns->thumbs[n];
474		−	unsigned long col = win->win_bg.pixel;
	474	+	unsigned long col = win->win_bg;
475	475		int x = t->x + t->w, y = t->y + t->h;
476	476
477	477		win_draw_rect(win, x - 1, y + 1, 1, tns->bw, true, 1, col);
478	478		win_draw_rect(win, x + 1, y - 1, tns->bw, 1, true, 1, col);
479	479
480	480		if (mark)
481		−	col = win->mrk_fg.pixel;
	481	+	col = win->mrk_fg;
482	482
483	483		win_draw_rect(win, x, y, tns->bw + 2, tns->bw + 2, true, 1, col);
484	484
		@@ -492,7 +492,7 @@ void tns_highlight(tns_t *tns, int n, bool hl)
492	492		if (n >= 0 && n < *tns->cnt && tns->thumbs[n].im != NULL) {
493	493		win_t *win = tns->win;
494	494		thumb_t *t = &tns->thumbs[n];
495		−	unsigned long col = hl ? win->win_fg.pixel : win->win_bg.pixel;
	495	+	unsigned long col = hl ? win->win_fg : win->win_bg;
496	496		int oxy = (tns->bw + 1) / 2 + 1, owh = tns->bw + 2;
497	497
498	498		win_draw_rect(win, t->x - oxy, t->y - oxy, t->w + owh, t->h + owh,

		@@ -20,7 +20,6 @@
20	20		#define _WINDOW_CONFIG
21	21		#include "config.h"
22	22		#include "icon/data.h"
23		−	#include "utf8.h"
24	23
25	24		#include <stdlib.h>
26	25		#include <string.h>
		@@ -30,6 +29,12 @@
30	29		#include <X11/Xatom.h>
31	30		#include <X11/Xresource.h>
32	31
	32	+	#if HAVE_LIBFONTS
	33	+	#include "utf8.h"
	34	+	static XftFont *font;
	35	+	static double fontsize;
	36	+	#endif
	37	+
33	38		#define RES_CLASS "Nsxiv"
34	39
35	40		enum {
		@@ -47,15 +52,14 @@ static struct {
47	52
48	53		static GC gc;
49	54
50		−	static XftFont *font;
51		−	static int fontheight;
52		−	static double fontsize;
53	55		static int barheight;
54	56
55	57		Atom atoms[ATOM_COUNT];
56	58
	59	+	#if HAVE_LIBFONTS
57	60		void win_init_font(const win_env_t e, const char fontstr)
58	61		{
	62	+	int fontheight = 0;
59	63		if ((font = XftFontOpenName(e->dpy, e->scr, fontstr)) == NULL)
60	64		error(EXIT_FAILURE, 0, "Error loading font '%s'", fontstr);
61	65		fontheight = font->ascent + font->descent;
		@@ -64,13 +68,19 @@ void win_init_font(const win_env_t e, const char fontstr)
64	68		XftFontClose(e->dpy, font);
65	69		}
66	70
67		−	void win_alloc_color(const win_env_t e, const char name, XftColor *col)
	71	+	void xft_alloc_color(const win_env_t e, const char name, XftColor *col)
68	72		{
69		−	if (!XftColorAllocName(e->dpy, e->vis,
70		−	e->cmap, name, col))
71		−	{
	73	+	if (!XftColorAllocName(e->dpy, e->vis, e->cmap, name, col))
72	74		error(EXIT_FAILURE, 0, "Error allocating color '%s'", name);
73		−	}
	75	+	}
	76	+	#endif /* HAVE_LIBFONTS */
	77	+
	78	+	void win_alloc_color(const win_env_t e, const char name, unsigned long *pixel)
	79	+	{
	80	+	XColor screen, exact;
	81	+	if (!XAllocNamedColor(e->dpy, e->cmap, name, &screen, &exact))
	82	+	error(EXIT_FAILURE, 0, "Error allocating color '%s'", name);
	83	+	*pixel = exact.pixel;
74	84		}
75	85
76	86		const char* win_res(XrmDatabase db, const char name, const char def)
		@@ -94,7 +104,10 @@ const char* win_res(XrmDatabase db, const char name, const char def)
94	104		void win_init(win_t *win)
95	105		{
96	106		win_env_t *e;
97		−	const char win_bg, win_fg, bar_bg, bar_fg, mrk_fg, f;
	107	+	const char win_bg, win_fg, *mrk_fg;
	108	+	#if HAVE_LIBFONTS
	109	+	const char bar_fg, bar_bg, *f;
	110	+	#endif
98	111		char *res_man;
99	112		XrmDatabase db;
100	113		XVisualInfo vis;
		@@ -131,20 +144,22 @@ void win_init(win_t *win)
131	144		res_man = XResourceManagerString(e->dpy);
132	145		db = res_man != NULL ? XrmGetStringDatabase(res_man) : None;
133	146
134		−	f = win_res(db, RES_CLASS ".bar.font", "monospace-8");
135		−	win_init_font(e, f);
136		−
137	147		win_bg = win_res(db, RES_CLASS ".window.background", "white");
138	148		win_fg = win_res(db, RES_CLASS ".window.foreground", "black");
139		−	bar_bg = win_res(db, RES_CLASS ".bar.background", win_bg);
140		−	bar_fg = win_res(db, RES_CLASS ".bar.foreground", win_fg);
141	149		mrk_fg = win_res(db, RES_CLASS ".mark.foreground", win_fg);
142	150		win_alloc_color(e, win_bg, &win->win_bg);
143	151		win_alloc_color(e, win_fg, &win->win_fg);
144		−	win_alloc_color(e, bar_bg, &win->bar_bg);
145		−	win_alloc_color(e, bar_fg, &win->bar_fg);
146	152		win_alloc_color(e, mrk_fg, &win->mrk_fg);
147	153
	154	+	#if HAVE_LIBFONTS
	155	+	bar_bg = win_res(db, RES_CLASS ".bar.background", win_bg);
	156	+	bar_fg = win_res(db, RES_CLASS ".bar.foreground", win_fg);
	157	+	xft_alloc_color(e, bar_bg, &win->bar_bg);
	158	+	xft_alloc_color(e, bar_fg, &win->bar_fg);
	159	+
	160	+	f = win_res(db, RES_CLASS ".bar.font", "monospace-8");
	161	+	win_init_font(e, f);
	162	+
148	163		win->bar.l.size = BAR_L_LEN;
149	164		win->bar.r.size = BAR_R_LEN;
150	165		/* 3 padding bytes needed by utf8_decode */
		@@ -153,6 +168,7 @@ void win_init(win_t *win)
153	168		win->bar.r.buf = emalloc(win->bar.r.size + 3);
154	169		win->bar.r.buf[0] = '\0';
155	170		win->bar.h = options->hide_bar ? 0 : barheight;
	171	+	#endif /* HAVE_LIBFONTS */
156	172
157	173		INIT_ATOM_(WM_DELETE_WINDOW);
158	174		INIT_ATOM_(_NET_WM_NAME);
		@@ -306,7 +322,7 @@ void win_open(win_t *win)
306	322		win->buf.h = e->scrh;
307	323		win->buf.pm = XCreatePixmap(e->dpy, win->xwin,
308	324		win->buf.w, win->buf.h, e->depth);
309		−	XSetForeground(e->dpy, gc, win->win_bg.pixel);
	325	+	XSetForeground(e->dpy, gc, win->win_bg);
310	326		XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
311	327		XSetWindowBackgroundPixmap(e->dpy, win->xwin, win->buf.pm);
312	328
		@@ -388,10 +404,11 @@ void win_clear(win_t *win)
388	404		win->buf.pm = XCreatePixmap(e->dpy, win->xwin,
389	405		win->buf.w, win->buf.h, e->depth);
390	406		}
391		−	XSetForeground(e->dpy, gc, win->win_bg.pixel);
	407	+	XSetForeground(e->dpy, gc, win->win_bg);
392	408		XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
393	409		}
394	410
	411	+	#if HAVE_LIBFONTS
395	412		#define TEXTWIDTH(win, text, len) \
396	413		win_draw_text(win, NULL, NULL, 0, 0, text, len, 0)
397	414
		@@ -448,7 +465,7 @@ void win_draw_bar(win_t *win)
448	465		XSetForeground(e->dpy, gc, win->bar_bg.pixel);
449	466		XFillRectangle(e->dpy, win->buf.pm, gc, 0, win->h, win->w, win->bar.h);
450	467
451		−	XSetForeground(e->dpy, gc, win->win_bg.pixel);
	468	+	XSetForeground(e->dpy, gc, win->win_bg);
452	469		XSetBackground(e->dpy, gc, win->bar_bg.pixel);
453	470
454	471		if ((len = strlen(r->buf)) > 0) {
		@@ -465,6 +482,9 @@ void win_draw_bar(win_t *win)
465	482		}
466	483		XftDrawDestroy(d);
467	484		}
	485	+	#else
	486	+	void win_draw_bar(win_t *win){}
	487	+	#endif /* HAVE_LIBFONTS */
468	488
469	489		void win_draw(win_t *win)
470	490		{

nsxiv/675db4b

Make statusbar optional (#95)

nsxiv675db4b