[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 09/15] input: keyboard: switch sdl ui to new cor
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RFC PATCH 09/15] input: keyboard: switch sdl ui to new core [wip] |
Date: |
Thu, 28 Nov 2013 15:30:04 +0100 |
FIXME: pause key not handled yet.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index 9d8583c..1b1224a 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -30,6 +30,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"
@@ -261,9 +262,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(dcl->con, i, false);
modifiers_state[i] = 0;
}
}
@@ -271,11 +270,12 @@ static void reset_keys(void)
static void sdl_process_key(SDL_KeyboardEvent *ev)
{
- int keycode, v;
+ int keycode;
+#if 0
if (ev->keysym.sym == SDLK_PAUSE) {
/* specific case */
- v = 0;
+ int v = 0;
if (ev->type == SDL_KEYUP)
v |= SCANCODE_UP;
kbd_put_keycode(0xe1);
@@ -283,6 +283,7 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)
kbd_put_keycode(0x45 | v);
return;
}
+#endif
if (kbd_layout) {
keycode = sdl_keyevent_to_keycode_generic(ev);
@@ -312,19 +313,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(dcl->con, keycode, true);
+ qemu_input_event_send_key(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(dcl->con, keycode,
+ ev->type == SDL_KEYDOWN);
}
static void sdl_update_caption(void)
--
1.8.3.1
- [Qemu-devel] [RFC PATCH 00/15] input: rewrite qemu input layer, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 03/15] input: define event types using qapi, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 13/15] input: mouse: switch legacy handlers to new core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 02/15] input: rename file to legacy, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 01/15] console: export QemuConsole index, width, height, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 05/15] input: keyboard: add helper functions to core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 06/15] input: keyboard: switch legacy handlers to new core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 07/15] input: keyboard: switch qmp_send_key() to new core., Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 15/15] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 10/15] input: mouse: add helpers functions to core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 09/15] input: keyboard: switch sdl ui to new core [wip],
Gerd Hoffmann <=
- [Qemu-devel] [RFC PATCH 12/15] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 14/15] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 08/15] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 04/15] input: add core bits of the new input layer, Gerd Hoffmann, 2013/11/28
- [Qemu-devel] [RFC PATCH 11/15] input: mouse: add graphic_rotate support, Gerd Hoffmann, 2013/11/28