morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,input] properly define keyboard types

Browse Source 
* use an enum to define the different WINPR_KEYBOARD_TYPE*
* use the enum as argument for the functions instead of DWORD
This commit is contained in:
akallabeth
2023-05-12 09:19:36 +02:00
committed by akallabeth
parent 46171045ed
commit d2cf953f24
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winpr/include/winpr/input.h
View File

@@ -891,12 +891,15 @@ extern "C"
WINPR_API DWORD GetVirtualScanCodeFromVirtualKeyCode(DWORD vkcode,
DWORD /* WINPR_KBD_TYPE */ dwKeyboardType);
#define KEYCODE_TYPE_APPLE 0x00000001
#define KEYCODE_TYPE_EVDEV 0x00000002
#define KEYCODE_TYPE_XKB 0x00000003
typedef enum
{
WINPR_KEYCODE_TYPE_APPLE = 0x00000001,
WINPR_KEYCODE_TYPE_EVDEV = 0x00000002,
WINPR_KEYCODE_TYPE_XKB = 0x00000003
} WINPR_KEYCODE_TYPE;
WINPR_API DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, DWORD dwFlags);
WINPR_API DWORD GetKeycodeFromVirtualKeyCode(DWORD keycode, DWORD dwFlags);
WINPR_API DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, WINPR_KEYCODE_TYPE type);
WINPR_API DWORD GetKeycodeFromVirtualKeyCode(DWORD keycode, WINPR_KEYCODE_TYPE type);
#ifdef __cplusplus
}

40
winpr/libwinpr/input/keycode.c
View File

@@ -847,26 +847,28 @@ static DWORD KEYCODE_TO_VKCODE_XKB[256] = {
0 /* 255 */
};
DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, DWORD dwFlags)
DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, WINPR_KEYCODE_TYPE type)
{
DWORD vkcode;
vkcode = VK_NONE;
if (dwFlags & KEYCODE_TYPE_APPLE)
switch (type)
{
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_APPLE[keycode & 0xFF];
}
else if (dwFlags & KEYCODE_TYPE_EVDEV)
{
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_EVDEV[keycode & 0xFF];
}
else if (dwFlags & KEYCODE_TYPE_XKB)
{
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_XKB[keycode & 0xFF];
case WINPR_KEYCODE_TYPE_APPLE:
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_APPLE[keycode & 0xFF];
break;
case WINPR_KEYCODE_TYPE_EVDEV:
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_EVDEV[keycode & 0xFF];
break;
case WINPR_KEYCODE_TYPE_XKB:
if (keycode < 0xFF)
vkcode = KEYCODE_TO_VKCODE_XKB[keycode & 0xFF];
break;
default:
break;
}
if (!vkcode)
@@ -875,23 +877,23 @@ DWORD GetVirtualKeyCodeFromKeycode(DWORD keycode, DWORD dwFlags)
return vkcode;
}
DWORD GetKeycodeFromVirtualKeyCode(DWORD vkcode, DWORD dwFlags)
DWORD GetKeycodeFromVirtualKeyCode(DWORD vkcode, WINPR_KEYCODE_TYPE type)
{
DWORD index;
DWORD* targetArray;
size_t targetSize;
switch (dwFlags)
switch (type)
{
case KEYCODE_TYPE_APPLE:
case WINPR_KEYCODE_TYPE_APPLE:
targetArray = KEYCODE_TO_VKCODE_APPLE;
targetSize = ARRAYSIZE(KEYCODE_TO_VKCODE_APPLE);
break;
case KEYCODE_TYPE_EVDEV:
case WINPR_KEYCODE_TYPE_EVDEV:
targetArray = KEYCODE_TO_VKCODE_EVDEV;
targetSize = ARRAYSIZE(KEYCODE_TO_VKCODE_EVDEV);
break;
case KEYCODE_TYPE_XKB:
case WINPR_KEYCODE_TYPE_XKB:
targetArray = KEYCODE_TO_VKCODE_XKB;
targetSize = ARRAYSIZE(KEYCODE_TO_VKCODE_XKB);
break;