input: keyboard: switch cocoa ui to new core

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-12-04 12:53:44 +01:00
parent c751a74afe
commit 2e08c665cc

View file

@ -514,16 +514,14 @@ QemuCocoaView *cocoaView;
if (keycode) { if (keycode) {
if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup
kbd_put_keycode(keycode); qemu_input_event_send_key_number(dcl->con, keycode, true);
kbd_put_keycode(keycode | 0x80); qemu_input_event_send_key_number(dcl->con, keycode, false);
} else if (qemu_console_is_graphic(NULL)) { } else if (qemu_console_is_graphic(NULL)) {
if (keycode & 0x80)
kbd_put_keycode(0xe0);
if (modifiers_state[keycode] == 0) { // keydown 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; modifiers_state[keycode] = 1;
} else { // keyup } else { // keyup
kbd_put_keycode(keycode | 0x80); qemu_input_event_send_key_number(dcl->con, keycode, false);
modifiers_state[keycode] = 0; modifiers_state[keycode] = 0;
} }
} }
@ -557,9 +555,7 @@ QemuCocoaView *cocoaView;
// handle keys for graphic console // handle keys for graphic console
} else if (qemu_console_is_graphic(NULL)) { } else if (qemu_console_is_graphic(NULL)) {
if (keycode & 0x80) //check bit for e0 in front qemu_input_event_send_key_number(dcl->con, keycode, true);
kbd_put_keycode(0xe0);
kbd_put_keycode(keycode & 0x7f); //remove e0 bit in front
// handlekeys for Monitor // handlekeys for Monitor
} else { } else {
@ -607,9 +603,7 @@ QemuCocoaView *cocoaView;
} }
if (qemu_console_is_graphic(NULL)) { if (qemu_console_is_graphic(NULL)) {
if (keycode & 0x80) qemu_input_event_send_key_number(dcl->con, keycode, false);
kbd_put_keycode(0xe0);
kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key
} }
break; break;
case NSMouseMoved: case NSMouseMoved: