提交 34013c37 编写于 作者: G Gerd Hoffmann

sdl2: track kbd modifier state unconditionally

For both grapical and text consoles.
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180321135041.15768-3-kraxel@redhat.com
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
上级 da024b1e
...@@ -60,23 +60,7 @@ void sdl2_process_key(struct sdl2_console *scon, ...@@ -60,23 +60,7 @@ void sdl2_process_key(struct sdl2_console *scon,
qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode]; qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
if (!qemu_console_is_graphic(con)) { /* modifier state tracking */
if (ev->type == SDL_KEYDOWN) {
switch (ev->keysym.scancode) {
case SDL_SCANCODE_RETURN:
kbd_put_keysym_console(con, '\n');
break;
case SDL_SCANCODE_BACKSPACE:
kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE);
break;
default:
kbd_put_qcode_console(con, qcode, false);
break;
}
}
return;
}
switch (ev->keysym.scancode) { switch (ev->keysym.scancode) {
#if 0 #if 0
case SDL_SCANCODE_NUMLOCKCLEAR: case SDL_SCANCODE_NUMLOCKCLEAR:
...@@ -99,8 +83,27 @@ void sdl2_process_key(struct sdl2_console *scon, ...@@ -99,8 +83,27 @@ void sdl2_process_key(struct sdl2_console *scon,
} else { } else {
modifiers_state[ev->keysym.scancode] = 1; modifiers_state[ev->keysym.scancode] = 1;
} }
/* fall though */ break;
default: default:
/* nothing */
break;
}
if (!qemu_console_is_graphic(con)) {
if (ev->type == SDL_KEYDOWN) {
switch (ev->keysym.scancode) {
case SDL_SCANCODE_RETURN:
kbd_put_keysym_console(con, '\n');
break;
case SDL_SCANCODE_BACKSPACE:
kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE);
break;
default:
kbd_put_qcode_console(con, qcode, false);
break;
}
}
} else {
qemu_input_event_send_key_qcode(con, qcode, qemu_input_event_send_key_qcode(con, qcode,
ev->type == SDL_KEYDOWN); ev->type == SDL_KEYDOWN);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册