Merge lp:~om26er/ubuntu/oneiric/unity/unity-fix-840285 into lp:~ubuntu-desktop/unity/ubuntu

[Omer Akram]

Backport a fix from trunk where the titlebar of a window becomes "click through" after its raised from minimize.

This branch was backported: https://code.launchpad.net/~smspillaz/unity/unity.stack_debug_fixed_minimized_windows

[Didier Roche-Tolomelli (didrocks)]

Hey Omer,

Too bad, didn't see that merge proposal as first thing I did today was to push a compiz ABI break with an unity rebuild.
Normally, I don't backcport changes from trunk apart from late beta (it's too much of work for few days and we are not in a SRU process. If we start doing that, we will only do that and nothing else…). However, I backported this one on my own seeing the number of people complaining on the french forum :)

So I backported this one. Please, on things you think that should be backported in trunk, ping me on IRC first, that will be way easier. Have to disapprove as a similar backport is already committed, sorry :/

review: Disapprove

[Omer Akram (om26er)]

no worries, I'll ping you on IRC the next time if anything needed ;-)

Unmerged revisions

565. By Omer Akram on 2011-09-09

Titlebar is click through after raising a minimized window. (LP: #840285)

564. By Didier Roche-Tolomelli on 2011-09-08

releasing version 4.14.2-0ubuntu1

563. By Didier Roche-Tolomelli on 2011-09-08

build-dep on latest libunity-dev for ABI/API break, nux

562. By Didier Roche-Tolomelli on 2011-09-08

  - unity crashed with AttributeError in reset_unity_compiz_profile(): 'str'
    object has no attribute 'get_string' (LP: #809378)
  - Trying to minimize Unity Dash to make it fit on a 1024x768 screen makes
    Unity freeze and then, after I log out by killing X, never start again
    (LP: #839200)
  - unity-panel-service crashed with SIGSEGV in main_arena() (LP: #817477)
  - UIFe: Panel - Indicators should be orderable regardless of their parent
    IndicatorObject (LP: #823061)
  - 'Show Desktop' fails to hand focus to desktop (LP: #836315)
  - Dash - Functionality of top left close, minimise and maximise/restore
    window decorations is confused (LP: #838875)
  - unity-panel-service Leaks Memory (LP: #779185)
  - Missing lens shortcuts (Super-A, Super-F) (LP: #834078)
  - Unity window switcher takes over <alt> key (LP: #835699)
  - update assets for window buttons (topleft) with dash opened
    (LP: #836655)
  - Where the average background colour is either very light or dark, adjust
    this value to darken/lighten in order to preserve readability
    (LP: #837993)
  - Applications don't have priority over other results (LP: #839518)
  - task tray icons are misaligned and badly sized (LP: #839354)
  - UIFe: Dash - Shape and positioning of most of the elements in the Dash
    need adjustment (LP: #841945)
  - Cannot drag applications from dash to desktop (LP: #756614)
  - systray icons still visible on each desktop in expo mode (LP: #759129)
  - transparency on unity panel broken (LP: #827012)
  - Window buttons and application menu don't autohide if left edge is
    touched (LP: #835637)
  - 'Filter results' should be right indented as in the mockups(and unity-
    2d) (LP: #838118)
  - window title should not appear until cursor leaves the menubar
    (LP: #838759)
  - Window title is not redrawn on leaving global-menu from buttons
    (LP: #839488)
  - In the dash, main text field can not be edited, except at the end
    (LP: #840862)
  - Quicklist can't be correctly hidden (LP: #843425)
  - After double clicking on the panel to restore a window, the menus won't
    be hidden on mouse-out (LP: #838021)
  - After restoring a window the application title doesn't fade-out and it
    goes below the menus (LP: #838479)

561. By Didier Roche-Tolomelli on 2011-09-08

* debian/rules:
  - bump shlibs, remove tweak for garantuing the version as the ABI
    is considered stable until finale now.

560. By Didier Roche-Tolomelli on 2011-09-08

build-dep on latest libunity-dev, nux

559. By Didier Roche-Tolomelli on 2011-09-08

* debian/control:
  - build-dep on latest libunity-dev

558. By Didier Roche-Tolomelli on 2011-09-08

New upstream release.

557. By Didier Roche-Tolomelli on 2011-09-02

releasing version 4.12.0-0ubuntu2

556. By Didier Roche-Tolomelli on 2011-09-01

releasing version 4.12.0-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-08 18:07:52 +0000
+++ debian/changelog	2011-09-09 18:34:27 +0000
@@ -1,3 +1,9 @@
+unity (4.14.2-0ubuntu2) oneiric; urgency=low
+
+  * Titlebar is click through after raising a minimized window. (LP: #840285)
+
+ -- Omer Akram <[e-mail]>  Fri, 09 Sep 2011 23:18:27 +0500
+
 unity (4.14.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
--- plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-02 14:32:40 +0000
+++ plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-09 18:34:27 +0000
@@ -37,7 +37,6 @@
   PrivateCompizMinimizedWindowHandler () {};
 
   CompWindow         *mWindow;
-  WindowInputRemover *clientInputRemover;
 };
 
 template <typename Screen, typename Window>
@@ -87,7 +86,6 @@
   priv = new PrivateCompizMinimizedWindowHandler ();
 
   priv->mWindow = w;
-  priv->clientInputRemover = NULL;
 
 }
 
@@ -115,33 +113,7 @@
 void
 compiz::CompizMinimizedWindowHandler<Screen, Window>::setVisibility (bool visible)
 {
-  CompWindow::Geometry gm = priv->mWindow->geometry ();
-  MinimizedWindowHandler::setVisibility (visible, ROOTPARENT (priv->mWindow));
-
-  if (!visible && !priv->clientInputRemover)
-  {
-    priv->clientInputRemover = new compiz::WindowInputRemover (screen->dpy (), priv->mWindow->id ());
-    if (!priv->clientInputRemover)
-      return;
-
-    if (priv->clientInputRemover->save ())
-      priv->clientInputRemover->remove ();
-  }
-  else if (visible && priv->clientInputRemover)
-  {
-    priv->clientInputRemover->restore ();
-
-    delete priv->clientInputRemover;
-    priv->clientInputRemover = NULL;
-  }
-
-  /* This is a little hack to ensure that the window region gets updated,
-   * because there's no API in core to do that */
-
-  gm.setBorder (gm.border () + 1);
-  priv->mWindow->resize (gm);
-  gm.setBorder (gm.border () - 1);
-  priv->mWindow->resize (gm);
+  MinimizedWindowHandler::setVisibility (visible, priv->mWindow->id ());
 
   CompositeWindow::get (priv->mWindow)->addDamage ();
   GLWindow::get (priv->mWindow)->glPaintSetEnabled (Window::get (priv->mWindow), !visible);
@@ -285,8 +257,10 @@
 void
 compiz::CompizMinimizedWindowHandler<Screen, Window>::handleEvent (XEvent *event)
 {
+  /* Ignore sent events from the InputRemover */
   if (screen->XShape () && event->type ==
-      screen->shapeEvent () + ShapeNotify)
+      screen->shapeEvent () + ShapeNotify &&
+      !event->xany.send_event)
   {
     CompWindow *w = screen->findWindow (((XShapeEvent *) event)->window);
 

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2011-09-02 14:32:40 +0000
+++ plugins/unityshell/src/inputremover.cpp	2011-09-09 18:34:27 +0000
@@ -20,6 +20,7 @@
  */
 
 #include "inputremover.h"
+#include <X11/Xregion.h>
 #include <cstdio>
 
 compiz::WindowInputRemover::WindowInputRemover (Display *dpy,
@@ -43,6 +44,132 @@
     restore ();
 }
 
+void
+compiz::WindowInputRemover::sendShapeNotify ()
+{
+  /* Send a synthetic ShapeNotify event to the root window
+   * since we ignored shape events when setting visibility
+   * in order to avoid cycling in the shape handling code -
+   * ignore the sent shape notify event since that will
+   * be send_event = true */
+
+  XShapeEvent  xsev;
+  XEvent       *xev = (XEvent *) &xsev;
+  Window       rootReturn, parentReturn;
+  Window       childReturn;
+  Window       *children;
+  int          x, y, xOffset, yOffset;
+  unsigned int width, height, depth, border, nchildren;
+  int          shapeEvent, shapeError, shapeMask;
+
+  /* FIXME: roundtrip */
+  XShapeQueryExtension (mDpy, &shapeEvent, &shapeError);
+  shapeMask = XShapeInputSelected (mDpy, mShapeWindow);
+
+  xev->type   = shapeEvent + ShapeNotify;
+  xsev.window = mShapeWindow;
+
+  if (!mRemoved)
+  {
+    /* FIXME: these roundtrips suck */
+    XGetGeometry (mDpy, mShapeWindow, &rootReturn, &x, &y, &width, &height, &depth, &border);
+    XQueryTree (mDpy, mShapeWindow, &rootReturn, &parentReturn, &children, &nchildren);
+
+    /* We need to translate the co-ordinates of the origin to the
+     * client window to its parent to find out the offset of its
+     * position so that we can subtract that from the final bounding
+     * rect of the window shape according to the Shape extension
+     * specification */
+
+    XTranslateCoordinates (mDpy, mShapeWindow, parentReturn, 0, 0, &xOffset, &yOffset, &childReturn);
+
+    xev->type = ShapeBounding;
+
+    /* Calculate extents of the bounding shape */
+    if (!mNBoundingRects)
+    {
+      /* No set input shape, we must use the client geometry */
+      xsev.x = x - xOffset;
+      xsev.y = y - yOffset;
+      xsev.width = width; 
+      xsev.height = height;
+      xsev.shaped = false;
+    }
+    else
+    {
+      Region      boundingRegion = XCreateRegion ();
+
+      for (int i = 0; i < mNBoundingRects; i++)
+	XUnionRectWithRegion (&(mBoundingRects[i]), boundingRegion, boundingRegion);
+
+      xsev.x = boundingRegion->extents.x1 - xOffset;
+      xsev.y = boundingRegion->extents.y1 - yOffset;
+      xsev.width = boundingRegion->extents.x2 - boundingRegion->extents.x1;
+      xsev.height = boundingRegion->extents.y2 - boundingRegion->extents.y1;
+      xsev.shaped = true;
+
+      XDestroyRegion (boundingRegion);
+    }
+
+    xsev.time = CurrentTime;
+    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+
+    xev->type = ShapeInput;
+
+    /* Calculate extents of the bounding shape */
+    if (!mNInputRects)
+    {
+      /* No set input shape, we must use the client geometry */
+      xsev.x = x - xOffset;
+      xsev.y = y - yOffset;
+      xsev.width = width; 
+      xsev.height = height;
+      xsev.shaped = false;
+    }
+    else
+    {
+      Region      inputRegion = XCreateRegion ();
+
+      for (int i = 0; i < mNInputRects; i++)
+	XUnionRectWithRegion (&(mInputRects[i]), inputRegion, inputRegion);
+
+      xsev.x = inputRegion->extents.x1 - xOffset;
+      xsev.y = inputRegion->extents.y1 - yOffset;
+      xsev.width = inputRegion->extents.x2 - inputRegion->extents.x1;
+      xsev.height = inputRegion->extents.y2 - inputRegion->extents.y1;
+      xsev.shaped = true;
+
+      XDestroyRegion (inputRegion);
+    }
+
+    xsev.time = CurrentTime;
+    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+
+    if (children)
+      XFree (children);
+  }
+  else
+  {
+    xev->type = ShapeBounding;
+
+    xsev.x = 0;
+    xsev.y = 0;
+    xsev.width = 0;
+    xsev.height = 0;
+    xsev.shaped = true;
+
+    xsev.time = CurrentTime;
+    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+
+    xev->type = ShapeInput;
+
+    /* Both ShapeBounding and ShapeInput are null */
+
+    xsev.time = CurrentTime;
+    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+  }
+}
+
 bool
 compiz::WindowInputRemover::save ()
 {
@@ -111,6 +238,8 @@
 
   XShapeSelectInput (mDpy, mShapeWindow, ShapeNotify);
 
+  sendShapeNotify ();
+
   mRemoved = true;
   return true;
 }
@@ -125,6 +254,7 @@
       XShapeCombineRectangles (mDpy, mShapeWindow, ShapeInput, 0, 0,
 	                       mInputRects, mNInputRects,
 	                       ShapeSet, mInputRectOrdering);
+
     }
     else
     {
@@ -153,6 +283,8 @@
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
 
+  sendShapeNotify ();
+
   mRemoved = false;
   mNInputRects  = 0;
   mInputRects = NULL;

=== modified file 'plugins/unityshell/src/inputremover.h'
--- plugins/unityshell/src/inputremover.h	2011-09-01 17:18:02 +0000
+++ plugins/unityshell/src/inputremover.h	2011-09-09 18:34:27 +0000
@@ -41,6 +41,9 @@
   bool restore ();
 
 private:
+
+  void sendShapeNotify ();
+
   Display       *mDpy;
   Window        mShapeWindow;
   unsigned long mShapeMask;
@@ -52,7 +55,7 @@
   XRectangle    *mBoundingRects;
   int           mNBoundingRects;
   int           mBoundingRectOrdering;
-  bool	  mRemoved;
+  bool          mRemoved;
 
 };
 }

=== modified file 'plugins/unityshell/src/minimizedwindowhandler.cpp'
--- plugins/unityshell/src/minimizedwindowhandler.cpp	2011-08-26 10:37:35 +0000
+++ plugins/unityshell/src/minimizedwindowhandler.cpp	2011-09-09 18:34:27 +0000
@@ -58,10 +58,10 @@
   {
     priv->mRemover = new compiz::WindowInputRemover (priv->mDpy, shapeWin);
     if (!priv->mRemover)
-	    return;
+      return;
 
     if (priv->mRemover->save ())
-	    priv->mRemover->remove ();
+      priv->mRemover->remove ();
   }
   else if (visible && priv->mRemover)
   {