Skip to contentSkip to conversation

ui: fix mixup between qnum and qcode in SDL1 key handling

PATCH In review Daniel P. Berrangé 2 participants 2 messages Feb 1, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ui: fix mixup between qnum and qcode in SDL1 key handling

The previous commit:

commit 2ec78706d188df7d3dab43d07b19b05ef7800a44
Author: Daniel P. Berrange <[email protected]>
Date: Wed Jan 17 16:47:15 2018 +0000

ui: convert GTK and SDL1 frontends to keycodemapdb

changed the x_keymap.c keymap so that its target was qcodes instead of qnums. It updated the GTK frontend to take account of this change, but forgot to update the SDL1 frontend. Thus the SDL frontend was getting qcodes but dispatching them as if they were qnums. IOW, keyboard input was completely hosed with SDL1. Since the keyboard layout tables are still all based on qnums, it is easier to just keep SDL1 using qnums as it will be deleted in a few releases time.

---
 ui/sdl.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
ui/sdl.c +8 -1
index c8f102bb9f..a6bff301eb 100644
@@ -242,6 +242,7 @@ static const guint16 *sdl_get_keymap(size_t *maplen)
 
 static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
 {
+    int qcode;
     if (!keycode_map) {
         return 0;
     }
@@ -249,7 +250,13 @@ static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
         return 0;
     }
 
-    return keycode_map[ev->keysym.scancode];
+    qcode = keycode_map[ev->keysym.scancode];
+
+    if (qcode > qemu_input_map_qcode_to_qnum_len) {
+        return 0;
+    }
+
+    return qemu_input_map_qcode_to_qnum[qcode];
 }
 
 static void reset_keys(void)
Signature · 1 line
2.14.3
Tested-by on v1 1/1
#1 lore raw
Quoted 16 lines · Daniel P. Berrangé

The previous commit:

commit 2ec78706d188df7d3dab43d07b19b05ef7800a44
Author: Daniel P. Berrange <[email protected]>
Date: Wed Jan 17 16:47:15 2018 +0000

ui: convert GTK and SDL1 frontends to keycodemapdb

changed the x_keymap.c keymap so that its target was qcodes instead of qnums. It updated the GTK frontend to take account of this change, but forgot to update the SDL1 frontend. Thus the SDL frontend was getting qcodes but dispatching them as if they were qnums. IOW, keyboard input was completely hosed with SDL1. Since the keyboard layout tables are still all based on qnums, it is easier to just keep SDL1 using qnums as it will be deleted in a few releases time.

Quoted 2 lines

Thanks, this seems to fix the issue I have seen with SDL1.

Quoted 32 lines

---
ui/sdl.c | 9 ++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
ui/sdl.c +8 -1
index c8f102bb9f..a6bff301eb 100644
@@ -242,6 +242,7 @@ static const guint16 *sdl_get_keymap(size_t *maplen)
 
 static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
 {
+    int qcode;
    if (!keycode_map) {
        return 0;
    }
@@ -249,7 +250,13 @@ static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
        return 0;
    }
 
-    return keycode_map[ev->keysym.scancode];
+    qcode = keycode_map[ev->keysym.scancode];
+
+    if (qcode > qemu_input_map_qcode_to_qnum_len) {
+        return 0;
+    }
+
+    return qemu_input_map_qcode_to_qnum[qcode];
 }
 
 static void reset_keys(void)