From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm2c6-0001f9-8M for qemu-devel@nongnu.org; Thu, 28 Nov 2013 09:30:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vm2bw-0006lP-Ms for qemu-devel@nongnu.org; Thu, 28 Nov 2013 09:30:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm2bw-0006km-Cx for qemu-devel@nongnu.org; Thu, 28 Nov 2013 09:30:32 -0500 From: Gerd Hoffmann Date: Thu, 28 Nov 2013 15:30:04 +0100 Message-Id: <1385649010-7034-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1385649010-7034-1-git-send-email-kraxel@redhat.com> References: <1385649010-7034-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RFC PATCH 09/15] input: keyboard: switch sdl ui to new core [wip] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Dave Airlie , Gerd Hoffmann , Anthony Liguori FIXME: pause key not handled yet. Signed-off-by: Gerd Hoffmann --- 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