yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[tabbox] Properly determine depressed modifiers on X11

Browse source 
Summary:
A keysym can be assigned to several keycodes, so more proper way to
determine whether given modifier is depressed is to iterate over all
returned keycodes and see if any is pressed.

If we check only the first keycode, then alternative mappings may not
work, e.g. alt key mapped to win, etc.

BUG: 407720

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D21302
This commit is contained in:
Vlad Zagorodniy 2019-05-21 14:41:27 +03:00
parent 3d384f3c90
commit 499eccb1c8
1 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
tabbox/tabbox.cpp
View file

@ -921,10 +921,8 @@ struct KeySymbolsDeleter
/**
* Handles alt-tab / control-tab
**/
static bool areKeySymXsDepressed(bool bAll, const uint keySyms[], int nKeySyms) {
qCDebug(KWIN_TABBOX) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms;
static bool areKeySymXsDepressed(const uint keySyms[], int nKeySyms)
{
Xcb::QueryKeymap keys;
QScopedPointer<xcb_key_symbols_t, KeySymbolsDeleter> symbols(xcb_key_symbols_alloc(connection()));
@ -933,42 +931,38 @@ static bool areKeySymXsDepressed(bool bAll, const uint keySyms[], int nKeySyms)
}
const auto keymap = keys->keys;
bool depressed = false;
for (int iKeySym = 0; iKeySym < nKeySyms; iKeySym++) {
uint keySymX = keySyms[ iKeySym ];
xcb_keycode_t *keyCodes = xcb_key_symbols_get_keycode(symbols.data(), keySymX);
if (!keyCodes) {
continue;
}
xcb_keycode_t keyCodeX = keyCodes[0];
int j = 0;
while (keyCodes[j] != XCB_NO_SYMBOL) {
const xcb_keycode_t keyCodeX = keyCodes[j++];
int i = keyCodeX / 8;
char mask = 1 << (keyCodeX - (i * 8));
if (i < 0 || i >= 32) {
continue;
}
qCDebug(KWIN_TABBOX) << iKeySym << ": keySymX=0x" << QString::number(keySymX, 16)
<< " i=" << i << " mask=0x" << QString::number(mask, 16)
<< " keymap[i]=0x" << QString::number(keymap[i], 16);
if (keymap[i] & mask) {
depressed = true;
break;
}
}
free(keyCodes);
if (keyCodeX == XCB_NO_SYMBOL) {
continue;
}
int i = keyCodeX / 8;
char mask = 1 << (keyCodeX - (i * 8));
// Abort if bad index value,
if (i < 0 || i >= 32)
return false;
qCDebug(KWIN_TABBOX) << iKeySym << ": keySymX=0x" << QString::number(keySymX, 16)
<< " i=" << i << " mask=0x" << QString::number(mask, 16)
<< " keymap[i]=0x" << QString::number(keymap[i], 16);
// If ALL keys passed need to be depressed,
if (bAll) {
if ((keymap[i] & mask) == 0)
return false;
} else {
// If we are looking for ANY key press, and this key is depressed,
if (keymap[i] & mask)
return true;
}
}
// If we were looking for ANY key press, then none was found, return false,
// If we were looking for ALL key presses, then all were found, return true.
return bAll;
return depressed;
}
static bool areModKeysDepressedX11(const QKeySequence &seq)
@ -999,7 +993,7 @@ static bool areModKeysDepressedX11(const QKeySequence &seq)
rgKeySyms[nKeySyms++] = XK_Meta_R;
}
return areKeySymXsDepressed(false, rgKeySyms, nKeySyms);
return areKeySymXsDepressed(rgKeySyms, nKeySyms);
}
static bool areModKeysDepressedWayland(const QKeySequence &seq)