starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

ui/cocoa: Use Linux key codes

Browse Source 
QemuInputEvent now stores Linux key codes for key events. Use those
codes directly instead of translating between internal key code
representations.

Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20260520-input-v3-17-7c9e4c7abe34@rsg.ci.i.u-tokyo.ac.jp>
This commit is contained in:
Akihiko Odaki
2026-05-20 15:48:00 +09:00
committed by Marc-André Lureau
parent 44a4d0623d
commit 61ac2f10b8
1 changed files with 141 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

314
ui/cocoa.m
View File

@@ -30,6 +30,7 @@
#include "qemu/help-texts.h"
#include "qemu-main.h"
#include "standard-headers/linux/input-event-codes.h"
#include "ui/clipboard.h"
#include "ui/console.h"
#include "ui/input.h"
@@ -140,124 +141,124 @@ static bool bool_with_bql(BoolCodeBlock block)
return val;
}
// Mac to QKeyCode conversion
static const int mac_to_qkeycode_map[] = {
[kVK_ANSI_A] = Q_KEY_CODE_A,
[kVK_ANSI_B] = Q_KEY_CODE_B,
[kVK_ANSI_C] = Q_KEY_CODE_C,
[kVK_ANSI_D] = Q_KEY_CODE_D,
[kVK_ANSI_E] = Q_KEY_CODE_E,
[kVK_ANSI_F] = Q_KEY_CODE_F,
[kVK_ANSI_G] = Q_KEY_CODE_G,
[kVK_ANSI_H] = Q_KEY_CODE_H,
[kVK_ANSI_I] = Q_KEY_CODE_I,
[kVK_ANSI_J] = Q_KEY_CODE_J,
[kVK_ANSI_K] = Q_KEY_CODE_K,
[kVK_ANSI_L] = Q_KEY_CODE_L,
[kVK_ANSI_M] = Q_KEY_CODE_M,
[kVK_ANSI_N] = Q_KEY_CODE_N,
[kVK_ANSI_O] = Q_KEY_CODE_O,
[kVK_ANSI_P] = Q_KEY_CODE_P,
[kVK_ANSI_Q] = Q_KEY_CODE_Q,
[kVK_ANSI_R] = Q_KEY_CODE_R,
[kVK_ANSI_S] = Q_KEY_CODE_S,
[kVK_ANSI_T] = Q_KEY_CODE_T,
[kVK_ANSI_U] = Q_KEY_CODE_U,
[kVK_ANSI_V] = Q_KEY_CODE_V,
[kVK_ANSI_W] = Q_KEY_CODE_W,
[kVK_ANSI_X] = Q_KEY_CODE_X,
[kVK_ANSI_Y] = Q_KEY_CODE_Y,
[kVK_ANSI_Z] = Q_KEY_CODE_Z,
// Mac to Linux conversion
static const unsigned int mac_to_linux_map[] = {
[kVK_ANSI_A] = KEY_A,
[kVK_ANSI_B] = KEY_B,
[kVK_ANSI_C] = KEY_C,
[kVK_ANSI_D] = KEY_D,
[kVK_ANSI_E] = KEY_E,
[kVK_ANSI_F] = KEY_F,
[kVK_ANSI_G] = KEY_G,
[kVK_ANSI_H] = KEY_H,
[kVK_ANSI_I] = KEY_I,
[kVK_ANSI_J] = KEY_J,
[kVK_ANSI_K] = KEY_K,
[kVK_ANSI_L] = KEY_L,
[kVK_ANSI_M] = KEY_M,
[kVK_ANSI_N] = KEY_N,
[kVK_ANSI_O] = KEY_O,
[kVK_ANSI_P] = KEY_P,
[kVK_ANSI_Q] = KEY_Q,
[kVK_ANSI_R] = KEY_R,
[kVK_ANSI_S] = KEY_S,
[kVK_ANSI_T] = KEY_T,
[kVK_ANSI_U] = KEY_U,
[kVK_ANSI_V] = KEY_V,
[kVK_ANSI_W] = KEY_W,
[kVK_ANSI_X] = KEY_X,
[kVK_ANSI_Y] = KEY_Y,
[kVK_ANSI_Z] = KEY_Z,
[kVK_ANSI_0] = Q_KEY_CODE_0,
[kVK_ANSI_1] = Q_KEY_CODE_1,
[kVK_ANSI_2] = Q_KEY_CODE_2,
[kVK_ANSI_3] = Q_KEY_CODE_3,
[kVK_ANSI_4] = Q_KEY_CODE_4,
[kVK_ANSI_5] = Q_KEY_CODE_5,
[kVK_ANSI_6] = Q_KEY_CODE_6,
[kVK_ANSI_7] = Q_KEY_CODE_7,
[kVK_ANSI_8] = Q_KEY_CODE_8,
[kVK_ANSI_9] = Q_KEY_CODE_9,
[kVK_ANSI_0] = KEY_0,
[kVK_ANSI_1] = KEY_1,
[kVK_ANSI_2] = KEY_2,
[kVK_ANSI_3] = KEY_3,
[kVK_ANSI_4] = KEY_4,
[kVK_ANSI_5] = KEY_5,
[kVK_ANSI_6] = KEY_6,
[kVK_ANSI_7] = KEY_7,
[kVK_ANSI_8] = KEY_8,
[kVK_ANSI_9] = KEY_9,
[kVK_ANSI_Grave] = Q_KEY_CODE_GRAVE_ACCENT,
[kVK_ANSI_Minus] = Q_KEY_CODE_MINUS,
[kVK_ANSI_Equal] = Q_KEY_CODE_EQUAL,
[kVK_Delete] = Q_KEY_CODE_BACKSPACE,
[kVK_CapsLock] = Q_KEY_CODE_CAPS_LOCK,
[kVK_Tab] = Q_KEY_CODE_TAB,
[kVK_Return] = Q_KEY_CODE_RET,
[kVK_ANSI_LeftBracket] = Q_KEY_CODE_BRACKET_LEFT,
[kVK_ANSI_RightBracket] = Q_KEY_CODE_BRACKET_RIGHT,
[kVK_ANSI_Backslash] = Q_KEY_CODE_BACKSLASH,
[kVK_ANSI_Semicolon] = Q_KEY_CODE_SEMICOLON,
[kVK_ANSI_Quote] = Q_KEY_CODE_APOSTROPHE,
[kVK_ANSI_Comma] = Q_KEY_CODE_COMMA,
[kVK_ANSI_Period] = Q_KEY_CODE_DOT,
[kVK_ANSI_Slash] = Q_KEY_CODE_SLASH,
[kVK_Space] = Q_KEY_CODE_SPC,
[kVK_ANSI_Grave] = KEY_GRAVE,
[kVK_ANSI_Minus] = KEY_MINUS,
[kVK_ANSI_Equal] = KEY_EQUAL,
[kVK_Delete] = KEY_BACKSPACE,
[kVK_CapsLock] = KEY_CAPSLOCK,
[kVK_Tab] = KEY_TAB,
[kVK_Return] = KEY_ENTER,
[kVK_ANSI_LeftBracket] = KEY_LEFTBRACE,
[kVK_ANSI_RightBracket] = KEY_RIGHTBRACE,
[kVK_ANSI_Backslash] = KEY_BACKSLASH,
[kVK_ANSI_Semicolon] = KEY_SEMICOLON,
[kVK_ANSI_Quote] = KEY_APOSTROPHE,
[kVK_ANSI_Comma] = KEY_COMMA,
[kVK_ANSI_Period] = KEY_DOT,
[kVK_ANSI_Slash] = KEY_SLASH,
[kVK_Space] = KEY_SPACE,
[kVK_ANSI_Keypad0] = Q_KEY_CODE_KP_0,
[kVK_ANSI_Keypad1] = Q_KEY_CODE_KP_1,
[kVK_ANSI_Keypad2] = Q_KEY_CODE_KP_2,
[kVK_ANSI_Keypad3] = Q_KEY_CODE_KP_3,
[kVK_ANSI_Keypad4] = Q_KEY_CODE_KP_4,
[kVK_ANSI_Keypad5] = Q_KEY_CODE_KP_5,
[kVK_ANSI_Keypad6] = Q_KEY_CODE_KP_6,
[kVK_ANSI_Keypad7] = Q_KEY_CODE_KP_7,
[kVK_ANSI_Keypad8] = Q_KEY_CODE_KP_8,
[kVK_ANSI_Keypad9] = Q_KEY_CODE_KP_9,
[kVK_ANSI_KeypadDecimal] = Q_KEY_CODE_KP_DECIMAL,
[kVK_ANSI_KeypadEnter] = Q_KEY_CODE_KP_ENTER,
[kVK_ANSI_KeypadPlus] = Q_KEY_CODE_KP_ADD,
[kVK_ANSI_KeypadMinus] = Q_KEY_CODE_KP_SUBTRACT,
[kVK_ANSI_KeypadMultiply] = Q_KEY_CODE_KP_MULTIPLY,
[kVK_ANSI_KeypadDivide] = Q_KEY_CODE_KP_DIVIDE,
[kVK_ANSI_KeypadEquals] = Q_KEY_CODE_KP_EQUALS,
[kVK_ANSI_KeypadClear] = Q_KEY_CODE_NUM_LOCK,
[kVK_ANSI_Keypad0] = KEY_KP0,
[kVK_ANSI_Keypad1] = KEY_KP1,
[kVK_ANSI_Keypad2] = KEY_KP2,
[kVK_ANSI_Keypad3] = KEY_KP3,
[kVK_ANSI_Keypad4] = KEY_KP4,
[kVK_ANSI_Keypad5] = KEY_KP5,
[kVK_ANSI_Keypad6] = KEY_KP6,
[kVK_ANSI_Keypad7] = KEY_KP7,
[kVK_ANSI_Keypad8] = KEY_KP8,
[kVK_ANSI_Keypad9] = KEY_KP9,
[kVK_ANSI_KeypadDecimal] = KEY_KPDOT,
[kVK_ANSI_KeypadEnter] = KEY_KPENTER,
[kVK_ANSI_KeypadPlus] = KEY_KPPLUS,
[kVK_ANSI_KeypadMinus] = KEY_KPMINUS,
[kVK_ANSI_KeypadMultiply] = KEY_KPASTERISK,
[kVK_ANSI_KeypadDivide] = KEY_KPSLASH,
[kVK_ANSI_KeypadEquals] = KEY_KPEQUAL,
[kVK_ANSI_KeypadClear] = KEY_NUMLOCK,
[kVK_UpArrow] = Q_KEY_CODE_UP,
[kVK_DownArrow] = Q_KEY_CODE_DOWN,
[kVK_LeftArrow] = Q_KEY_CODE_LEFT,
[kVK_RightArrow] = Q_KEY_CODE_RIGHT,
[kVK_UpArrow] = KEY_UP,
[kVK_DownArrow] = KEY_DOWN,
[kVK_LeftArrow] = KEY_LEFT,
[kVK_RightArrow] = KEY_RIGHT,
[kVK_Help] = Q_KEY_CODE_INSERT,
[kVK_Home] = Q_KEY_CODE_HOME,
[kVK_PageUp] = Q_KEY_CODE_PGUP,
[kVK_PageDown] = Q_KEY_CODE_PGDN,
[kVK_End] = Q_KEY_CODE_END,
[kVK_ForwardDelete] = Q_KEY_CODE_DELETE,
[kVK_Help] = KEY_INSERT,
[kVK_Home] = KEY_HOME,
[kVK_PageUp] = KEY_PAGEUP,
[kVK_PageDown] = KEY_PAGEDOWN,
[kVK_End] = KEY_END,
[kVK_ForwardDelete] = KEY_DELETE,
[kVK_Escape] = Q_KEY_CODE_ESC,
[kVK_Escape] = KEY_ESC,
/* The Power key can't be used directly because the operating system uses
* it. This key can be emulated by using it in place of another key such as
* F1. Don't forget to disable the real key binding.
*/
/* [kVK_F1] = Q_KEY_CODE_POWER, */
/* [kVK_F1] = KEY_POWER, */
[kVK_F1] = Q_KEY_CODE_F1,
[kVK_F2] = Q_KEY_CODE_F2,
[kVK_F3] = Q_KEY_CODE_F3,
[kVK_F4] = Q_KEY_CODE_F4,
[kVK_F5] = Q_KEY_CODE_F5,
[kVK_F6] = Q_KEY_CODE_F6,
[kVK_F7] = Q_KEY_CODE_F7,
[kVK_F8] = Q_KEY_CODE_F8,
[kVK_F9] = Q_KEY_CODE_F9,
[kVK_F10] = Q_KEY_CODE_F10,
[kVK_F11] = Q_KEY_CODE_F11,
[kVK_F12] = Q_KEY_CODE_F12,
[kVK_F13] = Q_KEY_CODE_PRINT,
[kVK_F14] = Q_KEY_CODE_SCROLL_LOCK,
[kVK_F15] = Q_KEY_CODE_PAUSE,
[kVK_F1] = KEY_F1,
[kVK_F2] = KEY_F2,
[kVK_F3] = KEY_F3,
[kVK_F4] = KEY_F4,
[kVK_F5] = KEY_F5,
[kVK_F6] = KEY_F6,
[kVK_F7] = KEY_F7,
[kVK_F8] = KEY_F8,
[kVK_F9] = KEY_F9,
[kVK_F10] = KEY_F10,
[kVK_F11] = KEY_F11,
[kVK_F12] = KEY_F12,
[kVK_F13] = KEY_SYSRQ,
[kVK_F14] = KEY_SCROLLLOCK,
[kVK_F15] = KEY_PAUSE,
// JIS keyboards only
[kVK_JIS_Yen] = Q_KEY_CODE_YEN,
[kVK_JIS_Underscore] = Q_KEY_CODE_RO,
[kVK_JIS_KeypadComma] = Q_KEY_CODE_KP_COMMA,
[kVK_JIS_Eisu] = Q_KEY_CODE_MUHENKAN,
[kVK_JIS_Kana] = Q_KEY_CODE_HENKAN,
[kVK_JIS_Yen] = KEY_YEN,
[kVK_JIS_Underscore] = KEY_RO,
[kVK_JIS_KeypadComma] = KEY_KPCOMMA,
[kVK_JIS_Eisu] = KEY_MUHENKAN,
[kVK_JIS_Kana] = KEY_HENKAN,
/*
* The eject and volume keys can't be used here because they are handled at
@@ -265,13 +266,13 @@ static const int mac_to_qkeycode_map[] = {
*/
};
static int cocoa_keycode_to_qemu(int keycode)
static unsigned int cocoa_keycode_to_linux(int keycode)
{
if (ARRAY_SIZE(mac_to_qkeycode_map) <= keycode) {
if (ARRAY_SIZE(mac_to_linux_map) <= keycode) {
error_report("(cocoa) warning unknown keycode 0x%x", keycode);
return 0;
}
return mac_to_qkeycode_map[keycode];
return mac_to_linux_map[keycode];
}
/* Displays an alert dialog box with the specified message */
@@ -766,9 +767,8 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
CFRelease(tapEventsSrc);
}
- (void) toggleKey: (int)keycode {
unsigned int lnx = qemu_input_map_qcode_to_linux[keycode];
qkbd_state_key_event(kbd, lnx, !qkbd_state_key_get(kbd, lnx));
- (void) toggleKey: (unsigned int)keycode {
qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode));
}
// Does the work of sending input to the monitor
@@ -848,7 +848,7 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
/* Return true if we handled the event, false if it should be given to OSX */
COCOA_DEBUG("QemuCocoaView: handleEvent\n");
InputButton button;
int keycode = 0;
unsigned int keycode;
NSUInteger modifiers = [event modifierFlags];
/*
@@ -890,62 +890,34 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
*/
if (!!(modifiers & NSEventModifierFlagCapsLock) !=
qkbd_state_modifier_get(kbd, QKBD_MOD_CAPSLOCK)) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_CAPS_LOCK],
true);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_CAPS_LOCK],
false);
qkbd_state_key_event(kbd, KEY_CAPSLOCK, true);
qkbd_state_key_event(kbd, KEY_CAPSLOCK, false);
}
if (!(modifiers & NSEventModifierFlagShift)) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_SHIFT],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_SHIFT_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTSHIFT, false);
qkbd_state_key_event(kbd, KEY_RIGHTSHIFT, false);
}
if (!(modifiers & NSEventModifierFlagControl)) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_CTRL],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_CTRL_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTCTRL, false);
qkbd_state_key_event(kbd, KEY_RIGHTCTRL, false);
}
if (!(modifiers & NSEventModifierFlagOption)) {
if (swap_opt_cmd) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_META_L],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_META_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTMETA, false);
qkbd_state_key_event(kbd, KEY_RIGHTMETA, false);
} else {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_ALT],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_ALT_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTALT, false);
qkbd_state_key_event(kbd, KEY_RIGHTALT, false);
}
}
if (!(modifiers & NSEventModifierFlagCommand)) {
if (swap_opt_cmd) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_ALT],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_ALT_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTALT, false);
qkbd_state_key_event(kbd, KEY_RIGHTALT, false);
} else {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_META_L],
false);
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[Q_KEY_CODE_META_R],
false);
qkbd_state_key_event(kbd, KEY_LEFTMETA, false);
qkbd_state_key_event(kbd, KEY_RIGHTMETA, false);
}
}
@@ -954,34 +926,34 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
switch ([event keyCode]) {
case kVK_Shift:
if (!!(modifiers & NSEventModifierFlagShift)) {
[self toggleKey:Q_KEY_CODE_SHIFT];
[self toggleKey:KEY_LEFTSHIFT];
}
break;
case kVK_RightShift:
if (!!(modifiers & NSEventModifierFlagShift)) {
[self toggleKey:Q_KEY_CODE_SHIFT_R];
[self toggleKey:KEY_RIGHTSHIFT];
}
break;
case kVK_Control:
if (!!(modifiers & NSEventModifierFlagControl)) {
[self toggleKey:Q_KEY_CODE_CTRL];
[self toggleKey:KEY_LEFTCTRL];
}
break;
case kVK_RightControl:
if (!!(modifiers & NSEventModifierFlagControl)) {
[self toggleKey:Q_KEY_CODE_CTRL_R];
[self toggleKey:KEY_RIGHTCTRL];
}
break;
case kVK_Option:
if (!!(modifiers & NSEventModifierFlagOption)) {
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_META_L];
[self toggleKey:KEY_LEFTMETA];
} else {
[self toggleKey:Q_KEY_CODE_ALT];
[self toggleKey:KEY_LEFTALT];
}
}
break;
@@ -989,9 +961,9 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
case kVK_RightOption:
if (!!(modifiers & NSEventModifierFlagOption)) {
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_META_R];
[self toggleKey:KEY_RIGHTMETA];
} else {
[self toggleKey:Q_KEY_CODE_ALT_R];
[self toggleKey:KEY_RIGHTALT];
}
}
break;
@@ -1002,9 +974,9 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
!!(modifiers & NSEventModifierFlagCommand) &&
left_command_key_enabled) {
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_ALT];
[self toggleKey:KEY_LEFTALT];
} else {
[self toggleKey:Q_KEY_CODE_META_L];
[self toggleKey:KEY_LEFTMETA];
}
}
break;
@@ -1013,16 +985,16 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
if (isMouseGrabbed &&
!!(modifiers & NSEventModifierFlagCommand)) {
if (swap_opt_cmd) {
[self toggleKey:Q_KEY_CODE_ALT_R];
[self toggleKey:KEY_RIGHTALT];
} else {
[self toggleKey:Q_KEY_CODE_META_R];
[self toggleKey:KEY_RIGHTMETA];
}
}
break;
}
return true;
case NSEventTypeKeyDown:
keycode = cocoa_keycode_to_qemu([event keyCode]);
keycode = cocoa_keycode_to_linux([event keyCode]);
// forward command key combos to the host UI unless the mouse is grabbed
if (!isMouseGrabbed && ([event modifierFlags] & NSEventModifierFlagCommand)) {
@@ -1052,15 +1024,13 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
}
if (qemu_console_is_graphic(dcl.con)) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[keycode],
true);
qkbd_state_key_event(kbd, keycode, true);
} else {
[self handleMonitorInput: event];
}
return true;
case NSEventTypeKeyUp:
keycode = cocoa_keycode_to_qemu([event keyCode]);
keycode = cocoa_keycode_to_linux([event keyCode]);
// don't pass the guest a spurious key-up if we treated this
// command-key combo as a host UI action
@@ -1069,9 +1039,7 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
}
if (qemu_console_is_graphic(dcl.con)) {
qkbd_state_key_event(kbd,
qemu_input_map_qcode_to_linux[keycode],
false);
qkbd_state_key_event(kbd, keycode, false);
}
return true;
case NSEventTypeScrollWheel: