[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 12/38] input: keyboard: switch vnc ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v4 12/38] input: keyboard: switch vnc ui to new core |
Date: |
Wed, 5 Mar 2014 12:53:14 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 5601cc3..4658559 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -33,6 +33,7 @@
#include "qapi/qmp/types.h"
#include "qmp-commands.h"
#include "qemu/osdep.h"
+#include "ui/input.h"
#define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT
#define VNC_REFRESH_INTERVAL_INC 50
@@ -1542,9 +1543,7 @@ static void reset_keys(VncState *vs)
int i;
for(i = 0; i < 256; i++) {
if (vs->modifiers_state[i]) {
- if (i & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(i | SCANCODE_UP);
+ qemu_input_event_send_key_number(vs->vd->dcl.con, i, false);
vs->modifiers_state[i] = 0;
}
}
@@ -1553,12 +1552,8 @@ static void reset_keys(VncState *vs)
static void press_key(VncState *vs, int keysym)
{
int keycode = keysym2scancode(vs->vd->kbd_layout, keysym) &
SCANCODE_KEYMASK;
- if (keycode & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
- if (keycode & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(keycode | SCANCODE_UP);
+ qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, true);
+ qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, false);
}
static int current_led_state(VncState *vs)
@@ -1700,12 +1695,7 @@ static void do_key_event(VncState *vs, int down, int
keycode, int sym)
}
if (qemu_console_is_graphic(NULL)) {
- if (keycode & SCANCODE_GREY)
- kbd_put_keycode(SCANCODE_EMUL0);
- if (down)
- kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
- else
- kbd_put_keycode(keycode | SCANCODE_UP);
+ qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, down);
} else {
bool numlock = vs->modifiers_state[0x45];
bool control = (vs->modifiers_state[0x1d] ||
@@ -1826,10 +1816,7 @@ static void vnc_release_modifiers(VncState *vs)
if (!vs->modifiers_state[keycode]) {
continue;
}
- if (keycode & SCANCODE_GREY) {
- kbd_put_keycode(SCANCODE_EMUL0);
- }
- kbd_put_keycode(keycode | SCANCODE_UP);
+ qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, false);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL v4 24/38] input: keyboard: switch cocoa ui to new core, (continued)
- [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, 2014/03/05
- [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 <=
- [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
- [Qemu-devel] [PULL v4 19/38] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 27/38] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 30/38] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 31/38] input: move mouse mode notifier to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 25/38] input: mouse: switch cocoa ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 37/38] console: add QemuUIInfo, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 13/38] input: keyboard: switch spice ui to new core, Gerd Hoffmann, 2014/03/05