YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix control and shift keys convertion from Win to MacOSX

Browse Source
This commit is contained in:
dijunkun
2024-11-25 17:29:49 +08:00
parent abd22ab7f1
commit 31b6b2736c
4 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/device_controller/keyboard/mac/keyboard_capturer.cpp
View File

@@ -19,86 +19,72 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type,
if (type == kCGEventKeyDown || type == kCGEventKeyUp) {
CGKeyCode key_code = static_cast<CGKeyCode>(
CGEventGetIntegerValueField(event, kCGKeyboardEventKeycode));
std::cout << "Key Down Event: key code = " << key_code << std::endl;
if (CGKeyCodeToVkCode.find(key_code) != CGKeyCodeToVkCode.end()) {
g_on_key_action(CGKeyCodeToVkCode[key_code], type == kCGEventKeyDown,
g_user_ptr);
} else {
LOG_ERROR("key_code not found");
}
} else if (type == kCGEventFlagsChanged) {
CGEventFlags current_flags = CGEventGetFlags(event);
CGKeyCode key_code = static_cast<CGKeyCode>(
CGEventGetIntegerValueField(event, kCGKeyboardEventKeycode));
// 检测 CapsLock 键
// caps lock
bool caps_lock_state = (current_flags & kCGEventFlagMaskAlphaShift) != 0;
if (caps_lock_state != keyboard_capturer->caps_lock_flag_) {
keyboard_capturer->caps_lock_flag_ = caps_lock_state;
if (keyboard_capturer->caps_lock_flag_) {
std::cout << "CapsLock Pressed" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], true, g_user_ptr);
} else {
std::cout << "CapsLock Released" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], false, g_user_ptr);
}
}
// 检测 Shift 键
// shift
bool shift_state = (current_flags & kCGEventFlagMaskShift) != 0;
if (shift_state != keyboard_capturer->shift_flag_) {
keyboard_capturer->shift_flag_ = shift_state;
if (keyboard_capturer->shift_flag_) {
LOG_INFO("Shift Pressed: key_code = {:#04x} -> {:#04x}", key_code,
CGKeyCodeToVkCode[key_code]);
g_on_key_action(CGKeyCodeToVkCode[key_code], true, g_user_ptr);
} else {
LOG_INFO("Shift Released: key_code = {:#04x} -> {:#04x}", key_code,
CGKeyCodeToVkCode[key_code]);
g_on_key_action(CGKeyCodeToVkCode[key_code], false, g_user_ptr);
}
}
// 检测 Control 键
// control
bool control_state = (current_flags & kCGEventFlagMaskControl) != 0;
if (control_state != keyboard_capturer->control_flag_) {
keyboard_capturer->control_flag_ = control_state;
if (keyboard_capturer->control_flag_) {
std::cout << "Control Pressed" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], true, g_user_ptr);
} else {
std::cout << "Control Released" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], false, g_user_ptr);
}
}
// 检测 Option 键
// option
bool option_state = (current_flags & kCGEventFlagMaskAlternate) != 0;
if (option_state != keyboard_capturer->option_flag_) {
keyboard_capturer->option_flag_ = option_state;
if (keyboard_capturer->option_flag_) {
std::cout << "Option Pressed" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], true, g_user_ptr);
} else {
std::cout << "Option Released" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], false, g_user_ptr);
}
}
// 检测 Command 键
// command
bool command_state = (current_flags & kCGEventFlagMaskCommand) != 0;
if (command_state != keyboard_capturer->command_flag_) {
keyboard_capturer->command_flag_ = command_state;
if (keyboard_capturer->command_flag_) {
std::cout << "Command Pressed" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], true, g_user_ptr);
} else {
std::cout << "Command Released" << std::endl;
g_on_key_action(CGKeyCodeToVkCode[key_code], false, g_user_ptr);
}
}
}
return nullptr; // 返回 null 表示阻止事件
return nullptr;
}
KeyboardCapturer::KeyboardCapturer() {}
@@ -112,46 +98,37 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void *user_ptr) {
CGEventMask eventMask = (1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) |
(1 << kCGEventFlagsChanged);
eventTap = CGEventTapCreate(kCGSessionEventTap, // 事件 Tap 的作用范围
kCGHeadInsertEventTap, // 插入到事件队列的最前面
kCGEventTapOptionDefault, // 默认选项
eventMask, // 要拦截的事件类型
eventCallback, // 事件回调函数
this // 用户数据指针（可选）
);
event_tap_ = CGEventTapCreate(kCGSessionEventTap, kCGHeadInsertEventTap,
kCGEventTapOptionDefault, eventMask,
eventCallback, this);
if (!eventTap) {
std::cerr << "Failed to create event tap. Ensure Accessibility permissions "
"are granted."
<< std::endl;
if (!event_tap_) {
LOG_ERROR("CGEventTapCreate failed");
return -1;
}
runLoopSource =
CFMachPortCreateRunLoopSource(kCFAllocatorDefault, eventTap, 0);
run_loop_source_ =
CFMachPortCreateRunLoopSource(kCFAllocatorDefault, event_tap_, 0);
CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource,
CFRunLoopAddSource(CFRunLoopGetCurrent(), run_loop_source_,
kCFRunLoopCommonModes);
CGEventTapEnable(eventTap, true);
CGEventTapEnable(event_tap_, true);
return 0;
}
int KeyboardCapturer::Unhook() {
CFRelease(runLoopSource);
CFRelease(eventTap);
CFRelease(run_loop_source_);
CFRelease(event_tap_);
return 0;
}
int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down) {
LOG_INFO("SendKeyboardCommand: key_code = {:#04x}", key_code);
if (vkCodeToCGKeyCode.find(key_code) != vkCodeToCGKeyCode.end()) {
CGKeyCode cg_key_code = vkCodeToCGKeyCode[key_code];
CGEventRef event = CGEventCreateKeyboardEvent(NULL, cg_key_code, is_down);
CGEventPost(kCGHIDEventTap, event);
CFRelease(event);
} else {
LOG_ERROR("key_code not found");
}
return 0;

4
src/device_controller/keyboard/mac/keyboard_capturer.h
View File

@@ -22,8 +22,8 @@ class KeyboardCapturer : public DeviceController {
virtual int SendKeyboardCommand(int key_code, bool is_down);
private:
CFMachPortRef eventTap;
CFRunLoopSourceRef runLoopSource;
CFMachPortRef event_tap_;
CFRunLoopSourceRef run_loop_source_;
public:
bool caps_lock_flag_ = false;

46
src/device_controller/keyboard/mac/keyboard_converter.h
View File

@@ -9,9 +9,9 @@
#include <map>
// Windows vkCode 转 macOS CGKeyCode 映射表 (104 键)
// Windows vkCode to macOS CGKeyCode (104 keys)
std::map<int, int> vkCodeToCGKeyCode = {
// 字母键 (A-Z)
// A-Z
{0x41, 0x00}, // A
{0x42, 0x0B}, // B
{0x43, 0x08}, // C
@@ -39,7 +39,7 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x59, 0x10}, // Y
{0x5A, 0x06}, // Z
// 数字键 (0-9)
// 0-9
{0x30, 0x1D}, // 0
{0x31, 0x12}, // 1
{0x32, 0x13}, // 2
@@ -51,7 +51,7 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x38, 0x1C}, // 8
{0x39, 0x19}, // 9
// 功能键 (F1-F12)
// F1-F12
{0x70, 0x7A}, // F1
{0x71, 0x78}, // F2
{0x72, 0x63}, // F3
@@ -65,7 +65,7 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x7A, 0x67}, // F11
{0x7B, 0x6F}, // F12
// 控制键
// control keys
{0x1B, 0x35}, // Escape
{0x0D, 0x24}, // Enter
{0x20, 0x31}, // Space
@@ -79,13 +79,13 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x21, 0x79}, // Page Up
{0x22, 0x7A}, // Page Down
// 箭头键
// arrow keys
{0x25, 0x7B}, // Left Arrow
{0x27, 0x7C}, // Right Arrow
{0x26, 0x7E}, // Up Arrow
{0x28, 0x7D}, // Down Arrow
// 数字小键盘 (Numpad)
// numpad
{0x60, 0x52}, // Numpad 0
{0x61, 0x53}, // Numpad 1
{0x62, 0x54}, // Numpad 2
@@ -102,7 +102,7 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x6D, 0x4E}, // Numpad -
{0x6B, 0x45}, // Numpad +
// 符号键
// symbol keys
{0xBA, 0x29}, // ; (Semicolon)
{0xDE, 0x27}, // ' (Quote)
{0xC0, 0x32}, // ` (Backtick)
@@ -115,11 +115,11 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0xBD, 0x1B}, // - (Minus)
{0xBB, 0x18}, // = (Equals)
// 修饰键
// modifier keys
{0x14, 0x39}, // Caps Lock
{0xA0, 0x38}, // Shift (Left)
{0xA2, 0x3B}, // Shift (Right)
{0xA3, 0x3B}, // Ctrl (Left)
{0xA1, 0x3B}, // Shift (Right)
{0xA2, 0x3B}, // Ctrl (Left)
{0xA3, 0x3E}, // Ctrl (Right)
{0xA4, 0x3A}, // Alt (Left)
{0xA5, 0x3D}, // Alt (Right)
@@ -127,9 +127,9 @@ std::map<int, int> vkCodeToCGKeyCode = {
{0x5C, 0x36}, // Right Command
};
// macOS CGKeyCode 转 Windows vkCode 映射表
// macOS CGKeyCode to Windows vkCode
std::map<int, int> CGKeyCodeToVkCode = {
// 字母键 (A-Z)
// A-Z
{0x00, 0x41}, // A
{0x0B, 0x42}, // B
{0x08, 0x43}, // C
@@ -157,7 +157,7 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x10, 0x59}, // Y
{0x06, 0x5A}, // Z
// 数字键 (0-9)
// 0-9
{0x1D, 0x30}, // 0
{0x12, 0x31}, // 1
{0x13, 0x32}, // 2
@@ -169,7 +169,7 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x1C, 0x38}, // 8
{0x19, 0x39}, // 9
// 功能键 (F1-F12)
// F1-F12
{0x7A, 0x70}, // F1
{0x78, 0x71}, // F2
{0x63, 0x72}, // F3
@@ -183,7 +183,7 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x67, 0x7A}, // F11
{0x6F, 0x7B}, // F12
// 控制键
// control keys
{0x35, 0x1B}, // Escape
{0x24, 0x0D}, // Enter
{0x31, 0x20}, // Space
@@ -197,13 +197,13 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x79, 0x21}, // Page Up
{0x7A, 0x22}, // Page Down
// 箭头键
// arrow keys
{0x7B, 0x25}, // Left Arrow
{0x7C, 0x27}, // Right Arrow
{0x7E, 0x26}, // Up Arrow
{0x7D, 0x28}, // Down Arrow
// 数字小键盘 (Numpad)
// numpad
{0x52, 0x60}, // Numpad 0
{0x53, 0x61}, // Numpad 1
{0x54, 0x62}, // Numpad 2
@@ -220,7 +220,7 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x4E, 0x6D}, // Numpad -
{0x45, 0x6B}, // Numpad +
// 符号键
// symbol keys
{0x29, 0xBA}, // ; (Semicolon)
{0x27, 0xDE}, // ' (Quote)
{0x32, 0xC0}, // ` (Backtick)
@@ -233,7 +233,7 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x1B, 0xBD}, // - (Minus)
{0x18, 0xBB}, // = (Equals)
// 修饰键
// modifier keys
{0x39, 0x14}, // Caps Lock
{0x38, 0xA0}, // Shift (Left)
{0x3C, 0xA1}, // Shift (Right)
@@ -245,10 +245,4 @@ std::map<int, int> CGKeyCodeToVkCode = {
{0x36, 0x5C}, // Right Command
};
#define MAC_CAPSLOCK 0x39
#define MAC_SHIFT 0x38
#define MAC_CONTROL 0x3B
#define MAC_OPTION 0x3A
#define MAC_COMMAND 0x37
#endif

