[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/42] input: keyboard: switch sdl ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 14/42] input: keyboard: switch sdl ui to new core |
Date: |
Wed, 22 Jan 2014 17:20:19 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index 736bb95..c3b8036 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -32,6 +32,7 @@
#include "qemu-common.h"
#include "ui/console.h"
+#include "ui/input.h"
#include "sysemu/sysemu.h"
#include "x_keymap.h"
#include "sdl_zoom.h"
@@ -263,9 +264,7 @@ static void reset_keys(void)
int i;
for(i = 0; i < 256; i++) {
if (modifiers_state[i]) {
- if (i & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(i | SCANCODE_UP);
+ qemu_input_event_send_key_number(dcl->con, i, false);
modifiers_state[i] = 0;
}
}
@@ -273,16 +272,12 @@ static void reset_keys(void)
static void sdl_process_key(SDL_KeyboardEvent *ev)
{
- int keycode, v;
+ int keycode;
if (ev->keysym.sym == SDLK_PAUSE) {
/* specific case */
- v = 0;
- if (ev->type == SDL_KEYUP)
- v |= SCANCODE_UP;
- kbd_put_keycode(0xe1);
- kbd_put_keycode(0x1d | v);
- kbd_put_keycode(0x45 | v);
+ qemu_input_event_send_key_qcode(dcl->con, Q_KEY_CODE_PAUSE,
+ ev->type == SDL_KEYDOWN);
return;
}
@@ -314,19 +309,15 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)
case 0x45: /* num lock */
case 0x3a: /* caps lock */
/* SDL does not send the key up event, so we generate it */
- kbd_put_keycode(keycode);
- kbd_put_keycode(keycode | SCANCODE_UP);
+ qemu_input_event_send_key_number(dcl->con, keycode, true);
+ qemu_input_event_send_key_number(dcl->con, keycode, false);
return;
#endif
}
/* now send the key code */
- if (keycode & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- if (ev->type == SDL_KEYUP)
- kbd_put_keycode(keycode | SCANCODE_UP);
- else
- kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
+ qemu_input_event_send_key_number(dcl->con, keycode,
+ ev->type == SDL_KEYDOWN);
}
static void sdl_update_caption(void)
--
1.8.3.1
- [Qemu-devel] [PATCH v2 06/42] input: qapi: define event types, (continued)
- [Qemu-devel] [PATCH v2 06/42] input: qapi: define event types, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 07/42] input: qapi: add unmapped key, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 03/42] sdl2: remove text console logic, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 21/42] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 05/42] input: rename file to legacy, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 04/42] console: export QemuConsole index, width, height, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 17/42] input: keyboard: switch spice ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 01/42] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 15/42] sdl2: switch keyboard handling to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 09/42] input: add core bits of the new input layer, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 14/42] input: keyboard: switch sdl ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 11/42] input: keyboard: switch legacy handlers to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 12/42] input: keyboard: switch qmp_send_key() to new core., Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 13/42] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 23/42] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 10/42] input: keyboard: add helper functions to core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 27/42] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 16/42] input: keyboard: switch vnc ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 18/42] input: keyboard: switch curses ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 35/42] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 22/42] input: mouse: switch legacy handlers to new core, Gerd Hoffmann, 2014/01/22