From 5de69c22b0ff037f648a740a7c01869e78587df2 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 21 Jul 2024 18:06:37 -0400 Subject: Refactor `button & ~MOD_MASK' as `STRIP_BUTTON_MODIFIERS(button)'. This refactors all instances of bitwise-ANDs with `~MOD_MASK'. There is a handful of more complex instances I left unchanged (in cube.c, midend.c, and twiddle.c), since those AND with `~MOD_MASK | MOD_NUM_KEYPAD' or similar. I don't think it's worth writing a macro for those cases. Also document this new macro's usage in devel.but. --- midend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'midend.c') diff --git a/midend.c b/midend.c index bcacfc2..30fdf1b 100644 --- a/midend.c +++ b/midend.c @@ -1214,7 +1214,8 @@ int midend_process_key(midend *me, int x, int y, int button) /* Canonicalise CTRL+ASCII. */ if ((button & MOD_CTRL) && - (button & ~MOD_MASK) >= 0x40 && (button & ~MOD_MASK) < 0x80) + STRIP_BUTTON_MODIFIERS(button) >= 0x40 && + STRIP_BUTTON_MODIFIERS(button) < 0x80) button = button & (0x1f | (MOD_MASK & ~MOD_CTRL)); /* Special handling to make CTRL+SHFT+Z into REDO. */ if ((button & (~MOD_MASK | MOD_SHFT)) == (MOD_SHFT | '\x1A')) @@ -1230,7 +1231,8 @@ int midend_process_key(midend *me, int x, int y, int button) button &= ~(MOD_CTRL | MOD_SHFT); } /* interpret_move() expects NUM_KEYPAD only on numbers. */ - if ((button & ~MOD_MASK) < '0' || (button & ~MOD_MASK) > '9') + if (STRIP_BUTTON_MODIFIERS(button) < '0' || + STRIP_BUTTON_MODIFIERS(button) > '9') button &= ~MOD_NUM_KEYPAD; /* * Translate keyboard presses to cursor selection. -- cgit v1.1