20
src/device_controller/keyboard/windows/keyboard_capturer.cpp
View File

@@ -9,27 +9,14 @@ LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) {
if (nCode == HC_ACTION && g_on_key_action) {
KBDLLHOOKSTRUCT* kbData = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
// 处理键盘事件
if (wParam == WM_KEYDOWN) {
// LOG_ERROR("Keydown: [{}]", kbData->vkCode);
if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN) {
g_on_key_action(kbData->vkCode, true, g_user_ptr);
return 1;
} else if (wParam == WM_KEYUP) {
// LOG_ERROR("Keyup: [{}]", kbData->vkCode);
} else if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP) {
g_on_key_action(kbData->vkCode, false, g_user_ptr);
return 1;
} else if (wParam == WM_SYSKEYDOWN) {
// LOG_ERROR("System keydown: [{}]", kbData->vkCode);
g_on_key_action(kbData->vkCode, true, g_user_ptr);
return 1;
} else if (wParam == WM_SYSKEYUP) {
// LOG_ERROR("System keyup: [{}]", kbData->vkCode);
g_on_key_action(kbData->vkCode, false, g_user_ptr);
return 1;
}
return 1;
}
// 调用下一个钩子
return CallNextHookEx(NULL, nCode, wParam, lParam);
}
@@ -54,6 +41,7 @@ int KeyboardCapturer::Unhook() {
return 0;
}
// apply remote keyboard commands to the local machine
int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down) {
INPUT input = {0};
input.type = INPUT_KEYBOARD;