Commit ff88908

nsxivff88908

specify func argument and related cleanup (#183)

* specifies the function argument type in commands.h compared to leaving
  it unspecified. all the functions in cmd_t must have arg_t as it's
  argument.
* changes to commands.h will now trigger a rebuild - this restores old
  behavior prior to 12efa0e
* cg_quit now uses it's argument as exit status
* DestroyNotify invokes cg_quit rather than calling exit directly.
* Explicitly pass EXIT_SUCCESS to cgquit in keybinding

Author: N-R-K
Date: 2021-12-19 23:05 +0600
Committer: GitHub · 2021-12-19 23:05 +0600
Parent: 494578c
Commit: ff88908531a9d20667c6d08f01d7d887ebb60fe8

+40 −40

5 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M commands.c +2 −2
M commands.h +34 −34
M config.def.h +1 −1
M main.c +2 −2

M Makefile View

M commands.c View

M commands.h View

M config.def.h View

M main.c View

		@@ -64,7 +64,7 @@ nsxiv: $(OBJS)
64	64		@echo "CC $@"
65	65		$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
66	66
67		−	$(OBJS): Makefile nsxiv.h config.h
	67	+	$(OBJS): Makefile nsxiv.h config.h commands.h
68	68		options.o: version.h
69	69		window.o: icon/data.h
70	70

		@@ -52,7 +52,7 @@ extern int markidx;
52	52		extern int prefix;
53	53		extern bool extprefix;
54	54
55		−	bool cg_quit(arg_t _)
	55	+	bool cg_quit(arg_t status)
56	56		{
57	57		unsigned int i;
58	58
		@@ -62,7 +62,7 @@ bool cg_quit(arg_t _)
62	62		printf("%s%c", files[i].name, options->using_null ? '\0' : '\n');
63	63		}
64	64		}
65		−	exit(EXIT_SUCCESS);
	65	+	exit(status);
66	66		}
67	67
68	68		bool cg_switch_mode(arg_t _)

		@@ -3,42 +3,42 @@
3	3		#include <stdbool.h>
4	4
5	5		/* global */
6		−	bool cg_change_gamma();
7		−	bool cg_first();
8		−	bool cg_mark_range();
9		−	bool cg_n_or_last();
10		−	bool cg_navigate_marked();
11		−	bool cg_prefix_external();
12		−	bool cg_quit();
13		−	bool cg_reload_image();
14		−	bool cg_remove_image();
15		−	bool cg_reverse_marks();
16		−	bool cg_scroll_screen();
17		−	bool cg_switch_mode();
18		−	bool cg_toggle_bar();
19		−	bool cg_toggle_fullscreen();
20		−	bool cg_toggle_image_mark();
21		−	bool cg_unmark_all();
22		−	bool cg_zoom();
	6	+	bool cg_change_gamma(arg_t);
	7	+	bool cg_first(arg_t);
	8	+	bool cg_mark_range(arg_t);
	9	+	bool cg_n_or_last(arg_t);
	10	+	bool cg_navigate_marked(arg_t);
	11	+	bool cg_prefix_external(arg_t);
	12	+	bool cg_quit(arg_t);
	13	+	bool cg_reload_image(arg_t);
	14	+	bool cg_remove_image(arg_t);
	15	+	bool cg_reverse_marks(arg_t);
	16	+	bool cg_scroll_screen(arg_t);
	17	+	bool cg_switch_mode(arg_t);
	18	+	bool cg_toggle_bar(arg_t);
	19	+	bool cg_toggle_fullscreen(arg_t);
	20	+	bool cg_toggle_image_mark(arg_t);
	21	+	bool cg_unmark_all(arg_t);
	22	+	bool cg_zoom(arg_t);
23	23		/* image mode */
24		−	bool ci_alternate();
25		−	bool ci_cursor_navigate();
26		−	bool ci_drag();
27		−	bool ci_fit_to_win();
28		−	bool ci_flip();
29		−	bool ci_navigate();
30		−	bool ci_navigate_frame();
31		−	bool ci_rotate();
32		−	bool ci_scroll();
33		−	bool ci_scroll_to_edge();
34		−	bool ci_set_zoom();
35		−	bool ci_slideshow();
36		−	bool ci_toggle_alpha();
37		−	bool ci_toggle_animation();
	24	+	bool ci_alternate(arg_t);
	25	+	bool ci_cursor_navigate(arg_t);
	26	+	bool ci_drag(arg_t);
	27	+	bool ci_fit_to_win(arg_t);
	28	+	bool ci_flip(arg_t);
	29	+	bool ci_navigate(arg_t);
	30	+	bool ci_navigate_frame(arg_t);
	31	+	bool ci_rotate(arg_t);
	32	+	bool ci_scroll(arg_t);
	33	+	bool ci_scroll_to_edge(arg_t);
	34	+	bool ci_set_zoom(arg_t);
	35	+	bool ci_slideshow(arg_t);
	36	+	bool ci_toggle_alpha(arg_t);
	37	+	bool ci_toggle_animation(arg_t);
38	38		bool ci_toggle_antialias();
39	39		/* thumbnails mode */
40		−	bool ct_move_sel();
41		−	bool ct_reload_all();
	40	+	bool ct_move_sel(arg_t);
	41	+	bool ct_reload_all(arg_t);
42	42
43	43		/* global */
44	44		#define g_change_gamma { cg_change_gamma, MODE_ALL }
		@@ -80,4 +80,4 @@ bool ct_reload_all();
80	80		#define t_move_sel { ct_move_sel, MODE_THUMB }
81	81		#define t_reload_all { ct_reload_all, MODE_THUMB }
82	82
83		−	#endif
	83	+	#endif /* COMMANDS_H */

		@@ -89,7 +89,7 @@ static const KeySym KEYHANDLER_ABORT = XK_Escape;
89	89		/* keyboard mappings for image and thumbnail mode: */
90	90		static const keymap_t keys[] = {
91	91		/* modifiers key function argument */
92		−	{ 0, XK_q, g_quit, None },
	92	+	{ 0, XK_q, g_quit, EXIT_SUCCESS },
93	93		{ 0, XK_Return, g_switch_mode, None },
94	94		{ 0, XK_f, g_toggle_fullscreen, None },
95	95		{ 0, XK_b, g_toggle_bar, None },

		@@ -802,10 +802,10 @@ static void run(void)
802	802		break;
803	803		case ClientMessage:
804	804		if ((Atom) ev.xclient.data.l[0] == atoms[ATOM_WM_DELETE_WINDOW])
805		−	cg_quit();
	805	+	cg_quit(EXIT_SUCCESS);
806	806		break;
807	807		case DestroyNotify:
808		−	exit(EXIT_FAILURE);
	808	+	cg_quit(EXIT_FAILURE);
809	809		break;
810	810		case ConfigureNotify:
811	811		if (win_configure(&win, &ev.xconfigure)) {

nsxiv/ff88908

specify func argument and related cleanup (#183)

nsxivff88908