[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/14] sdl2: use only QKeyCode in sdl2_process_key()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/14] sdl2: use only QKeyCode in sdl2_process_key() |
Date: |
Tue, 5 Feb 2019 11:57:54 +0100 |
Also: sdl2_process_key is never called with scon == NULL.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Message-id: address@hidden
---
ui/sdl2-input.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index 22e3336aab..664364a5e5 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -34,20 +34,19 @@ void sdl2_process_key(struct sdl2_console *scon,
SDL_KeyboardEvent *ev)
{
int qcode;
- QemuConsole *con = scon ? scon->dcl.con : NULL;
+ QemuConsole *con = scon->dcl.con;
if (ev->keysym.scancode >= qemu_input_map_usb_to_qcode_len) {
return;
}
-
qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
qkbd_state_key_event(scon->kbd, qcode, ev->type == SDL_KEYDOWN);
if (!qemu_console_is_graphic(con)) {
bool ctrl = qkbd_state_modifier_get(scon->kbd, QKBD_MOD_CTRL);
if (ev->type == SDL_KEYDOWN) {
- switch (ev->keysym.scancode) {
- case SDL_SCANCODE_RETURN:
+ switch (qcode) {
+ case Q_KEY_CODE_RET:
kbd_put_keysym_console(con, '\n');
break;
default:
--
2.9.3
- [Qemu-devel] [PULL 01/14] Remove deprecated -no-frame option, (continued)
- [Qemu-devel] [PULL 01/14] Remove deprecated -no-frame option, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 04/14] ui/sdl_keysym: Remove obsolete SDL1.2 related code, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 03/14] ui: listen for GDK_SMOOTH_SCROLL events, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 11/14] kbd-state: use state tracker for gtk, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 06/14] ui/egl-helpers: Augment parameter list of egl_texture_blend() to convey scales of viewport, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 05/14] ui/cocoa.m: Fix macOS 10.14 deprecation warnings, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 02/14] ui: don't send any event if delta_y == 0, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 08/14] sdl2: remove sdl2_reset_keys() function, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 09/14] kbd-state: use state tracker for sdl2, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 12/14] kbd-state: use state tracker for vnc, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 10/14] sdl2: use only QKeyCode in sdl2_process_key(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 14/14] keymap: fix keyup mappings, Gerd Hoffmann, 2019/02/05
- [Qemu-devel] [PULL 07/14] kbd-state: add keyboard state tracker, Gerd Hoffmann, 2019/02/05
- Re: [Qemu-devel] [PULL 00/14] Ui 20190205 patches, Peter Maydell, 2019/02/05