From af98ba92ac3b417fa171736180a782f84b202cef Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 28 Nov 2013 11:40:27 +0100 Subject: input: keyboard: switch gtk ui to new core Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'ui') diff --git a/ui/gtk.c b/ui/gtk.c index a633d89346..74c0936caf 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; } -- cgit v1.2.1