Krolyxon
Commit 5dc7993

Branches

Refs →

nsxiv5dc7993

Simplified command arguments

Author
Bert Münnich
Date
2015-01-11 11:38 +0100
Committer
Bert Münnich · 2015-01-11 11:39 +0100
Parent
808a10e
Commit
5dc7993478b7c4273fcbcec83616d2ac33ca43b4

+125 −144

4 files changed

Browse files Patch
−Context 3+
  1. M Makefile +1 −1
  2. M commands.c +35 −54
  3. M commands.h +1 −1
  4. M config.def.h +88 −88
M Makefile View
@@ -1,4 +1,4 @@
1−VERSION := git-20150107
1+VERSION := git-20150111
22
33 PREFIX := /usr/local
44 MANPREFIX := $(PREFIX)/share/man
M commands.c View
@@ -55,7 +55,7 @@ extern int markcnt;
5555 extern int prefix;
5656 extern bool extprefix;
5757
58−bool cg_quit(arg_t a)
58+bool cg_quit(arg_t _)
5959 {
6060 unsigned int i;
6161
@@ -69,7 +69,7 @@ bool cg_quit(arg_t a)
6969 exit(EXIT_SUCCESS);
7070 }
7171
72−bool cg_switch_mode(arg_t a)
72+bool cg_switch_mode(arg_t _)
7373 {
7474 if (mode == MODE_IMAGE) {
7575 if (tns.thumbs == NULL)
@@ -89,7 +89,7 @@ bool cg_switch_mode(arg_t a)
8989 return true;
9090 }
9191
92−bool cg_toggle_fullscreen(arg_t a)
92+bool cg_toggle_fullscreen(arg_t _)
9393 {
9494 win_toggle_fullscreen(&win);
9595 /* redraw after next ConfigureNotify event */
@@ -101,7 +101,7 @@ bool cg_toggle_fullscreen(arg_t a)
101101 return false;
102102 }
103103
104−bool cg_toggle_bar(arg_t a)
104+bool cg_toggle_bar(arg_t _)
105105 {
106106 win_toggle_bar(&win);
107107 if (mode == MODE_IMAGE) {
@@ -114,13 +114,13 @@ bool cg_toggle_bar(arg_t a)
114114 return true;
115115 }
116116
117−bool cg_prefix_external(arg_t a)
117+bool cg_prefix_external(arg_t _)
118118 {
119119 extprefix = true;
120120 return false;
121121 }
122122
123−bool cg_reload_image(arg_t a)
123+bool cg_reload_image(arg_t _)
124124 {
125125 if (mode == MODE_IMAGE) {
126126 load_image(fileidx);
@@ -134,7 +134,7 @@ bool cg_reload_image(arg_t a)
134134 return true;
135135 }
136136
137−bool cg_remove_image(arg_t a)
137+bool cg_remove_image(arg_t _)
138138 {
139139 remove_file(fileidx, true);
140140 if (mode == MODE_IMAGE)
@@ -144,7 +144,7 @@ bool cg_remove_image(arg_t a)
144144 return true;
145145 }
146146
147−bool cg_first(arg_t a)
147+bool cg_first(arg_t _)
148148 {
149149 if (mode == MODE_IMAGE && fileidx != 0) {
150150 load_image(0);
@@ -158,7 +158,7 @@ bool cg_first(arg_t a)
158158 }
159159 }
160160
161−bool cg_n_or_last(arg_t a)
161+bool cg_n_or_last(arg_t _)
162162 {
163163 int n = prefix != 0 && prefix - 1 < filecnt ? prefix - 1 : filecnt - 1;
164164
@@ -174,20 +174,16 @@ bool cg_n_or_last(arg_t a)
174174 }
175175 }
176176
177−bool cg_scroll_screen(arg_t a)
177+bool cg_scroll_screen(arg_t dir)
178178 {
179− direction_t dir = (direction_t) a;
180−
181179 if (mode == MODE_IMAGE)
182180 return img_pan(&img, dir, -1);
183181 else
184182 return tns_scroll(&tns, dir, true);
185183 }
186184
187−bool cg_zoom(arg_t a)
185+bool cg_zoom(arg_t d)
188186 {
189− long d = (long) a;
190−
191187 if (mode == MODE_THUMB)
192188 return tns_zoom(&tns, d);
193189 else if (d > 0)
@@ -198,7 +194,7 @@ bool cg_zoom(arg_t a)
198194 return false;
199195 }
200196
201−bool cg_toggle_image_mark(arg_t a)
197+bool cg_toggle_image_mark(arg_t _)
202198 {
203199 files[fileidx].flags ^= FF_MARK;
204200 markcnt += files[fileidx].flags & FF_MARK ? 1 : -1;
@@ -207,7 +203,7 @@ bool cg_toggle_image_mark(arg_t a)
207203 return true;
208204 }
209205
210−bool cg_reverse_marks(arg_t a)
206+bool cg_reverse_marks(arg_t _)
211207 {
212208 int i;
213209
@@ -220,7 +216,7 @@ bool cg_reverse_marks(arg_t a)
220216 return true;
221217 }
222218
223−bool cg_unmark_all(arg_t a)
219+bool cg_unmark_all(arg_t _)
224220 {
225221 int i;
226222
@@ -232,9 +228,8 @@ bool cg_unmark_all(arg_t a)
232228 return true;
233229 }
234230
235−bool cg_navigate_marked(arg_t a)
231+bool cg_navigate_marked(arg_t n)
236232 {
237− long n = (long) a;
238233 int d, i;
239234 int new = fileidx;
240235
@@ -260,9 +255,9 @@ bool cg_navigate_marked(arg_t a)
260255 }
261256 }
262257
263−bool cg_change_gamma(arg_t a)
258+bool cg_change_gamma(arg_t d)
264259 {
265− if (img_change_gamma(&img, (long) a * (prefix > 0 ? prefix : 1))) {
260+ if (img_change_gamma(&img, d * (prefix > 0 ? prefix : 1))) {
266261 if (mode == MODE_THUMB)
267262 tns.dirty = true;
268263 return true;
@@ -271,10 +266,8 @@ bool cg_change_gamma(arg_t a)
271266 }
272267 }
273268
274−bool ci_navigate(arg_t a)
269+bool ci_navigate(arg_t n)
275270 {
276− long n = (long) a;
277−
278271 if (prefix > 0)
279272 n *= prefix;
280273 n += fileidx;
@@ -291,18 +284,18 @@ bool ci_navigate(arg_t a)
291284 }
292285 }
293286
294−bool ci_alternate(arg_t a)
287+bool ci_alternate(arg_t _)
295288 {
296289 load_image(alternate);
297290 return true;
298291 }
299292
300−bool ci_navigate_frame(arg_t a)
293+bool ci_navigate_frame(arg_t d)
301294 {
302− return !img.multi.animate && img_frame_navigate(&img, (long) a);
295+ return !img.multi.animate && img_frame_navigate(&img, d);
303296 }
304297
305−bool ci_toggle_animation(arg_t a)
298+bool ci_toggle_animation(arg_t _)
306299 {
307300 bool dirty = false;
308301
@@ -318,17 +311,13 @@ bool ci_toggle_animation(arg_t a)
318311 return dirty;
319312 }
320313
321−bool ci_scroll(arg_t a)
314+bool ci_scroll(arg_t dir)
322315 {
323− direction_t dir = (direction_t) a;
324−
325316 return img_pan(&img, dir, prefix);
326317 }
327318
328−bool ci_scroll_to_edge(arg_t a)
319+bool ci_scroll_to_edge(arg_t dir)
329320 {
330− direction_t dir = (direction_t) a;
331−
332321 return img_pan_edge(&img, dir);
333322 }
334323
@@ -343,7 +332,7 @@ Bool is_motionnotify(Display *d, XEvent *e, XPointer a)
343332 ox = x, oy = y; \
344333 break
345334
346−bool ci_drag(arg_t a)
335+bool ci_drag(arg_t _)
347336 {
348337 int dx = 0, dy = 0, i, ox, oy, x, y;
349338 unsigned int ui;
@@ -402,48 +391,42 @@ bool ci_drag(arg_t a)
402391 return true;
403392 }
404393
405−bool ci_set_zoom(arg_t a)
394+bool ci_set_zoom(arg_t zl)
406395 {
407− return img_zoom(&img, (prefix ? prefix : (long) a) / 100.0);
396+ return img_zoom(&img, (prefix ? prefix : zl) / 100.0);
408397 }
409398
410−bool ci_fit_to_win(arg_t a)
399+bool ci_fit_to_win(arg_t sm)
411400 {
412− scalemode_t sm = (scalemode_t) a;
413−
414401 return img_fit_win(&img, sm);
415402 }
416403
417−bool ci_rotate(arg_t a)
404+bool ci_rotate(arg_t degree)
418405 {
419− degree_t degree = (degree_t) a;
420−
421406 img_rotate(&img, degree);
422407 return true;
423408 }
424409
425−bool ci_flip(arg_t a)
410+bool ci_flip(arg_t dir)
426411 {
427− flipdir_t dir = (flipdir_t) a;
428−
429412 img_flip(&img, dir);
430413 return true;
431414 }
432415
433−bool ci_toggle_antialias(arg_t a)
416+bool ci_toggle_antialias(arg_t _)
434417 {
435418 img_toggle_antialias(&img);
436419 return true;
437420 }
438421
439−bool ci_toggle_alpha(arg_t a)
422+bool ci_toggle_alpha(arg_t _)
440423 {
441424 img.alpha = !img.alpha;
442425 img.dirty = true;
443426 return true;
444427 }
445428
446−bool ci_slideshow(arg_t a)
429+bool ci_slideshow(arg_t _)
447430 {
448431 if (prefix > 0) {
449432 img.ss.on = true;
@@ -458,14 +441,12 @@ bool ci_slideshow(arg_t a)
458441 return true;
459442 }
460443
461−bool ct_move_sel(arg_t a)
444+bool ct_move_sel(arg_t dir)
462445 {
463− direction_t dir = (direction_t) a;
464−
465446 return tns_move_selection(&tns, dir, prefix);
466447 }
467448
468−bool ct_reload_all(arg_t a)
449+bool ct_reload_all(arg_t _)
469450 {
470451 tns_free(&tns);
471452 tns_init(&tns, files, &filecnt, &fileidx, &win);
M commands.h View
@@ -23,7 +23,7 @@
2323
2424 #include "types.h"
2525
26−typedef void* arg_t;
26+typedef int arg_t;
2727 typedef bool (*cmd_f)(arg_t);
2828
2929 #define G_CMD(c) g_##c,
M config.def.h View
@@ -62,99 +62,99 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
6262 /* keyboard mappings for image and thumbnail mode: */
6363 static const keymap_t keys[] = {
6464 /* modifiers key function argument */
65− { 0, XK_q, g_quit, (arg_t) None },
66− { 0, XK_Return, g_switch_mode, (arg_t) None },
67− { 0, XK_f, g_toggle_fullscreen, (arg_t) None },
68− { 0, XK_b, g_toggle_bar, (arg_t) None },
69− { ControlMask, XK_x, g_prefix_external, (arg_t) None },
70− { 0, XK_g, g_first, (arg_t) None },
71− { 0, XK_G, g_n_or_last, (arg_t) None },
72− { 0, XK_r, g_reload_image, (arg_t) None },
73− { 0, XK_D, g_remove_image, (arg_t) None },
74− { ControlMask, XK_h, g_scroll_screen, (arg_t) DIR_LEFT },
75− { ControlMask, XK_Left, g_scroll_screen, (arg_t) DIR_LEFT },
76− { ControlMask, XK_j, g_scroll_screen, (arg_t) DIR_DOWN },
77− { ControlMask, XK_Down, g_scroll_screen, (arg_t) DIR_DOWN },
78− { ControlMask, XK_k, g_scroll_screen, (arg_t) DIR_UP },
79− { ControlMask, XK_Up, g_scroll_screen, (arg_t) DIR_UP },
80− { ControlMask, XK_l, g_scroll_screen, (arg_t) DIR_RIGHT },
81− { ControlMask, XK_Right, g_scroll_screen, (arg_t) DIR_RIGHT },
82− { 0, XK_plus, g_zoom, (arg_t) +1 },
83− { 0, XK_KP_Add, g_zoom, (arg_t) +1 },
84− { 0, XK_minus, g_zoom, (arg_t) -1 },
85− { 0, XK_KP_Subtract, g_zoom, (arg_t) -1 },
86− { 0, XK_m, g_toggle_image_mark, (arg_t) None },
87− { 0, XK_M, g_reverse_marks, (arg_t) None },
88− { ControlMask, XK_m, g_unmark_all, (arg_t) None },
89− { 0, XK_N, g_navigate_marked, (arg_t) +1 },
90− { 0, XK_P, g_navigate_marked, (arg_t) -1 },
91− { 0, XK_braceleft, g_change_gamma, (arg_t) -1 },
92− { 0, XK_braceright, g_change_gamma, (arg_t) +1 },
93− { ControlMask, XK_g, g_change_gamma, (arg_t) 0 },
94−
95− { 0, XK_h, t_move_sel, (arg_t) DIR_LEFT },
96− { 0, XK_Left, t_move_sel, (arg_t) DIR_LEFT },
97− { 0, XK_j, t_move_sel, (arg_t) DIR_DOWN },
98− { 0, XK_Down, t_move_sel, (arg_t) DIR_DOWN },
99− { 0, XK_k, t_move_sel, (arg_t) DIR_UP },
100− { 0, XK_Up, t_move_sel, (arg_t) DIR_UP },
101− { 0, XK_l, t_move_sel, (arg_t) DIR_RIGHT },
102− { 0, XK_Right, t_move_sel, (arg_t) DIR_RIGHT },
103− { 0, XK_R, t_reload_all, (arg_t) None },
104−
105− { 0, XK_n, i_navigate, (arg_t) +1 },
106− { 0, XK_n, i_scroll_to_edge, (arg_t) (DIR_LEFT | DIR_UP) },
107− { 0, XK_space, i_navigate, (arg_t) +1 },
108− { 0, XK_p, i_navigate, (arg_t) -1 },
109− { 0, XK_p, i_scroll_to_edge, (arg_t) (DIR_LEFT | DIR_UP) },
110− { 0, XK_BackSpace, i_navigate, (arg_t) -1 },
111− { 0, XK_bracketright, i_navigate, (arg_t) +10 },
112− { 0, XK_bracketleft, i_navigate, (arg_t) -10 },
113− { ControlMask, XK_6, i_alternate, (arg_t) None },
114− { ControlMask, XK_n, i_navigate_frame, (arg_t) +1 },
115− { ControlMask, XK_p, i_navigate_frame, (arg_t) -1 },
116− { ControlMask, XK_space, i_toggle_animation, (arg_t) None },
117− { 0, XK_h, i_scroll, (arg_t) DIR_LEFT },
118− { 0, XK_Left, i_scroll, (arg_t) DIR_LEFT },
119− { 0, XK_j, i_scroll, (arg_t) DIR_DOWN },
120− { 0, XK_Down, i_scroll, (arg_t) DIR_DOWN },
121− { 0, XK_k, i_scroll, (arg_t) DIR_UP },
122− { 0, XK_Up, i_scroll, (arg_t) DIR_UP },
123− { 0, XK_l, i_scroll, (arg_t) DIR_RIGHT },
124− { 0, XK_Right, i_scroll, (arg_t) DIR_RIGHT },
125− { 0, XK_H, i_scroll_to_edge, (arg_t) DIR_LEFT },
126− { 0, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN },
127− { 0, XK_K, i_scroll_to_edge, (arg_t) DIR_UP },
128− { 0, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT },
129− { 0, XK_equal, i_set_zoom, (arg_t) 100 },
130− { 0, XK_w, i_fit_to_win, (arg_t) SCALE_DOWN },
131− { 0, XK_W, i_fit_to_win, (arg_t) SCALE_FIT },
132− { 0, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH },
133− { 0, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT },
134− { 0, XK_less, i_rotate, (arg_t) DEGREE_270 },
135− { 0, XK_greater, i_rotate, (arg_t) DEGREE_90 },
136− { 0, XK_question, i_rotate, (arg_t) DEGREE_180 },
137− { 0, XK_bar, i_flip, (arg_t) FLIP_HORIZONTAL },
138− { 0, XK_underscore, i_flip, (arg_t) FLIP_VERTICAL },
139− { 0, XK_a, i_toggle_antialias, (arg_t) None },
140− { 0, XK_A, i_toggle_alpha, (arg_t) None },
141− { 0, XK_s, i_slideshow, (arg_t) None },
65+ { 0, XK_q, g_quit, None },
66+ { 0, XK_Return, g_switch_mode, None },
67+ { 0, XK_f, g_toggle_fullscreen, None },
68+ { 0, XK_b, g_toggle_bar, None },
69+ { ControlMask, XK_x, g_prefix_external, None },
70+ { 0, XK_g, g_first, None },
71+ { 0, XK_G, g_n_or_last, None },
72+ { 0, XK_r, g_reload_image, None },
73+ { 0, XK_D, g_remove_image, None },
74+ { ControlMask, XK_h, g_scroll_screen, DIR_LEFT },
75+ { ControlMask, XK_Left, g_scroll_screen, DIR_LEFT },
76+ { ControlMask, XK_j, g_scroll_screen, DIR_DOWN },
77+ { ControlMask, XK_Down, g_scroll_screen, DIR_DOWN },
78+ { ControlMask, XK_k, g_scroll_screen, DIR_UP },
79+ { ControlMask, XK_Up, g_scroll_screen, DIR_UP },
80+ { ControlMask, XK_l, g_scroll_screen, DIR_RIGHT },
81+ { ControlMask, XK_Right, g_scroll_screen, DIR_RIGHT },
82+ { 0, XK_plus, g_zoom, +1 },
83+ { 0, XK_KP_Add, g_zoom, +1 },
84+ { 0, XK_minus, g_zoom, -1 },
85+ { 0, XK_KP_Subtract, g_zoom, -1 },
86+ { 0, XK_m, g_toggle_image_mark, None },
87+ { 0, XK_M, g_reverse_marks, None },
88+ { ControlMask, XK_m, g_unmark_all, None },
89+ { 0, XK_N, g_navigate_marked, +1 },
90+ { 0, XK_P, g_navigate_marked, -1 },
91+ { 0, XK_braceleft, g_change_gamma, -1 },
92+ { 0, XK_braceright, g_change_gamma, +1 },
93+ { ControlMask, XK_g, g_change_gamma, 0 },
94+
95+ { 0, XK_h, t_move_sel, DIR_LEFT },
96+ { 0, XK_Left, t_move_sel, DIR_LEFT },
97+ { 0, XK_j, t_move_sel, DIR_DOWN },
98+ { 0, XK_Down, t_move_sel, DIR_DOWN },
99+ { 0, XK_k, t_move_sel, DIR_UP },
100+ { 0, XK_Up, t_move_sel, DIR_UP },
101+ { 0, XK_l, t_move_sel, DIR_RIGHT },
102+ { 0, XK_Right, t_move_sel, DIR_RIGHT },
103+ { 0, XK_R, t_reload_all, None },
104+
105+ { 0, XK_n, i_navigate, +1 },
106+ { 0, XK_n, i_scroll_to_edge, DIR_LEFT | DIR_UP },
107+ { 0, XK_space, i_navigate, +1 },
108+ { 0, XK_p, i_navigate, -1 },
109+ { 0, XK_p, i_scroll_to_edge, DIR_LEFT | DIR_UP },
110+ { 0, XK_BackSpace, i_navigate, -1 },
111+ { 0, XK_bracketright, i_navigate, +10 },
112+ { 0, XK_bracketleft, i_navigate, -10 },
113+ { ControlMask, XK_6, i_alternate, None },
114+ { ControlMask, XK_n, i_navigate_frame, +1 },
115+ { ControlMask, XK_p, i_navigate_frame, -1 },
116+ { ControlMask, XK_space, i_toggle_animation, None },
117+ { 0, XK_h, i_scroll, DIR_LEFT },
118+ { 0, XK_Left, i_scroll, DIR_LEFT },
119+ { 0, XK_j, i_scroll, DIR_DOWN },
120+ { 0, XK_Down, i_scroll, DIR_DOWN },
121+ { 0, XK_k, i_scroll, DIR_UP },
122+ { 0, XK_Up, i_scroll, DIR_UP },
123+ { 0, XK_l, i_scroll, DIR_RIGHT },
124+ { 0, XK_Right, i_scroll, DIR_RIGHT },
125+ { 0, XK_H, i_scroll_to_edge, DIR_LEFT },
126+ { 0, XK_J, i_scroll_to_edge, DIR_DOWN },
127+ { 0, XK_K, i_scroll_to_edge, DIR_UP },
128+ { 0, XK_L, i_scroll_to_edge, DIR_RIGHT },
129+ { 0, XK_equal, i_set_zoom, 100 },
130+ { 0, XK_w, i_fit_to_win, SCALE_DOWN },
131+ { 0, XK_W, i_fit_to_win, SCALE_FIT },
132+ { 0, XK_e, i_fit_to_win, SCALE_WIDTH },
133+ { 0, XK_E, i_fit_to_win, SCALE_HEIGHT },
134+ { 0, XK_less, i_rotate, DEGREE_270 },
135+ { 0, XK_greater, i_rotate, DEGREE_90 },
136+ { 0, XK_question, i_rotate, DEGREE_180 },
137+ { 0, XK_bar, i_flip, FLIP_HORIZONTAL },
138+ { 0, XK_underscore, i_flip, FLIP_VERTICAL },
139+ { 0, XK_a, i_toggle_antialias, None },
140+ { 0, XK_A, i_toggle_alpha, None },
141+ { 0, XK_s, i_slideshow, None },
142142 };
143143
144144 /* mouse button mappings for image mode: */
145145 static const button_t buttons[] = {
146146 /* modifiers button function argument */
147− { 0, 1, i_navigate, (arg_t) +1 },
148− { 0, 3, i_navigate, (arg_t) -1 },
149− { 0, 2, i_drag, (arg_t) None },
150− { 0, 4, i_scroll, (arg_t) DIR_UP },
151− { 0, 5, i_scroll, (arg_t) DIR_DOWN },
152− { ShiftMask, 4, i_scroll, (arg_t) DIR_LEFT },
153− { ShiftMask, 5, i_scroll, (arg_t) DIR_RIGHT },
154− { 0, 6, i_scroll, (arg_t) DIR_LEFT },
155− { 0, 7, i_scroll, (arg_t) DIR_RIGHT },
156− { ControlMask, 4, g_zoom, (arg_t) +1 },
157− { ControlMask, 5, g_zoom, (arg_t) -1 },
147+ { 0, 1, i_navigate, +1 },
148+ { 0, 3, i_navigate, -1 },
149+ { 0, 2, i_drag, None },
150+ { 0, 4, i_scroll, DIR_UP },
151+ { 0, 5, i_scroll, DIR_DOWN },
152+ { ShiftMask, 4, i_scroll, DIR_LEFT },
153+ { ShiftMask, 5, i_scroll, DIR_RIGHT },
154+ { 0, 6, i_scroll, DIR_LEFT },
155+ { 0, 7, i_scroll, DIR_RIGHT },
156+ { ControlMask, 4, g_zoom, +1 },
157+ { ControlMask, 5, g_zoom, -1 },
158158 };
159159
160160 #endif