提交 af98ba92 编写于 作者: G Gerd Hoffmann

input: keyboard: switch gtk ui to new core

Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
上级 d2a92603
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include "trace.h" #include "trace.h"
#include "ui/console.h" #include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "x_keymap.h" #include "x_keymap.h"
...@@ -280,10 +281,7 @@ static void gtk_release_modifiers(GtkDisplayState *s) ...@@ -280,10 +281,7 @@ static void gtk_release_modifiers(GtkDisplayState *s)
if (!s->modifier_pressed[i]) { if (!s->modifier_pressed[i]) {
continue; continue;
} }
if (keycode & SCANCODE_GREY) { qemu_input_event_send_key_number(s->dcl.con, keycode, false);
kbd_put_keycode(SCANCODE_EMUL0);
}
kbd_put_keycode(keycode | SCANCODE_UP);
s->modifier_pressed[i] = false; s->modifier_pressed[i] = false;
} }
} }
...@@ -745,17 +743,8 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) ...@@ -745,17 +743,8 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
} }
} }
if (qemu_keycode & SCANCODE_GREY) { qemu_input_event_send_key_number(s->dcl.con, qemu_keycode,
kbd_put_keycode(SCANCODE_EMUL0); key->type == GDK_KEY_PRESS);
}
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();
}
return TRUE; return TRUE;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册