[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui to new core |
Date: |
Wed, 5 Mar 2014 12:53:12 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses ui to new core, (continued)
- [Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 11/38] input: keyboard: switch sdl ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 33/38] input: move qmp_query_mice to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 21/38] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 32/38] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 04/38] input: qapi: add unmapped key, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 29/38] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 23/38] input: mouse: switch monitor to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 24/38] input: keyboard: switch cocoa ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 22/38] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v4 06/38] input: add core bits of the new input layer, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 15/38] input: mouse: add helpers functions to core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 28/38] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 26/38] input: trace events, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 20/38] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 36/38] console: add head to index to qemu consoles., Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 07/38] input: keyboard: add helper functions to core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 12/38] input: keyboard: switch vnc ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 34/38] input: move do_mouse_set to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 17/38] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/03/05