Commit 1e84773

nsxiv1e84773

Data driven timeout handling

Author: Bert
Date: 2011-09-02 04:33 +0200
Parent: 391e6e7
Commit: 1e84773276ede56309a145dc08a4f3d47ad3a29f

+137 −100

6 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M commands.c +14 −11
M main.c +111 −69
M types.h +5 −3
M util.c +0 −13
M util.h +6 −3

M Makefile View

M commands.c View

M main.c View

M types.h View

M util.c View

M util.h View

		@@ -1,6 +1,6 @@
1	1		all: sxiv
2	2
3		−	VERSION = git-20110819
	3	+	VERSION = git-20110902
4	4
5	5		CC = gcc
6	6		DESTDIR =

		@@ -30,6 +30,11 @@
30	30		void cleanup();
31	31		void remove_file(int, unsigned char);
32	32		void load_image(int);
	33	+	void redraw();
	34	+	void hide_cursor();
	35	+	void animate();
	36	+	void set_timeout(timeout_f, int, int);
	37	+	void reset_timeout(timeout_f);
33	38
34	39		extern appmode_t mode;
35	40		extern img_t img;
		@@ -39,10 +44,6 @@ extern win_t win;
39	44		extern fileinfo_t *files;
40	45		extern int filecnt, fileidx;
41	46
42		−	extern int timo_cursor;
43		−	extern int timo_redraw;
44		−	extern int timo_adelay;
45		−
46	47		int it_quit(arg_t a) {
47	48		cleanup();
48	49		exit(0);
		@@ -54,12 +55,11 @@ int it_switch_mode(arg_t a) {
54	55		tns_init(&tns, filecnt);
55	56		img_close(&img, 0);
56	57		win_set_cursor(&win, CURSOR_ARROW);
57		−	timo_cursor = 0;
	58	+	reset_timeout(hide_cursor);
58	59		tns.sel = fileidx;
59	60		tns.dirty = 1;
60	61		mode = MODE_THUMB;
61	62		} else {
62		−	timo_cursor = TO_CURSOR_HIDE;
63	63		load_image(tns.sel);
64	64		mode = MODE_IMAGE;
65	65		}
		@@ -68,11 +68,11 @@ int it_switch_mode(arg_t a) {
68	68
69	69		int it_toggle_fullscreen(arg_t a) {
70	70		win_toggle_fullscreen(&win);
	71	+	set_timeout(redraw, TO_REDRAW_RESIZE, 0);
71	72		if (mode == MODE_IMAGE)
72	73		img.checkpan = 1;
73	74		else
74	75		tns.dirty = 1;
75		−	timo_redraw = TO_WIN_RESIZE;
76	76		return 0;
77	77		}
78	78
		@@ -156,15 +156,18 @@ int i_navigate_frame(arg_t a) {
156	156		}
157	157
158	158		int i_toggle_animation(arg_t a) {
	159	+	int delay;
	160	+
159	161		if (mode != MODE_IMAGE)
160	162		return 0;
161	163
162	164		if (img.multi.animate) {
163		−	timo_adelay = 0;
	165	+	reset_timeout(animate);
164	166		img.multi.animate = 0;
165	167		return 0;
166	168		} else {
167		−	timo_adelay = img_frame_animate(&img, 1);
	169	+	delay = img_frame_animate(&img, 1);
	170	+	set_timeout(animate, delay, 1);
168	171		return 1;
169	172		}
170	173		}
		@@ -245,8 +248,8 @@ int i_drag(arg_t a) {
245	248		}
246	249
247	250		win_set_cursor(&win, CURSOR_ARROW);
248		−	timo_cursor = TO_CURSOR_HIDE;
249		−	timo_redraw = 0;
	251	+	set_timeout(hide_cursor, TO_CURSOR_HIDE, 1);
	252	+	reset_timeout(redraw);
250	253
251	254		return 0;
252	255		}

		@@ -33,9 +33,11 @@ typedef struct {
33	33
34	34		/* timeouts in milliseconds: */
35	35		enum {
36		−	TO_WIN_RESIZE = 75,
37		−	TO_CURSOR_HIDE = 1500,
38		−	TO_THUMBS_LOAD = 200
	36	+	TO_REDRAW_RESIZE = 75,
	37	+	TO_REDRAW_THUMBS = 200,
	38	+	TO_CURSOR_HIDE = 1500
39	39		};
40	40
	41	+	typedef void (*timeout_f)(void);
	42	+
41	43		#endif /* TYPES_H */

		@@ -87,19 +87,6 @@ void die(const char* fmt, ...) {
87	87		exit(1);
88	88		}
89	89
90		−	int min_int_nz(int n, ...) {
91		−	va_list args;
92		−	int i, a, m = 0;
93		−
94		−	va_start(args, n);
95		−	for (i = 0; i < n; i++) {
96		−	if ((a = va_arg(args, int)) && (!m \|\| a < m))
97		−	m = a;
98		−	}
99		−	va_end(args);
100		−	return m;
101		−	}
102		−
103	90		void size_readable(float size, const char *unit) {
104	91		const char *units[] = { "", "K", "M", "G" };
105	92		int i;

		@@ -33,7 +33,12 @@
33	33
34	34		#define MSEC_TO_TIMEVAL(t,tv) { \
35	35		(tv)->tv_sec = (t) / 1000; \
36		−	(tv)->tv_usec = (t) % 1000 * 1000; \
	36	+	(tv)->tv_usec = (t) % 1000 * 1000; \
	37	+	}
	38	+
	39	+	#define MSEC_ADD_TO_TIMEVAL(t,tv) { \
	40	+	(tv)->tv_sec += (t) / 1000; \
	41	+	(tv)->tv_usec += (t) % 1000 * 1000; \
37	42		}
38	43
39	44		#ifndef TIMESPEC_TO_TIMEVAL
		@@ -60,8 +65,6 @@ char* s_strdup(char*);
60	65		void warn(const char*, ...);
61	66		void die(const char*, ...);
62	67
63		−	int min_int_nz(int, ...);
64		−
65	68		void size_readable(float, const char*);
66	69
67	70		char* absolute_path(const char*);

		@@ -41,6 +41,17 @@ enum {
41	41		FNAME_CNT = 1024
42	42		};
43	43
	44	+	typedef struct {
	45	+	struct timeval when;
	46	+	Bool active;
	47	+	timeout_f handler;
	48	+	} timeout_t;
	49	+
	50	+	/* timeout handler functions: */
	51	+	void redraw();
	52	+	void hide_cursor();
	53	+	void animate();
	54	+
44	55		appmode_t mode;
45	56		img_t img;
46	57		tns_t tns;
		@@ -52,9 +63,11 @@ size_t filesize;
52	63
53	64		char win_title[TITLE_LEN];
54	65
55		−	int timo_cursor;
56		−	int timo_redraw;
57		−	int timo_adelay; /* multi-frame animation delay time */
	66	+	timeout_t timeouts[] = {
	67	+	{ { 0, 0 }, False, redraw },
	68	+	{ { 0, 0 }, False, hide_cursor },
	69	+	{ { 0, 0 }, False, animate }
	70	+	};
58	71
59	72		void cleanup() {
60	73		static int in = 0;
		@@ -120,6 +133,54 @@ void remove_file(int n, unsigned char silent) {
120	133		tns.cnt--;
121	134		}
122	135
	136	+	void set_timeout(timeout_f handler, int time, int overwrite) {
	137	+	int i;
	138	+
	139	+	for (i = 0; i < LEN(timeouts); i++) {
	140	+	if (timeouts[i].handler == handler) {
	141	+	if (!timeouts[i].active \|\| overwrite) {
	142	+	gettimeofday(&timeouts[i].when, 0);
	143	+	MSEC_ADD_TO_TIMEVAL(time, &timeouts[i].when);
	144	+	timeouts[i].active = True;
	145	+	}
	146	+	return;
	147	+	}
	148	+	}
	149	+	}
	150	+
	151	+	void reset_timeout(timeout_f handler) {
	152	+	int i;
	153	+
	154	+	for (i = 0; i < LEN(timeouts); i++) {
	155	+	if (timeouts[i].handler == handler) {
	156	+	timeouts[i].active = False;
	157	+	return;
	158	+	}
	159	+	}
	160	+	}
	161	+
	162	+	int check_timeouts(struct timeval *t) {
	163	+	int i, tdiff, tmin = -1;
	164	+	struct timeval now;
	165	+
	166	+	gettimeofday(&now, 0);
	167	+	for (i = 0; i < LEN(timeouts); i++) {
	168	+	if (timeouts[i].active) {
	169	+	tdiff = TIMEDIFF(&timeouts[i].when, &now);
	170	+	if (tdiff <= 0) {
	171	+	timeouts[i].active = False;
	172	+	if (timeouts[i].handler)
	173	+	timeouts[i].handler();
	174	+	} else if (tmin < 0 \|\| tdiff < tmin) {
	175	+	tmin = tdiff;
	176	+	}
	177	+	}
	178	+	}
	179	+	if (tmin > 0 && t)
	180	+	MSEC_TO_TIMEVAL(tmin, t);
	181	+	return tmin > 0;
	182	+	}
	183	+
123	184		void load_image(int new) {
124	185		struct stat fstats;
125	186
		@@ -144,9 +205,9 @@ void load_image(int new) {
144	205
145	206		if (img.multi.cnt) {
146	207		if (img.multi.animate)
147		−	timo_adelay = img.multi.frames[img.multi.sel].delay;
	208	+	set_timeout(animate, img.multi.frames[img.multi.sel].delay, 1);
148	209		else
149		−	timo_adelay = 0;
	210	+	reset_timeout(animate);
150	211		}
151	212		}
152	213
		@@ -186,15 +247,31 @@ void update_title() {
186	247		void redraw() {
187	248		if (mode == MODE_IMAGE) {
188	249		img_render(&img, &win);
189		−	if (timo_cursor)
190		−	win_set_cursor(&win, CURSOR_ARROW);
191		−	else
	250	+	if (img.multi.animate) {
192	251		win_set_cursor(&win, CURSOR_NONE);
	252	+	} else {
	253	+	win_set_cursor(&win, CURSOR_ARROW);
	254	+	set_timeout(hide_cursor, TO_CURSOR_HIDE, 1);
	255	+	}
193	256		} else {
194	257		tns_render(&tns, &win);
195	258		}
196	259		update_title();
197		−	timo_redraw = 0;
	260	+	reset_timeout(redraw);
	261	+	}
	262	+
	263	+	void hide_cursor() {
	264	+	win_set_cursor(&win, CURSOR_NONE);
	265	+	}
	266	+
	267	+	void animate() {
	268	+	int delay;
	269	+
	270	+	delay = img_frame_animate(&img, 0);
	271	+	if (delay) {
	272	+	set_timeout(animate, delay, 1);
	273	+	redraw();
	274	+	}
198	275		}
199	276
200	277		Bool keymask(const keymap_t *k, unsigned int state) {
		@@ -233,7 +310,7 @@ void on_buttonpress(XButtonEvent *bev) {
233	310
234	311		if (mode == MODE_IMAGE) {
235	312		win_set_cursor(&win, CURSOR_ARROW);
236		−	timo_cursor = TO_CURSOR_HIDE;
	313	+	set_timeout(hide_cursor, TO_CURSOR_HIDE, 1);
237	314
238	315		for (i = 0; i < LEN(buttons); i++) {
239	316		if (buttons[i].button == bev->button &&
		@@ -252,7 +329,7 @@ void on_buttonpress(XButtonEvent *bev) {
252	329		if (sel == tns.sel) {
253	330		load_image(tns.sel);
254	331		mode = MODE_IMAGE;
255		−	timo_cursor = TO_CURSOR_HIDE;
	332	+	set_timeout(hide_cursor, TO_CURSOR_HIDE, 1);
256	333		} else {
257	334		tns_highlight(&tns, &win, tns.sel, False);
258	335		tns_highlight(&tns, &win, sel, True);
		@@ -272,75 +349,39 @@ void on_buttonpress(XButtonEvent *bev) {
272	349		}
273	350
274	351		void run() {
275		−	int xfd, timeout;
	352	+	int xfd;
276	353		fd_set fds;
277		−	struct timeval tt, t0, t1;
	354	+	struct timeval timeout;
278	355		XEvent ev;
279	356
280		−	timo_cursor = mode == MODE_IMAGE ? TO_CURSOR_HIDE : 0;
281		−
282	357		redraw();
283	358
284	359		while (1) {
285		−	if (mode == MODE_THUMB && tns.cnt < filecnt) {
	360	+	if (!XPending(win.env.dpy)) {
286	361		/* load thumbnails */
287		−	win_set_cursor(&win, CURSOR_WATCH);
288		−	gettimeofday(&t0, 0);
289		−
290		−	while (tns.cnt < filecnt && !XPending(win.env.dpy)) {
	362	+	while (mode == MODE_THUMB && tns.cnt < filecnt) {
	363	+	win_set_cursor(&win, CURSOR_WATCH);
291	364		if (tns_load(&tns, tns.cnt, &files[tns.cnt], False, False))
292	365		tns.cnt++;
293	366		else
294	367		remove_file(tns.cnt, 0);
295		−	gettimeofday(&t1, 0);
296		−	if (TIMEDIFF(&t1, &t0) >= TO_THUMBS_LOAD)
297		−	break;
298		−	}
299		−	if (tns.cnt == filecnt)
300		−	win_set_cursor(&win, CURSOR_ARROW);
301		−	if (!XPending(win.env.dpy)) {
302		−	redraw();
303		−	continue;
304		−	} else {
305		−	timo_redraw = TO_THUMBS_LOAD;
306		−	}
307		−	}
308		−
309		−	if (timo_cursor \|\| timo_redraw \|\| timo_adelay) {
310		−	/* check active timeouts */
311		−	gettimeofday(&t0, 0);
312		−	timeout = min_int_nz(3, timo_cursor, timo_redraw, timo_adelay);
313		−	MSEC_TO_TIMEVAL(timeout, &tt);
314		−	xfd = ConnectionNumber(win.env.dpy);
315		−	FD_ZERO(&fds);
316		−	FD_SET(xfd, &fds);
317		−
318		−	if (!XPending(win.env.dpy))
319		−	select(xfd + 1, &fds, 0, 0, &tt);
320		−	gettimeofday(&t1, 0);
321		−	timeout = MIN(TIMEDIFF(&t1, &t0), timeout);
322		−
323		−	/* timeouts fired? */
324		−	if (timo_cursor) {
325		−	timo_cursor = MAX(0, timo_cursor - timeout);
326		−	if (!timo_cursor)
327		−	win_set_cursor(&win, CURSOR_NONE);
328		−	}
329		−	if (timo_redraw) {
330		−	timo_redraw = MAX(0, timo_redraw - timeout);
331		−	if (!timo_redraw)
	368	+	if (tns.cnt == filecnt) {
332	369		redraw();
333		−	}
334		−	if (timo_adelay) {
335		−	timo_adelay = MAX(0, timo_adelay - timeout);
336		−	if (!timo_adelay) {
337		−	if ((timo_adelay = img_frame_animate(&img, 0)))
338		−	redraw();
	370	+	win_set_cursor(&win, CURSOR_ARROW);
	371	+	} else {
	372	+	set_timeout(redraw, TO_REDRAW_THUMBS, 0);
	373	+	check_timeouts(NULL);
339	374		}
340	375		}
341		−	if ((timo_cursor \|\| timo_redraw \|\| timo_adelay) &&
342		−	!XPending(win.env.dpy))
343		−	continue;
	376	+
	377	+	/* handle timeouts */
	378	+	if (check_timeouts(&timeout)) {
	379	+	xfd = ConnectionNumber(win.env.dpy);
	380	+	FD_ZERO(&fds);
	381	+	FD_SET(xfd, &fds);
	382	+	if (!select(xfd + 1, &fds, 0, 0, &timeout))
	383	+	check_timeouts(NULL);
	384	+	}
344	385		}
345	386
346	387		if (!XNextEvent(win.env.dpy, &ev)) {
		@@ -355,7 +396,7 @@ void run() {
355	396		break;
356	397		case ConfigureNotify:
357	398		if (win_configure(&win, &ev.xconfigure)) {
358		−	timo_redraw = TO_WIN_RESIZE;
	399	+	set_timeout(redraw, TO_REDRAW_RESIZE, 0);
359	400		if (mode == MODE_IMAGE)
360	401		img.checkpan = 1;
361	402		else
		@@ -366,9 +407,10 @@ void run() {
366	407		on_keypress(&ev.xkey);
367	408		break;
368	409		case MotionNotify:
369		−	if (!timo_cursor)
	410	+	if (mode == MODE_IMAGE) {
370	411		win_set_cursor(&win, CURSOR_ARROW);
371		−	timo_cursor = TO_CURSOR_HIDE;
	412	+	set_timeout(hide_cursor, TO_CURSOR_HIDE, 1);
	413	+	}
372	414		break;
373	415		}
374	416		}

nsxiv/1e84773

Data driven timeout handling

nsxiv1e84773