[fix] preserve Linux keypad navigation semantics and Windows scan-code metadata for remote keyboard input

This commit is contained in:
dijunkun
2026-05-07 14:50:00 +08:00
parent b1d956af2c
commit 98b7c6c966
3 changed files with 145 additions and 8 deletions
@@ -6,6 +6,7 @@
#include "keyboard_converter.h"
#include "platform.h"
#include "rd_log.h"
#include "windows_key_metadata.h"
namespace crossdesk {
@@ -35,9 +36,12 @@ static int KeyboardEventHandler(Display* display, XEvent* event) {
int key_code = key_it->second;
bool is_key_down = (event->xkey.type == KeyPress);
uint32_t scan_code = 0;
bool extended = false;
LookupWindowsKeyMetadataFromVk(key_code, &scan_code, &extended);
if (g_on_key_action) {
g_on_key_action(key_code, is_key_down, 0, false, g_user_ptr);
g_on_key_action(key_code, is_key_down, scan_code, extended, g_user_ptr);
}
}
return 0;
@@ -157,7 +161,9 @@ int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down,
use_wayland_portal_ = true;
LOG_INFO("Keyboard controller initialized with Wayland portal backend");
} else {
LOG_WARN("Wayland keyboard control init failed, falling back to X11/XTest backend");
LOG_WARN(
"Wayland keyboard control init failed, falling back to X11/XTest "
"backend");
}
}
@@ -0,0 +1,89 @@
/*
* @Author: DI JUNKUN
* @Date: 2026-05-07
* Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
*/
#ifndef _WINDOWS_KEY_METADATA_H_
#define _WINDOWS_KEY_METADATA_H_
#include <cstdint>
namespace crossdesk {
inline bool LookupWindowsKeyMetadataFromVk(int key_code,
uint32_t* scan_code_out,
bool* extended_out) {
if (scan_code_out == nullptr || extended_out == nullptr) {
return false;
}
switch (key_code) {
case 0x21: // Page Up
*scan_code_out = 0x49;
*extended_out = true;
return true;
case 0x22: // Page Down
*scan_code_out = 0x51;
*extended_out = true;
return true;
case 0x23: // End
*scan_code_out = 0x4F;
*extended_out = true;
return true;
case 0x24: // Home
*scan_code_out = 0x47;
*extended_out = true;
return true;
case 0x25: // Left Arrow
*scan_code_out = 0x4B;
*extended_out = true;
return true;
case 0x26: // Up Arrow
*scan_code_out = 0x48;
*extended_out = true;
return true;
case 0x27: // Right Arrow
*scan_code_out = 0x4D;
*extended_out = true;
return true;
case 0x28: // Down Arrow
*scan_code_out = 0x50;
*extended_out = true;
return true;
case 0x2D: // Insert
*scan_code_out = 0x52;
*extended_out = true;
return true;
case 0x2E: // Delete
*scan_code_out = 0x53;
*extended_out = true;
return true;
case 0x6F: // Numpad /
*scan_code_out = 0x35;
*extended_out = true;
return true;
case 0xA3: // Right Ctrl
*scan_code_out = 0x1D;
*extended_out = true;
return true;
case 0xA5: // Right Alt
*scan_code_out = 0x38;
*extended_out = true;
return true;
case 0x5B: // Left Win
*scan_code_out = 0x5B;
*extended_out = true;
return true;
case 0x5C: // Right Win
*scan_code_out = 0x5C;
*extended_out = true;
return true;
default:
return false;
}
}
} // namespace crossdesk
#endif