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

[tabbox] Create X11Filter on establishKeyboardGrab

Browse source 
Summary:
Creating the X11Filter directly on startup caused a regression as the
filter got too early in the chain and stole events from the
XInputIntegrationFilter. We don't need the filter all the time, but only
when we have established the TabBox grab. Likewise we can destroy the
filter again when releasing the TabBox grab. So it's much more
encapsulated now.

BUG: 385032

Test Plan: Only compile tested, I'm on Wayland

Reviewers: #kwin, #plasma

Subscribers: plasma-devel, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D7997
This commit is contained in:
Martin Flöser 2017-09-26 20:41:40 +02:00
parent bc92745f07
commit bc88f84777
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tabbox/tabbox.cpp
View file

@ -505,10 +505,6 @@ TabBox::TabBox(QObject *parent)
m_tabBoxMode = TabBoxDesktopMode; // init variables
connect(&m_delayedShowTimer, SIGNAL(timeout()), this, SLOT(show()));
connect(Workspace::self(), SIGNAL(configChanged()), this, SLOT(reconfigure()));
if (kwinApp()->operationMode() == Application::OperationModeX11) {
m_x11EventFilter.reset(new X11Filter);
}
}
TabBox::~TabBox()
@ -1591,6 +1587,7 @@ bool TabBox::establishTabBoxGrab()
m_forcedGlobalMouseGrab = true;
if (Workspace::self()->activeClient() != nullptr)
Workspace::self()->activeClient()->updateMouseGrab();
m_x11EventFilter.reset(new X11Filter);
return true;
}
@ -1606,6 +1603,7 @@ void TabBox::removeTabBoxGrab()
m_forcedGlobalMouseGrab = false;
if (Workspace::self()->activeClient() != nullptr)
Workspace::self()->activeClient()->updateMouseGrab();
m_x11EventFilter.reset();
}
} // namespace TabBox
} // namespace