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

Use XCB enum values in Client::updateMouseGrab instead of XLib defines

Browse source
This commit is contained in:
Martin Gräßlin 2014-05-22 15:31:55 +02:00
parent 1a36364a05
commit 165bab24f2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
events.cpp
View file

@ -1011,7 +1011,7 @@ void Client::updateMouseGrab()
// keep grab for the simple click without modifiers if needed (see below) // keep grab for the simple click without modifiers if needed (see below)
bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this; bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this;
if (!(!options->isClickRaise() || not_obscured)) if (!(!options->isClickRaise() || not_obscured))
grabButton(None); grabButton(XCB_NONE);
return; return;
} }
if (isActive() && !workspace()->forcedGlobalMouseGrab()) { // see Workspace::establishTabBoxGrab() if (isActive() && !workspace()->forcedGlobalMouseGrab()) { // see Workspace::establishTabBoxGrab()
@ -1023,12 +1023,12 @@ void Client::updateMouseGrab()
// the most recently raised window) // the most recently raised window)
bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this; bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this;
if (!options->isClickRaise() || not_obscured) if (!options->isClickRaise() || not_obscured)
ungrabButton(None); ungrabButton(XCB_NONE);
else else
grabButton(None); grabButton(XCB_NONE);
ungrabButton(ShiftMask); ungrabButton(XCB_MOD_MASK_SHIFT);
ungrabButton(ControlMask); ungrabButton(XCB_MOD_MASK_CONTROL);
ungrabButton(ControlMask | ShiftMask); ungrabButton(XCB_MOD_MASK_CONTROL | XCB_MOD_MASK_SHIFT);
} else { } else {
m_wrapper.ungrabButton(); m_wrapper.ungrabButton();
// simply grab all modifier combinations // simply grab all modifier combinations