From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHu66-0001UX-4p for qemu-devel@nongnu.org; Mon, 24 Feb 2014 06:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHu5z-0000x8-3p for qemu-devel@nongnu.org; Mon, 24 Feb 2014 06:53:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHu5y-0000wg-RH for qemu-devel@nongnu.org; Mon, 24 Feb 2014 06:53:15 -0500 From: Gerd Hoffmann Date: Mon, 24 Feb 2014 12:52:22 +0100 Message-Id: <1393242771-28076-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1393242771-28076-1-git-send-email-kraxel@redhat.com> References: <1393242771-28076-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 15/44] sdl2: switch keyboard handling to new core List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ui/sdl2.c b/ui/sdl2.c index e7a30b3..ac3ac19 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -33,6 +33,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" @@ -236,9 +237,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(NULL, i, false); modifiers_state[i] = 0; } } @@ -246,11 +245,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); @@ -258,6 +258,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); @@ -284,18 +285,14 @@ 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(NULL, keycode, true); + qemu_input_event_send_key_number(NULL, keycode, false); return; } /* 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(NULL, keycode, + ev->type == SDL_KEYDOWN); } static void sdl_update_caption(struct sdl2_console_state *scon) -- 1.8.3.1