nsxiv3234b0e
Allow any set of modifiers to be used in keybindings
Previous the code only allowed ShiftMask,ControlMask or Mod1Mask to be used in keybindings and the presence of any others modifiers would be ignored. Most problems generally allow certain modifiers to be be ignored but not most and certainly don't allow Super-A to be treated like A. Now users can use any modifiers they want in keybindings and can also ignore any modifiers they want. By default only ModMask2 (commonly numlock is ignored)
+4 −1
2 files changed
- M config.def.h +3 −0
- M main.c +1 −1
| @@ -67,6 +67,9 @@ static const int THUMB_SIZE = 3; | |||
| 67 | 67 | #endif | |
| 68 | 68 | #ifdef _MAPPINGS_CONFIG | |
| 69 | 69 | ||
| 70 | + | /* Following modifiers (NumLock | CapsLock) will be ignored when processing keybindings */ | |
| 71 | + | static const int ignore_mask = Mod2Mask | LockMask; | |
| 72 | + | ||
| 70 | 73 | /* keyboard mappings for image and thumbnail mode: */ | |
| 71 | 74 | static const keymap_t keys[] = { | |
| 72 | 75 | /* modifiers key function argument */ | |
| @@ -566,7 +566,7 @@ end: | |||
| 566 | 566 | redraw(); | |
| 567 | 567 | } | |
| 568 | 568 | ||
| 569 | − | #define MODMASK(mask) ((mask) & (ShiftMask|ControlMask|Mod1Mask)) | |
| 569 | + | #define MODMASK(mask) ((mask) & ~ignore_mask) | |
| 570 | 570 | ||
| 571 | 571 | void on_keypress(XKeyEvent *kev) | |
| 572 | 572 | { | |