diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2010-12-07 18:03:25 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2010-12-07 18:03:25 +0800 |
| commit | be2474f212eebb7b1dc9457b7a4b373d1fd4fa58 (patch) | |
| tree | 7753c00967cc43ebd158b5b4fc9787ba50fb1f87 /plugins | |
| parent | 132f4c5c1344aba1d0f33bde343afaf3e651c1d7 (diff) | |
| download | compiz-with-glib-mainloop-be2474f212eebb7b1dc9457b7a4b373d1fd4fa58.tar.gz compiz-with-glib-mainloop-be2474f212eebb7b1dc9457b7a4b373d1fd4fa58.tar.bz2 | |
Switcher: prevent simulataneous plugin uses that don't make sense.
Forward port 1974f9b5bfbab24023a0a647b606eedccbb83d04 to master
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/compiztoolbox/src/compiztoolbox.cpp | 4 | ||||
| -rw-r--r-- | plugins/switcher/src/switcher.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/compiztoolbox/src/compiztoolbox.cpp b/plugins/compiztoolbox/src/compiztoolbox.cpp index 1ec4402..47f0288 100644 --- a/plugins/compiztoolbox/src/compiztoolbox.cpp +++ b/plugins/compiztoolbox/src/compiztoolbox.cpp @@ -397,7 +397,7 @@ BaseSwitchWindow::paintThumb (const GLWindowPaintAttrib &attrib, int height2) { if (!openGLAvailable) - return; + return; GLWindowPaintAttrib sAttrib (attrib); IconMode iconMode; @@ -687,7 +687,7 @@ BaseSwitchScreen::BaseSwitchScreen (CompScreen *screen) : selectWinAtom = PropertyWriter (CompString (DECOR_SWITCH_WINDOW_ATOM_NAME), atomTemplate); - selectFgColorAtom = + selectFgColorAtom = XInternAtom (::screen->dpy (), DECOR_SWITCH_FOREGROUND_COLOR_ATOM_NAME, 0); diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp index 58fe35b..7a08aaa 100644 --- a/plugins/switcher/src/switcher.cpp +++ b/plugins/switcher/src/switcher.cpp @@ -79,9 +79,9 @@ SwitchScreen::updateWindowList (int count) XWindowChanges xwc; unsigned int valueMask = 0; - + valueMask |= (CWX | CWY | CWWidth | CWHeight); - + xwc.x = x - WINDOW_WIDTH (count) / 2; xwc.y = y - WINDOW_HEIGHT / 2; xwc.width = WINDOW_WIDTH (count); @@ -207,7 +207,7 @@ SwitchScreen::initiate (SwitchWindowSelection selection, { int count; - if (screen->otherGrabExist ("switcher", "scale", "cube", NULL)) + if (screen->otherGrabExist ("switcher", NULL)) return; this->selection = selection; @@ -380,11 +380,11 @@ switchTerminate (CompAction *action, { ss->selectedWindow = NULL; ss->zoomedWindow = NULL; - + if (screen->activeWindow () != ss->lastActiveWindow) { CompWindow *w = screen->findWindow (ss->lastActiveWindow); - + if (w) w->moveInputFocusTo (); } |