From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W85Qa-0000wC-GS for qemu-devel@nongnu.org; Tue, 28 Jan 2014 04:58:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W85QT-0006hC-Ms for qemu-devel@nongnu.org; Tue, 28 Jan 2014 04:57:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17437) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W85QT-0006g1-6b for qemu-devel@nongnu.org; Tue, 28 Jan 2014 04:57:49 -0500 From: Gerd Hoffmann Date: Tue, 28 Jan 2014 10:57:06 +0100 Message-Id: <1390903055-479-14-git-send-email-kraxel@redhat.com> In-Reply-To: <1390903055-479-1-git-send-email-kraxel@redhat.com> References: <1390903055-479-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 13/42] input: keyboard: switch gtk ui 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/gtk.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index a633d89..74c0936 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -59,6 +59,7 @@ #include "trace.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "x_keymap.h" @@ -280,10 +281,7 @@ static void gtk_release_modifiers(GtkDisplayState *s) if (!s->modifier_pressed[i]) { continue; } - if (keycode & SCANCODE_GREY) { - kbd_put_keycode(SCANCODE_EMUL0); - } - kbd_put_keycode(keycode | SCANCODE_UP); + qemu_input_event_send_key_number(s->dcl.con, keycode, false); s->modifier_pressed[i] = false; } } @@ -745,17 +743,8 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) } } - if (qemu_keycode & SCANCODE_GREY) { - kbd_put_keycode(SCANCODE_EMUL0); - } - - if (key->type == GDK_KEY_PRESS) { - kbd_put_keycode(qemu_keycode & SCANCODE_KEYCODEMASK); - } else if (key->type == GDK_KEY_RELEASE) { - kbd_put_keycode(qemu_keycode | SCANCODE_UP); - } else { - g_assert_not_reached(); - } + qemu_input_event_send_key_number(s->dcl.con, qemu_keycode, + key->type == GDK_KEY_PRESS); return TRUE; } -- 1.8.3.1