Merge lp:~compiz-team/compiz/prepare-0.9.11.3-SRU into lp:compiz/0.9.11

[Christopher Townsend]

Prepare fixes for upstream micro-release 0.9.11.3.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3870
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/86/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

ready

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-14 14:36:57 +0000
+++ debian/changelog	2014-07-25 14:47:23 +0000
@@ -1,3 +1,14 @@
+compiz (1:0.9.11.2+14.04.20140714-0ubuntu2) trusty; urgency=medium
+
+  * 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) 
+
+ -- Chris Townsend <[e-mail]>  Fri, 25 Jul 2014 09:56:35 -0400
+
 compiz (1:0.9.11.2+14.04.20140714-0ubuntu1) trusty; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2014-06-23 13:11:54 +0000
+++ plugins/expo/src/expo.cpp	2014-07-25 14:47:23 +0000
@@ -1461,6 +1461,8 @@
 		     const CompRegion          &region,
 		     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

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-06-17 20:02:23 +0000
+++ src/window.cpp	2014-07-25 14:47:23 +0000
@@ -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);
+	    }
 	}
     }
 }