mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,mac] key down & up for CAPS and NUM lock

Browse Source
This commit is contained in:
Armin Novak 2024-01-18 13:24:50 +01:00 committed by Martin Fleisz
parent feceb1c0f3
commit 8d45b3fa66
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/Mac/MRDPView.m
View File

@ -568,9 +568,9 @@ static DWORD fixKeyCode(DWORD keyCode, unichar keyChar, enum APPLE_KEYBOARD_TYPE
static BOOL updateFlagState(rdpInput *input, DWORD modFlags, DWORD kbdModFlags, DWORD flag)
{
const BOOL press = ((modFlags & flag) != 0) && ((kbdModFlags & flag) == 0);
const BOOL release = ((modFlags & flag) == 0) && ((kbdModFlags & flag) != 0);
DWORD keyFlags = press ? KBD_FLAGS_DOWN : (release ? KBD_FLAGS_RELEASE : 0);
BOOL press = ((modFlags & flag) != 0) && ((kbdModFlags & flag) == 0);
BOOL release = ((modFlags & flag) == 0) && ((kbdModFlags & flag) != 0);
DWORD keyFlags = 0;
const char *name = NULL;
DWORD scancode = 0;
@ -579,6 +579,7 @@ static BOOL updateFlagState(rdpInput *input, DWORD modFlags, DWORD kbdModFlags,
case NSEventModifierFlagCapsLock:
name = "NSEventModifierFlagCapsLock";
scancode = RDP_SCANCODE_CAPSLOCK;
release = press = TRUE;
break;
case NSEventModifierFlagShift:
name = "NSEventModifierFlagShift";
@ -603,6 +604,7 @@ static BOOL updateFlagState(rdpInput *input, DWORD modFlags, DWORD kbdModFlags,
case NSEventModifierFlagNumericPad:
name = "NSEventModifierFlagNumericPad";
scancode = RDP_SCANCODE_NUMLOCK;
release = press = TRUE;
break;
case NSEventModifierFlagHelp:
@ -620,7 +622,7 @@ static BOOL updateFlagState(rdpInput *input, DWORD modFlags, DWORD kbdModFlags,
return FALSE;
}
keyFlags |= (scancode & KBDEXT);
keyFlags = (scancode & KBDEXT);
scancode &= 0xFF;
#if defined(WITH_DEBUG_KBD)
@ -630,10 +632,16 @@ static BOOL updateFlagState(rdpInput *input, DWORD modFlags, DWORD kbdModFlags,
#endif
if (press)
return freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_DOWN, scancode);
{
if (!freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_DOWN, scancode))
return FALSE;
}
if (release)
return freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_RELEASE, scancode);
{
if (!freerdp_input_send_keyboard_event(input, keyFlags | KBD_FLAGS_RELEASE, scancode))
return FALSE;
}
return TRUE;
}