whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Fix call of ToUnicode 

ToUnicode sometimes gives wrong results if it is used with a
keyboard buffer containing the ctrl modifier. Special cases
containing alt and control might trigger the third assignment
of a key, but if no alt modifier is used for the key event,
we temporarily disable the control modifier in order to obtain
the character with ToUnicode.

Task-number: QTBUG-35734
Change-Id: Ifd88c640541b42fa65ee1dc9b55af3386714b0b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Oliver Wolff 2014-06-05 09:43:04 +02:00
parent 8456adf0ee
commit dfe853bff9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -536,15 +536,16 @@ static inline int toKeyOrUnicode(int vk, int scancode, unsigned char *kbdBuffer,
Q_ASSERT(vk > 0 && vk < 256);
int code = 0;
QChar unicodeBuffer[5];
int res = ToUnicode(vk, scancode, kbdBuffer, reinterpret_cast<LPWSTR>(unicodeBuffer), 5, 0);
// When Ctrl modifier is used ToUnicode does not return correct values. In order to assign the
// right key the control modifier is removed for just that function if the previous call failed.
if (res == 0 && kbdBuffer[VK_CONTROL]) {
const unsigned char controlState = kbdBuffer[VK_CONTROL];
// While key combinations containing alt and ctrl might trigger the third assignment of a key
// (for example "alt+ctrl+q" causes '@' on a German layout), ToUnicode often does not return the
// wanted character if only the ctrl modifier is used. Thus we unset this modifier temporarily
// if it is not used together with alt.
const unsigned char controlState = kbdBuffer[VK_MENU] ? 0 : kbdBuffer[VK_CONTROL];
if (controlState)
kbdBuffer[VK_CONTROL] = 0;
res = ToUnicode(vk, scancode, kbdBuffer, reinterpret_cast<LPWSTR>(unicodeBuffer), 5, 0);
int res = ToUnicode(vk, scancode, kbdBuffer, reinterpret_cast<LPWSTR>(unicodeBuffer), 5, 0);
if (controlState)
kbdBuffer[VK_CONTROL] = controlState;
}
if (res)
code = unicodeBuffer[0].toUpper().unicode();