[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 29/42] input: keyboard: switch cocoa ui to new co
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 29/42] input: keyboard: switch cocoa ui to new core [untested] |
Date: |
Wed, 22 Jan 2014 17:20:34 +0100 |
---
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] [PATCH v2 12/42] input: keyboard: switch qmp_send_key() to new core., (continued)
- [Qemu-devel] [PATCH v2 12/42] input: keyboard: switch qmp_send_key() to new core., Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 13/42] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 23/42] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 10/42] input: keyboard: add helper functions to core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 27/42] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 16/42] input: keyboard: switch vnc ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 18/42] input: keyboard: switch curses ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 35/42] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 22/42] input: mouse: switch legacy handlers to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 20/42] input: mouse: add graphic_rotate support, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 29/42] input: keyboard: switch cocoa ui to new core [untested],
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 19/42] input: mouse: add helpers functions to core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 24/42] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 28/42] input: mouse: switch monitor to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 25/42] sdl2: switch mouse handling to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 34/42] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 26/42] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 33/42] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 31/42] input: trace events, Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 42/42] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/01/22
- [Qemu-devel] [PATCH v2 39/42] sdl2: codestyle fixups, Gerd Hoffmann, 2014/01/22