Merge lp:~compiz-team/compiz-core/compiz-core.fix_790565 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Use findSiblingBelow to determine if the window can be raised further, since otherwise we could incorrectly match the window as capable of being raised above a window it is not allowed to be raised above and we would continue to grab Button1 on the frame which would break some applications

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-20 14:43:43 +0000
+++ src/window.cpp	2011-09-20 15:50:49 +0000
@@ -5226,16 +5226,14 @@
     {
 	if (screen->priv->optionGetRaiseOnClick ())
 	{
-	    for (CompWindow *above = window->next;
-		above != NULL; above = above->next)
+	    CompWindow *highestSibling =
+		    PrivateWindow::findSiblingBelow (window, true);
+
+	    /* Check if this window is permitted to be raised */
+	    for (CompWindow *above = window->serverNext;
+		above != NULL; above = above->serverNext)
 	    {
-		if (above->priv->attrib.map_state != IsViewable)
-		    continue;
-
-		if (above->type () & CompWindowTypeDockMask)
-		    continue;
-
-		if (above->region ().intersects (region))
+		if (highestSibling == above)
 		{
 		    onlyActions = false;
 		    break;
@@ -5263,7 +5261,7 @@
 		XGrabButton (screen->priv->dpy,
 			     bind.button,
 			     mods | ignore,
-			     frame,
+			     serverFrame,
 			     false,
 			     ButtonPressMask | ButtonReleaseMask |
 				ButtonMotionMask,
@@ -5280,7 +5278,7 @@
 	XGrabButton (screen->priv->dpy,
 		     AnyButton,
 		     AnyModifier,
-		     frame, false,
+		     serverFrame, false,
 		     ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
 		     GrabModeSync,
 		     GrabModeAsync,