YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-29 20:40:12 +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;