diff options
| author | N-R-K <79544946+N-R-K@users.noreply.github.com> | 2021-11-24 17:44:05 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 11:44:05 +0000 |
| commit | 43960312333bc9d9a6a8a95fff3563044856eccf (patch) | |
| tree | d8858317d04c9e08562648e33cef3910b2ef9fe0 | |
| parent | 0262988671d41a2828614822ebad645cf9b780b9 (diff) | |
switch back to whitelisting modifers (#150)
* Revert "Allow any set of modifiers to be used in keybindings"
this keeps things equal with sxiv while giving users possibility to
customize USED_MODMASK if they wish.
This reverts commit 3234b0e521cca006a94cb135a88d146122d7f66d.
Closes: https://github.com/nsxiv/nsxiv/issues/149
Closes: https://github.com/nsxiv/nsxiv/issues/123
Co-authored-by: Berke Kocaoğlu <berke.kocaoglu@metu.edu.tr>
| -rw-r--r-- | config.def.h | 6 | ||||
| -rw-r--r-- | main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config.def.h b/config.def.h index 7f7e74c..f044c66 100644 --- a/config.def.h +++ b/config.def.h @@ -42,7 +42,7 @@ static const int SLIDESHOW_DELAY = 5; /* gamma correction: the user-visible ranges [-GAMMA_RANGE, 0] and * (0, GAMMA_RANGE] are mapped to the ranges [0, 1], and (1, GAMMA_MAX]. - * */ + */ static const double GAMMA_MAX = 10.0; static const int GAMMA_RANGE = 32; @@ -71,8 +71,8 @@ static const int THUMB_SIZE = 3; #endif #ifdef _MAPPINGS_CONFIG -/* following modifiers (NumLock | CapsLock) will be ignored when processing keybindings */ -static const int ignore_mask = Mod2Mask | LockMask; +/* these modifiers will be used when processing keybindings */ +static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask; /* abort the keyhandler */ static const KeySym KEYHANDLER_ABORT = XK_Escape; @@ -36,7 +36,7 @@ #include <X11/keysym.h> #include <X11/XF86keysym.h> -#define MODMASK(mask) ((mask) & ~ignore_mask) +#define MODMASK(mask) ((mask) & USED_MODMASK) #define BAR_SEP " " typedef struct { |