zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor button & ~MOD_MASK' as STRIP_BUTTON_MODIFIERS(button)'.

Browse Source 
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.
This commit is contained in:
Franklin Wei
2024-07-21 18:06:37 -04:00
committed by Simon Tatham
parent c010ca122f
commit 5de69c22b0
20 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
midend.c
View File

@ -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.