[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui to new core |
Date: |
Fri, 28 Feb 2014 15:06:35 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/cocoa.m | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 8661777..d4af3e5 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -514,16 +514,14 @@ QemuCocoaView *cocoaView;
if (keycode) {
if (keycode == 58 || keycode == 69) { // emulate caps lock and
num lock keydown and keyup
- kbd_put_keycode(keycode);
- kbd_put_keycode(keycode | 0x80);
+ qemu_input_event_send_key_number(dcl->con, keycode, true);
+ qemu_input_event_send_key_number(dcl->con, keycode, false);
} else if (qemu_console_is_graphic(NULL)) {
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
if (modifiers_state[keycode] == 0) { // keydown
- kbd_put_keycode(keycode & 0x7f);
+ qemu_input_event_send_key_number(dcl->con, keycode,
true);
modifiers_state[keycode] = 1;
} else { // keyup
- kbd_put_keycode(keycode | 0x80);
+ qemu_input_event_send_key_number(dcl->con, keycode,
false);
modifiers_state[keycode] = 0;
}
}
@@ -557,9 +555,7 @@ QemuCocoaView *cocoaView;
// handle keys for graphic console
} else if (qemu_console_is_graphic(NULL)) {
- if (keycode & 0x80) //check bit for e0 in front
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode & 0x7f); //remove e0 bit in front
+ qemu_input_event_send_key_number(dcl->con, keycode, true);
// handlekeys for Monitor
} else {
@@ -607,9 +603,7 @@ QemuCocoaView *cocoaView;
}
if (qemu_console_is_graphic(NULL)) {
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode | 0x80); //add 128 to signal release
of key
+ qemu_input_event_send_key_number(dcl->con, keycode, false);
}
break;
case NSMouseMoved:
--
1.8.3.1
- [Qemu-devel] [PULL 19/38] input: mouse: switch gtk ui to new core, (continued)
- [Qemu-devel] [PULL 19/38] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 27/38] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 21/38] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 31/38] input: move mouse mode notifier to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 29/38] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 26/38] input: trace events, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 30/38] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 35/38] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 34/38] input: move do_mouse_set to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 28/38] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 25/38] input: mouse: switch cocoa ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 32/38] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 37/38] console: add QemuUIInfo, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 36/38] console: add head to index to qemu consoles., Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 02/38] input: rename file to legacy, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 06/38] input: add core bits of the new input layer, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 17/38] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 20/38] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/02/28