Krolyxon
Commit b2eae52

Branches

Refs →

nsxivb2eae52

Proper support for Ctrl/Shift/Alt modifiers in key & mouse mappings

Author
Bert Münnich
Date
2014-01-02 13:36 +0100
Committer
Bert Münnich · 2014-01-02 14:13 +0100
Parent
ab28c9a
Commit
b2eae528ed54c3ee1509e410686fabc1c7ecc0b4

+110 −112

4 files changed

Browse files Patch
−Context 3+
  1. M Makefile +1 −1
  2. M commands.h +2 −3
  3. M config.def.h +92 −93
  4. M main.c +15 −15
M Makefile View
@@ -1,4 +1,4 @@
1−VERSION = git-20131231
1+VERSION = git-20140102
22
33 PREFIX = /usr/local
44 MANPREFIX = $(PREFIX)/share/man
M commands.h View
@@ -27,15 +27,14 @@ typedef void* arg_t;
2727 typedef bool (*command_f)(arg_t);
2828
2929 typedef struct {
30− bool ctrl;
30+ unsigned int mask;
3131 KeySym ksym;
3232 command_f cmd;
3333 arg_t arg;
3434 } keymap_t;
3535
3636 typedef struct {
37− bool ctrl;
38− bool shift;
37+ unsigned int mask;
3938 unsigned int button;
4039 command_f cmd;
4140 arg_t arg;
M config.def.h View
@@ -76,113 +76,112 @@ static const bool RENDER_WHITE_ALPHA = false;
7676
7777 /* keyboard mappings for image and thumbnail mode: */
7878 static const keymap_t keys[] = {
79− /* ctrl key function argument */
80− { false, XK_q, it_quit, (arg_t) None },
81− { false, XK_Return, it_switch_mode, (arg_t) None },
82− { false, XK_f, it_toggle_fullscreen, (arg_t) None },
83− { false, XK_b, it_toggle_bar, (arg_t) None },
84−
85− { false, XK_r, it_reload_image, (arg_t) None },
86− { false, XK_R, t_reload_all, (arg_t) None },
87− { false, XK_D, it_remove_image, (arg_t) None },
88−
89− { false, XK_n, i_navigate, (arg_t) +1 },
90− { false, XK_space, i_navigate, (arg_t) +1 },
91− { false, XK_p, i_navigate, (arg_t) -1 },
92− { false, XK_BackSpace, i_navigate, (arg_t) -1 },
93− { false, XK_bracketright, i_navigate, (arg_t) +10 },
94− { false, XK_bracketleft, i_navigate, (arg_t) -10 },
95− { true, XK_6, i_alternate, (arg_t) None },
96− { false, XK_g, it_first, (arg_t) None },
97− { false, XK_G, it_n_or_last, (arg_t) None },
98−
99− { true, XK_n, i_navigate_frame, (arg_t) +1 },
100− { true, XK_p, i_navigate_frame, (arg_t) -1 },
101− { true, XK_space, i_toggle_animation, (arg_t) None },
102−
103− { false, XK_m, it_toggle_image_mark, (arg_t) None },
104− { false, XK_M, it_reverse_marks, (arg_t) None },
105− { false, XK_N, it_navigate_marked, (arg_t) +1 },
106− { false, XK_P, it_navigate_marked, (arg_t) -1 },
107−
108− { false, XK_h, it_scroll_move, (arg_t) DIR_LEFT },
109− { false, XK_Left, it_scroll_move, (arg_t) DIR_LEFT },
110− { false, XK_j, it_scroll_move, (arg_t) DIR_DOWN },
111− { false, XK_Down, it_scroll_move, (arg_t) DIR_DOWN },
112− { false, XK_k, it_scroll_move, (arg_t) DIR_UP },
113− { false, XK_Up, it_scroll_move, (arg_t) DIR_UP },
114− { false, XK_l, it_scroll_move, (arg_t) DIR_RIGHT },
115− { false, XK_Right, it_scroll_move, (arg_t) DIR_RIGHT },
116−
117− { true, XK_h, it_scroll_screen, (arg_t) DIR_LEFT },
118− { true, XK_Left, it_scroll_screen, (arg_t) DIR_LEFT },
119− { true, XK_j, it_scroll_screen, (arg_t) DIR_DOWN },
120− { true, XK_Down, it_scroll_screen, (arg_t) DIR_DOWN },
121− { true, XK_k, it_scroll_screen, (arg_t) DIR_UP },
122− { true, XK_Up, it_scroll_screen, (arg_t) DIR_UP },
123− { true, XK_l, it_scroll_screen, (arg_t) DIR_RIGHT },
124− { true, XK_Right, it_scroll_screen, (arg_t) DIR_RIGHT },
125−
126− { false, XK_H, i_scroll_to_edge, (arg_t) DIR_LEFT },
127− { false, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN },
128− { false, XK_K, i_scroll_to_edge, (arg_t) DIR_UP },
129− { false, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT },
130−
131− { false, XK_plus, i_zoom, (arg_t) +1 },
132− { false, XK_KP_Add, i_zoom, (arg_t) +1 },
133− { false, XK_minus, i_zoom, (arg_t) -1 },
134− { false, XK_KP_Subtract, i_zoom, (arg_t) -1 },
135− { false, XK_equal, i_set_zoom, (arg_t) 100 },
136− { false, XK_w, i_fit_to_win, (arg_t) SCALE_FIT },
137− { false, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH },
138− { false, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT },
139− { false, XK_W, i_fit_to_img, (arg_t) None },
140−
141− { false, XK_less, i_rotate, (arg_t) DEGREE_270 },
142− { false, XK_greater, i_rotate, (arg_t) DEGREE_90 },
143− { false, XK_question, i_rotate, (arg_t) DEGREE_180 },
144−
145− { false, XK_bar, i_flip, (arg_t) FLIP_HORIZONTAL },
146− { false, XK_underscore, i_flip, (arg_t) FLIP_VERTICAL },
147−
148− { false, XK_a, i_toggle_antialias, (arg_t) None },
149− { false, XK_A, it_toggle_alpha, (arg_t) None },
150−
151− /* decrease/increase/reset gamma */
152− { false, XK_braceleft, i_change_gamma, (arg_t) -1 },
153− { false, XK_braceright, i_change_gamma, (arg_t) +1 },
154− { true, XK_G, i_change_gamma, (arg_t) 0 },
79+ /* modifiers key function argument */
80+ { 0, XK_q, it_quit, (arg_t) None },
81+ { 0, XK_Return, it_switch_mode, (arg_t) None },
82+ { 0, XK_f, it_toggle_fullscreen, (arg_t) None },
83+ { 0, XK_b, it_toggle_bar, (arg_t) None },
84+
85+ { 0, XK_r, it_reload_image, (arg_t) None },
86+ { 0, XK_R, t_reload_all, (arg_t) None },
87+ { 0, XK_D, it_remove_image, (arg_t) None },
88+
89+ { 0, XK_n, i_navigate, (arg_t) +1 },
90+ { 0, XK_space, i_navigate, (arg_t) +1 },
91+ { 0, XK_p, i_navigate, (arg_t) -1 },
92+ { 0, XK_BackSpace, i_navigate, (arg_t) -1 },
93+ { 0, XK_bracketright, i_navigate, (arg_t) +10 },
94+ { 0, XK_bracketleft, i_navigate, (arg_t) -10 },
95+ { ControlMask, XK_6, i_alternate, (arg_t) None },
96+ { 0, XK_g, it_first, (arg_t) None },
97+ { 0, XK_G, it_n_or_last, (arg_t) None },
98+
99+ { ControlMask, XK_n, i_navigate_frame, (arg_t) +1 },
100+ { ControlMask, XK_p, i_navigate_frame, (arg_t) -1 },
101+ { ControlMask, XK_space, i_toggle_animation, (arg_t) None },
102+
103+ { 0, XK_m, it_toggle_image_mark, (arg_t) None },
104+ { 0, XK_M, it_reverse_marks, (arg_t) None },
105+ { 0, XK_N, it_navigate_marked, (arg_t) +1 },
106+ { 0, XK_P, it_navigate_marked, (arg_t) -1 },
107+
108+ { 0, XK_h, it_scroll_move, (arg_t) DIR_LEFT },
109+ { 0, XK_Left, it_scroll_move, (arg_t) DIR_LEFT },
110+ { 0, XK_j, it_scroll_move, (arg_t) DIR_DOWN },
111+ { 0, XK_Down, it_scroll_move, (arg_t) DIR_DOWN },
112+ { 0, XK_k, it_scroll_move, (arg_t) DIR_UP },
113+ { 0, XK_Up, it_scroll_move, (arg_t) DIR_UP },
114+ { 0, XK_l, it_scroll_move, (arg_t) DIR_RIGHT },
115+ { 0, XK_Right, it_scroll_move, (arg_t) DIR_RIGHT },
116+
117+ { ControlMask, XK_h, it_scroll_screen, (arg_t) DIR_LEFT },
118+ { ControlMask, XK_Left, it_scroll_screen, (arg_t) DIR_LEFT },
119+ { ControlMask, XK_j, it_scroll_screen, (arg_t) DIR_DOWN },
120+ { ControlMask, XK_Down, it_scroll_screen, (arg_t) DIR_DOWN },
121+ { ControlMask, XK_k, it_scroll_screen, (arg_t) DIR_UP },
122+ { ControlMask, XK_Up, it_scroll_screen, (arg_t) DIR_UP },
123+ { ControlMask, XK_l, it_scroll_screen, (arg_t) DIR_RIGHT },
124+ { ControlMask, XK_Right, it_scroll_screen, (arg_t) DIR_RIGHT },
125+
126+ { 0, XK_H, i_scroll_to_edge, (arg_t) DIR_LEFT },
127+ { 0, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN },
128+ { 0, XK_K, i_scroll_to_edge, (arg_t) DIR_UP },
129+ { 0, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT },
130+
131+ { 0, XK_plus, i_zoom, (arg_t) +1 },
132+ { 0, XK_KP_Add, i_zoom, (arg_t) +1 },
133+ { 0, XK_minus, i_zoom, (arg_t) -1 },
134+ { 0, XK_KP_Subtract, i_zoom, (arg_t) -1 },
135+ { 0, XK_equal, i_set_zoom, (arg_t) 100 },
136+ { 0, XK_w, i_fit_to_win, (arg_t) SCALE_FIT },
137+ { 0, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH },
138+ { 0, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT },
139+ { 0, XK_W, i_fit_to_img, (arg_t) None },
140+
141+ { 0, XK_less, i_rotate, (arg_t) DEGREE_270 },
142+ { 0, XK_greater, i_rotate, (arg_t) DEGREE_90 },
143+ { 0, XK_question, i_rotate, (arg_t) DEGREE_180 },
144+
145+ { 0, XK_bar, i_flip, (arg_t) FLIP_HORIZONTAL },
146+ { 0, XK_underscore, i_flip, (arg_t) FLIP_VERTICAL },
147+
148+ { 0, XK_a, i_toggle_antialias, (arg_t) None },
149+ { 0, XK_A, it_toggle_alpha, (arg_t) None },
150+
151+ { 0, XK_braceleft, i_change_gamma, (arg_t) -1 },
152+ { 0, XK_braceright, i_change_gamma, (arg_t) +1 },
153+ { ControlMask, XK_G, i_change_gamma, (arg_t) 0 },
155154
156155 /* open current image with given program: */
157− { true, XK_g, it_open_with, (arg_t) "gimp" },
156+ { ControlMask, XK_g, it_open_with, (arg_t) "gimp" },
158157
159158 /* run shell command line on current file ("$SXIV_IMG"): */
160− { true, XK_less, it_shell_cmd, (arg_t) \
159+ { ControlMask, XK_less, it_shell_cmd, (arg_t) \
161160 "mogrify -rotate -90 \"$SXIV_IMG\"" },
162− { true, XK_greater, it_shell_cmd, (arg_t) \
161+ { ControlMask, XK_greater, it_shell_cmd, (arg_t) \
163162 "mogrify -rotate +90 \"$SXIV_IMG\"" },
164− { true, XK_question, it_shell_cmd, (arg_t) \
163+ { ControlMask, XK_question, it_shell_cmd, (arg_t) \
165164 "mogrify -rotate 180 \"$SXIV_IMG\"" },
166− { true, XK_comma, it_shell_cmd, (arg_t) \
165+ { ControlMask, XK_comma, it_shell_cmd, (arg_t) \
167166 "jpegtran -rotate 270 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" },
168− { true, XK_period, it_shell_cmd, (arg_t) \
167+ { ControlMask, XK_period, it_shell_cmd, (arg_t) \
169168 "jpegtran -rotate 90 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" },
170− { true, XK_slash, it_shell_cmd, (arg_t) \
169+ { ControlMask, XK_slash, it_shell_cmd, (arg_t) \
171170 "jpegtran -rotate 180 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" },
172171 };
173172
174173 /* mouse button mappings for image mode: */
175174 static const button_t buttons[] = {
176− /* ctrl shift button function argument */
177− { false, false, Button1, i_navigate, (arg_t) +1 },
178− { false, false, Button3, i_navigate, (arg_t) -1 },
179− { false, false, Button2, i_drag, (arg_t) None },
180− { false, false, Button4, it_scroll_move, (arg_t) DIR_UP },
181− { false, false, Button5, it_scroll_move, (arg_t) DIR_DOWN },
182− { false, true, Button4, it_scroll_move, (arg_t) DIR_LEFT },
183− { false, true, Button5, it_scroll_move, (arg_t) DIR_RIGHT },
184− { true, false, Button4, i_zoom, (arg_t) +1 },
185− { true, false, Button5, i_zoom, (arg_t) -1 },
175+ /* modifiers button function argument */
176+ { 0, Button1, i_navigate, (arg_t) +1 },
177+ { 0, Button3, i_navigate, (arg_t) -1 },
178+ { 0, Button2, i_drag, (arg_t) None },
179+ { 0, Button4, it_scroll_move, (arg_t) DIR_UP },
180+ { 0, Button5, it_scroll_move, (arg_t) DIR_DOWN },
181+ { ShiftMask, Button4, it_scroll_move, (arg_t) DIR_LEFT },
182+ { ShiftMask, Button5, it_scroll_move, (arg_t) DIR_RIGHT },
183+ { ControlMask, Button4, i_zoom, (arg_t) +1 },
184+ { ControlMask, Button5, i_zoom, (arg_t) -1 },
186185 };
187186
188187 #endif
M main.c View
@@ -418,30 +418,28 @@ void clear_resize(void)
418418 resized = false;
419419 }
420420
421−bool keymask(const keymap_t *k, unsigned int state)
422−{
423− return (k->ctrl ? ControlMask : 0) == (state & ControlMask);
424−}
425−
426−bool buttonmask(const button_t *b, unsigned int state)
427−{
428− return ((b->ctrl ? ControlMask : 0) | (b->shift ? ShiftMask : 0)) ==
429− (state & (ControlMask | ShiftMask));
430−}
421+#define MODMASK(mask) ((mask) & (ShiftMask|ControlMask|Mod1Mask))
431422
432423 void on_keypress(XKeyEvent *kev)
433424 {
434425 int i;
435− KeySym ksym;
426+ unsigned int sh;
427+ KeySym ksym, shksym;
436428 char key;
437429
438430 if (kev == NULL)
439431 return;
440432
433+ if (kev->state & ShiftMask) {
434+ kev->state &= ~ShiftMask;
435+ XLookupString(kev, &key, 1, &shksym, NULL);
436+ kev->state |= ShiftMask;
437+ }
441438 XLookupString(kev, &key, 1, &ksym, NULL);
439+ sh = (kev->state & ShiftMask) && ksym != shksym ? ShiftMask : 0;
442440
443− if ((ksym == XK_Escape || (key >= '0' && key <= '9')) &&
444− (kev->state & ControlMask) == 0)
441+ if ((ksym == XK_Escape && MODMASK(kev->state) == 0) ||
442+ (key >= '0' && key <= '9'))
445443 {
446444 /* number prefix for commands */
447445 prefix = ksym == XK_Escape ? 0 : prefix * 10 + (int) (key - '0');
@@ -449,7 +447,9 @@ void on_keypress(XKeyEvent *kev)
449447 }
450448
451449 for (i = 0; i < ARRLEN(keys); i++) {
452− if (keys[i].ksym == ksym && keymask(&keys[i], kev->state)) {
450+ if (keys[i].ksym == ksym &&
451+ MODMASK(keys[i].mask | sh) == MODMASK(kev->state))
452+ {
453453 if (keys[i].cmd != NULL && keys[i].cmd(keys[i].arg))
454454 redraw();
455455 prefix = 0;
@@ -471,7 +471,7 @@ void on_buttonpress(XButtonEvent *bev)
471471
472472 for (i = 0; i < ARRLEN(buttons); i++) {
473473 if (buttons[i].button == bev->button &&
474− buttonmask(&buttons[i], bev->state))
474+ MODMASK(buttons[i].mask) == MODMASK(bev->state))
475475 {
476476 if (buttons[i].cmd != NULL && buttons[i].cmd(buttons[i].arg))
477477 redraw();