diff -Nru compiz-0.9.11.2+14.04.20140714/debian/changelog compiz-0.9.11.3+14.04.20141104/debian/changelog --- compiz-0.9.11.2+14.04.20140714/debian/changelog 2014-11-18 09:27:35.000000000 -0500 +++ compiz-0.9.11.3+14.04.20141104/debian/changelog 2014-11-18 09:27:36.000000000 -0500 @@ -1,3 +1,16 @@ +compiz (1:0.9.11.3+14.04.20141104-0ubuntu1) trusty; urgency=medium + + [ Chris Townsend ] + * Add NumLock and CapsLock button ungrab keymasks, so unfocused Gtk + window scrolling will work when NumLock is off and CapsLock is on + and any combination thereof. (LP: #1311788) + * Fixes issue in the Expo plugin where a gap is shown in the place + where the Launcher and Panel should be when windows are maximized. + This was originally removed in rev. 3481. (LP: #1087090) + * Bump version to 0.9.11.3. + + -- Ubuntu daily release Tue, 04 Nov 2014 19:42:46 +0000 + compiz (1:0.9.11.2+14.04.20140714-0ubuntu1) trusty; urgency=medium [ Chris Townsend ] diff -Nru compiz-0.9.11.2+14.04.20140714/NEWS compiz-0.9.11.3+14.04.20141104/NEWS --- compiz-0.9.11.2+14.04.20140714/NEWS 2014-07-14 10:36:38.000000000 -0400 +++ compiz-0.9.11.3+14.04.20141104/NEWS 2014-11-04 14:42:27.000000000 -0500 @@ -1,3 +1,14 @@ +Release 0.9.11.3 (2014-7-25 Christopher Townsend ) +============================================================================= + +Highlights + +Bugs Fixed (https://launchpad.net/compiz/+milestone/0.9.11.3) + + 1087090 - [raring][regression] Window management - Maximized windows + aren't fullscreen in the workspace switcher + 1311788 - compiz lower window:Button5 stops working + Release 0.9.11.2 (2014-7-11 Chris Townsend ) ============================================================================= diff -Nru compiz-0.9.11.2+14.04.20140714/plugins/expo/src/expo.cpp compiz-0.9.11.3+14.04.20141104/plugins/expo/src/expo.cpp --- compiz-0.9.11.2+14.04.20140714/plugins/expo/src/expo.cpp 2014-07-14 10:36:12.000000000 -0400 +++ compiz-0.9.11.3+14.04.20141104/plugins/expo/src/expo.cpp 2014-11-04 14:42:14.000000000 -0500 @@ -1461,6 +1461,8 @@ const CompRegion ®ion, unsigned int mask) { + GLMatrix wTransform (transform); + if (eScreen->expoActive) { if (eScreen->expoCam > 0.0) @@ -1486,9 +1488,26 @@ if (opacity <= 0) mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK; + + /* Stretch maximized windows a little so that you don't + * have an awkward gap */ + if (((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE) && + (eScreen->dndWindow != window)) + { + CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())]; + float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam); + float xS = 1.0 + ((o->width () / (float) window->width ()) - 1.0f) * sigmoidProgress (eScreen->expoCam); + wTransform.translate (window->x () + window->width (), + window->y () + window->height (), + 0.0f); + wTransform.scale (xS, yS, 1.0f); + wTransform.translate (-(window->x () + window->width ()), + -(window->y () + window->height ()), + 0.0f); + } } - return gWindow->glPaint (attrib, transform, region, mask); + return gWindow->glPaint (attrib, wTransform, region, mask); } bool diff -Nru compiz-0.9.11.2+14.04.20140714/src/window.cpp compiz-0.9.11.3+14.04.20141104/src/window.cpp --- compiz-0.9.11.2+14.04.20140714/src/window.cpp 2014-07-14 10:36:12.000000000 -0400 +++ compiz-0.9.11.3+14.04.20141104/src/window.cpp 2014-11-04 14:42:14.000000000 -0500 @@ -5652,7 +5652,12 @@ { /* Ungrab Buttons 4 & 5 for vertical scrolling if the window is not the desktop window */ for (int i = Button4; i <= Button5; ++i) - XUngrabButton (screen->dpy (), i, AnyModifier, frame); + { + XUngrabButton (screen->dpy (), i, 0, frame); + XUngrabButton (screen->dpy (), i, LockMask, frame); + XUngrabButton (screen->dpy (), i, Mod2Mask, frame); + XUngrabButton (screen->dpy (), i, LockMask | Mod2Mask, frame); + } } } } diff -Nru compiz-0.9.11.2+14.04.20140714/VERSION compiz-0.9.11.3+14.04.20141104/VERSION --- compiz-0.9.11.2+14.04.20140714/VERSION 2014-07-14 10:36:38.000000000 -0400 +++ compiz-0.9.11.3+14.04.20141104/VERSION 2014-11-04 14:42:27.000000000 -0500 @@ -1 +1 @@ -0.9.11.2 +0.9.11.3