[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 29/42] input: keyboard: switch cocoa ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 29/42] input: keyboard: switch cocoa ui to new core [untested] |
Date: |
Mon, 16 Dec 2013 11:49:05 +0100 |
---
ui/cocoa.m | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index be49179..a029493 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -496,16 +496,14 @@ QemuCocoaView *cocoaView;
keycode = cocoa_keycode_to_qemu([event keyCode]);
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;
}
}
@@ -539,9 +537,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 {
@@ -582,9 +578,7 @@ QemuCocoaView *cocoaView;
case NSKeyUp:
keycode = cocoa_keycode_to_qemu([event keyCode]);
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 05/42] input: rename file to legacy, (continued)
- [Qemu-devel] [PATCH 05/42] input: rename file to legacy, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 14/42] input: keyboard: switch sdl ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 10/42] input: keyboard: add helper functions to core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 11/42] input: keyboard: switch legacy handlers to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 25/42] sdl2: switch mouse handling to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 19/42] input: mouse: add helpers functions to core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 16/42] input: keyboard: switch vnc ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 09/42] input: add core bits of the new input layer, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 21/42] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 23/42] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 29/42] input: keyboard: switch cocoa ui to new core [untested],
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 13/42] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 32/42] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 20/42] input: mouse: add graphic_rotate support, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 35/42] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 22/42] input: mouse: switch legacy handlers to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 27/42] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 08/42] input: qapi: add pause key, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 01/42] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2013/12/16