ref: fe40cda75a9665f7b464fa9909de0a7f62613817
parent: c0f715fbaca77fbb6e86de604098d82687bdea48
author: Simon Tatham <anakin@pobox.com>
date: Sat Mar 4 09:30:37 EST 2023
Treat keypad-Enter as CURSOR_SELECT, same as Return. The two Return/Enter keys have always been treated the same in the past, but a user complained today that Enter was no longer functioning as CURSOR_SELECT in the web puzzles. This happened in commit 9dbcfa765ba59a8, apparently because the web front end is now translating the Enter key as MOD_NUM_KEYPAD | '\r' instead of just '\r', and the new code in midend.c is only stripping off MOD_NUM_KEYPAD for values >= 0x80. Now it strips MOD_NUM_KEYPAD off C0 control characters as well, so that only _printable_ ASCII characters can still have that modifier when they get to the backend - i.e. you can tell numpad digits from normal digits, and ditto +-* etc. But keypad Enter is now turned into plain '\r' by the modifier removal code, and then into CURSOR_SELECT. Other front ends still aren't even bothering to set MOD_NUM_KEYPAD on the code sent by Enter. But that's fine, because now midend.c officially doesn't care whether they do or not.
--- a/midend.c
+++ b/midend.c
@@ -1182,8 +1182,8 @@
/* interpret_move() expects CTRL and SHFT only on cursor keys. */
if (!IS_CURSOR_MOVE(button & ~MOD_MASK))
button &= ~(MOD_CTRL | MOD_SHFT);
- /* ... and NUM_KEYPAD only on ASCII values. */
- if ((button & ~MOD_MASK) >= 0x80)
+ /* ... and NUM_KEYPAD only on printable ASCII values. */
+ if ((button & ~MOD_MASK) < 0x20 || (button & ~MOD_MASK) >= 0x80)
button &= ~MOD_NUM_KEYPAD;
/*
* Translate keyboard presses to cursor selection.