Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-07 06:22:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Properly press AltGr key in Windows Auto-Type

Browse source 
* Fix #7456
This commit is contained in:
Jonathan White 2022-02-24 06:50:47 -05:00
parent f3b0fe46b4
commit e85425050b
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/autotype/windows/AutoTypeWindows.cpp
View file

@ -102,14 +102,18 @@ void AutoTypePlatformWin::sendChar(const QChar& ch, bool isKeyDown)
return; return;
} }
if (HIBYTE(vkey) & 0x1) { if (HIBYTE(vkey) & 0x6) {
sendKey(Qt::Key_Shift, true); sendKey(Qt::Key_AltGr, true);
} } else {
if (HIBYTE(vkey) & 0x2) { if (HIBYTE(vkey) & 0x1) {
sendKey(Qt::Key_Control, true); sendKey(Qt::Key_Shift, true);
} }
if (HIBYTE(vkey) & 0x4) { if (HIBYTE(vkey) & 0x2) {
sendKey(Qt::Key_Alt, true); sendKey(Qt::Key_Control, true);
}
if (HIBYTE(vkey) & 0x4) {
sendKey(Qt::Key_Alt, true);
}
} }
DWORD flags = KEYEVENTF_SCANCODE; DWORD flags = KEYEVENTF_SCANCODE;
@ -127,14 +131,18 @@ void AutoTypePlatformWin::sendChar(const QChar& ch, bool isKeyDown)
::SendInput(1, &in, sizeof(INPUT)); ::SendInput(1, &in, sizeof(INPUT));
if (HIBYTE(vkey) & 0x1) { if (HIBYTE(vkey) & 0x6) {
sendKey(Qt::Key_Shift, false); sendKey(Qt::Key_AltGr, false);
} } else {
if (HIBYTE(vkey) & 0x2) { if (HIBYTE(vkey) & 0x1) {
sendKey(Qt::Key_Control, false); sendKey(Qt::Key_Shift, false);
} }
if (HIBYTE(vkey) & 0x4) { if (HIBYTE(vkey) & 0x2) {
sendKey(Qt::Key_Alt, false); sendKey(Qt::Key_Control, false);
}
if (HIBYTE(vkey) & 0x4) {
sendKey(Qt::Key_Alt, false);
}
} }
} }

2
src/gui/osutils/winutils/WinUtils.cpp
View file

@ -267,6 +267,8 @@ WORD WinUtils::qtToNativeKeyCode(Qt::Key key)
return VK_HELP; // 0x2F return VK_HELP; // 0x2F
case Qt::Key_Meta: case Qt::Key_Meta:
return VK_LWIN; // 0x5B return VK_LWIN; // 0x5B
case Qt::Key_AltGr:
return VK_RMENU; // 0xA5
case Qt::Key_F1: case Qt::Key_F1:
return VK_F1; // 0x70 return VK_F1; // 0x70