Fix keyboard handling for SDL1

A lot of scancodes in SDL1 are > 256. The current code assumed in a lot of places that they are less than 256, causing eg. ctrl-key combination not to work. Also the the sdl_keymap array for translating keysyms to ascii was only suitable for SDL2.
TheAssemblyArmada · Mar 24, 2024 · 287b7f7 · 287b7f7
1 parent 77e2da0
commit 287b7f7
Show file tree

Hide file tree

Showing 17 changed files with 862 additions and 1,240 deletions.
diff --git a/common/gadget.cpp b/common/gadget.cpp
@@ -526,7 +526,7 @@ KeyNumType GadgetClass::Input(void)
     **	know the position of the mouse at the exact instant when the click occurred
     **	rather the the mouse position at the time we get around to this function.
     */
-    if (((key & 0xFF) == KN_LMOUSE) || ((key & 0xFF) == KN_RMOUSE)) {
+    if (((key & KN_SCANCODE_MASK) == KN_LMOUSE) || ((key & KN_SCANCODE_MASK) == KN_RMOUSE)) {
         mousex = Keyboard->MouseQX;
         mousey = Keyboard->MouseQY;
     } else {

diff --git a/common/sdl_keymap.h b/common/sdl_keymap.h