zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

js: Use KeyboardEvent.key for ASCII keystrokes

Browse Source 
This requires passing in KeyboardEvent.location from JavaScript so
that we can detect the numeric keypad properly.  Out of caution we
currently only set MOD_NUM_KEYPAD on numbers, like we always have,
but we have enough information to set it on arrow keys, Enter, "+",
etc.

This finally gets '/' and '\' working in Slant again.
This commit is contained in:
Ben Harris
2022-10-24 23:06:12 +01:00
parent 0db5fb525b
commit 768ef770a3
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
emcc.c
View File

@ -262,9 +262,14 @@ void mousemove(int x, int y, int buttons)
/* /*
* Keyboard handler called from JS. * Keyboard handler called from JS.
*/ */
void key(int keycode, const char *key, const char *chr, void key(int keycode, const char *key, const char *chr, int location,
bool shift, bool ctrl) bool shift, bool ctrl)
{ {
/* Key location constants from JavaScript. */
#define DOM_KEY_LOCATION_STANDARD 0
#define DOM_KEY_LOCATION_LEFT 1
#define DOM_KEY_LOCATION_RIGHT 2
#define DOM_KEY_LOCATION_NUMPAD 3
int keyevent = -1; int keyevent = -1;
if (!strnullcmp(key, "Backspace") || !strnullcmp(key, "Delete") || if (!strnullcmp(key, "Backspace") || !strnullcmp(key, "Delete") ||
@ -296,6 +301,9 @@ void key(int keycode, const char *key, const char *chr,
keyevent = MOD_NUM_KEYPAD | '7'; keyevent = MOD_NUM_KEYPAD | '7';
else if (!strnullcmp(key, "PageUp")) else if (!strnullcmp(key, "PageUp"))
keyevent = MOD_NUM_KEYPAD | '9'; keyevent = MOD_NUM_KEYPAD | '9';
else if (key && (unsigned char)key[0] < 0x80 && key[1] == '\0')
/* Key generating a single ASCII character. */
keyevent = key[0];
else if (keycode == 8 || keycode == 46) else if (keycode == 8 || keycode == 46)
keyevent = 127; /* Backspace / Delete */ keyevent = 127; /* Backspace / Delete */
else if (keycode == 13) else if (keycode == 13)
@ -340,6 +348,10 @@ void key(int keycode, const char *key, const char *chr,
keyevent &= 0x1F; keyevent &= 0x1F;
} }
if ('0' <= keyevent && keyevent <= '9' &&
location == DOM_KEY_LOCATION_NUMPAD)
keyevent |= MOD_NUM_KEYPAD;
midend_process_key(me, 0, 0, keyevent); midend_process_key(me, 0, 0, keyevent);
update_undo_redo(); update_undo_redo();
} }

6
emccpre.js
View File

@ -311,10 +311,10 @@ function initPuzzle() {
// the puzzle - so users of this puzzle collection in other media // the puzzle - so users of this puzzle collection in other media
// can indulge their instinct to press ^R for redo, for example, // can indulge their instinct to press ^R for redo, for example,
// without accidentally reloading the page. // without accidentally reloading the page.
key = Module.cwrap('key', 'void', ['number', 'string', key = Module.cwrap('key', 'void', ['number', 'string', 'string',
'string', 'number', 'number']); 'number', 'number', 'number']);
onscreen_canvas.onkeydown = function(event) { onscreen_canvas.onkeydown = function(event) {
key(event.keyCode, event.key, event.char, key(event.keyCode, event.key, event.char, event.location,
event.shiftKey ? 1 : 0, event.ctrlKey ? 1 : 0); event.shiftKey ? 1 : 0, event.ctrlKey ? 1 : 0);
event.preventDefault(); event.preventDefault();
}; };