From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVk4-0001An-JH for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:49:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsVju-0000sS-Bn for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:49:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsVju-0000rp-1f for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:49:30 -0500 From: Gerd Hoffmann Date: Mon, 16 Dec 2013 11:49:05 +0100 Message-Id: <1387190958-19470-30-git-send-email-kraxel@redhat.com> In-Reply-To: <1387190958-19470-1-git-send-email-kraxel@redhat.com> References: <1387190958-19470-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 29/42] input: keyboard: switch cocoa ui to new core [untested] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann , Anthony Liguori --- 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