From 165bab24f29d2311486e8c0fdd59e9285fe24985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 22 May 2014 15:31:55 +0200 Subject: [PATCH] Use XCB enum values in Client::updateMouseGrab instead of XLib defines --- events.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/events.cpp b/events.cpp index 023a6e5555..d3a0f3a24f 100644 --- a/events.cpp +++ b/events.cpp @@ -1011,7 +1011,7 @@ void Client::updateMouseGrab() // keep grab for the simple click without modifiers if needed (see below) bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this; if (!(!options->isClickRaise() || not_obscured)) - grabButton(None); + grabButton(XCB_NONE); return; } if (isActive() && !workspace()->forcedGlobalMouseGrab()) { // see Workspace::establishTabBoxGrab() @@ -1023,12 +1023,12 @@ void Client::updateMouseGrab() // the most recently raised window) bool not_obscured = workspace()->topClientOnDesktop(VirtualDesktopManager::self()->current(), -1, true, false) == this; if (!options->isClickRaise() || not_obscured) - ungrabButton(None); + ungrabButton(XCB_NONE); else - grabButton(None); - ungrabButton(ShiftMask); - ungrabButton(ControlMask); - ungrabButton(ControlMask | ShiftMask); + grabButton(XCB_NONE); + ungrabButton(XCB_MOD_MASK_SHIFT); + ungrabButton(XCB_MOD_MASK_CONTROL); + ungrabButton(XCB_MOD_MASK_CONTROL | XCB_MOD_MASK_SHIFT); } else { m_wrapper.ungrabButton(); // simply grab all modifier combinations