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

[TabBox] Fix forcedGlobalMouseGrab

Browse source 
Was incompletely moved to TabBox after splitting out from Workspace.

REVIEW: 118259
This commit is contained in:
Martin Gräßlin 2014-05-22 15:28:29 +02:00
parent 0532280689
commit 97726a4b1f
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
events.cpp
View file

@ -1014,7 +1014,7 @@ void Client::updateMouseGrab()
grabButton(XCB_NONE);
return;
}
if (isActive() && !workspace()->forcedGlobalMouseGrab()) { // see Workspace::establishTabBoxGrab()
if (isActive() && !TabBox::TabBox::self()->forcedGlobalMouseGrab()) { // see TabBox::establishTabBoxGrab()
// first grab all modifier combinations
m_wrapper.grabButton(XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC);
// remove the grab for no modifiers only if the window

4
tabbox/tabbox.h
View file

@ -176,6 +176,10 @@ public:
void keyPress(int key);
void keyRelease(const xcb_key_release_event_t *ev);
bool forcedGlobalMouseGrab() const {
return m_forcedGlobalMouseGrab;
}
static TabBox *self();
static TabBox *create(QObject *parent);

1
workspace.cpp
View file

@ -132,7 +132,6 @@ Workspace::Workspace(bool restore)
, startup(0)
, set_active_client_recursion(0)
, block_stacking_updates(0)
, forced_global_mouse_grab(false)
{
// If KWin was already running it saved its configuration after loosing the selection -> Reread
QFuture<void> reparseConfigFuture = QtConcurrent::run(options, &Options::reparseConfiguration);

7
workspace.h
View file

@ -297,7 +297,6 @@ public:
void focusToNull(); // SELI TODO: Public?
bool forcedGlobalMouseGrab() const;
void clientShortcutUpdated(Client* c);
bool shortcutAvailable(const QKeySequence &cut, Client* ignore = NULL) const;
bool globalShortcutsDisabled() const;
@ -570,7 +569,6 @@ private:
int block_stacking_updates; // When > 0, stacking updates are temporarily disabled
bool blocked_propagating_new_clients; // Propagate also new clients after enabling stacking updates?
QScopedPointer<Xcb::Window> m_nullFocus;
bool forced_global_mouse_grab;
friend class StackingUpdatesBlocker;
QScopedPointer<KillWindow> m_windowKiller;
@ -666,11 +664,6 @@ inline bool Workspace::sessionSaving() const
return session_saving;
}
inline bool Workspace::forcedGlobalMouseGrab() const
{
return forced_global_mouse_grab;
}
inline bool Workspace::showingDesktop() const
{
return showing_desktop;