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

[tabbox] Split areModKeysDepressed into X11 and Wayland variant

Browse source
This commit is contained in:
Martin Gräßlin 2015-08-24 11:43:39 +02:00
parent 6b95705f24
commit 304ac3ac84
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tabbox/tabbox.cpp
View file

@ -978,11 +978,10 @@ static bool areKeySymXsDepressed(bool bAll, const uint keySyms[], int nKeySyms)
return bAll; return bAll;
} }
static bool areModKeysDepressed(const QKeySequence& seq) { static bool areModKeysDepressedX11(const QKeySequence &seq)
{
uint rgKeySyms[10]; uint rgKeySyms[10];
int nKeySyms = 0; int nKeySyms = 0;
if (seq.isEmpty())
return false;
int mod = seq[seq.count()-1] & Qt::KeyboardModifierMask; int mod = seq[seq.count()-1] & Qt::KeyboardModifierMask;
if (mod & Qt::SHIFT) { if (mod & Qt::SHIFT) {
@ -1010,6 +1009,35 @@ static bool areModKeysDepressed(const QKeySequence& seq) {
return areKeySymXsDepressed(false, rgKeySyms, nKeySyms); return areKeySymXsDepressed(false, rgKeySyms, nKeySyms);
} }
static bool areModKeysDepressedWayland(const QKeySequence &seq)
{
const int mod = seq[seq.count()-1] & Qt::KeyboardModifierMask;
const Qt::KeyboardModifiers mods = input()->keyboardModifiers();
if ((mod & Qt::SHIFT) && mods.testFlag(Qt::ShiftModifier)) {
return true;
}
if ((mod & Qt::CTRL) && mods.testFlag(Qt::ControlModifier)) {
return true;
}
if ((mod & Qt::ALT) && mods.testFlag(Qt::AltModifier)) {
return true;
}
if ((mod & Qt::META) && mods.testFlag(Qt::MetaModifier)) {
return true;
}
return false;
}
static bool areModKeysDepressed(const QKeySequence& seq) {
if (seq.isEmpty())
return false;
if (kwinApp()->shouldUseWaylandForCompositing()) {
return areModKeysDepressedWayland(seq);
} else {
return areModKeysDepressedX11(seq);
}
}
void TabBox::navigatingThroughWindows(bool forward, const QKeySequence &shortcut, TabBoxMode mode) void TabBox::navigatingThroughWindows(bool forward, const QKeySequence &shortcut, TabBoxMode mode)
{ {
if (!m_ready || isGrabbed() || !Workspace::self()->isOnCurrentHead()) { if (!m_ready || isGrabbed() || !Workspace::self()->isOnCurrentHead()) {