Merge lp:~3v1n0/compiz/scale-selection-tools into lp:compiz/0.9.8

[Marco Trevisan (Treviño)]

Scale: select the window under the pointer, when the scale animation is over.

Also expose SelectedWindow to public

expose to public the scale selected window (i.e. != hovered one), so that we can use this directly in unity without overriding SelectWindow().

Also fix bug #1045127 by making scale to automatically select the window under pointer after that an animation has been performed.

Tests not applied for lack of time of refactoring the whole scale code for a such trivial change.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3348
http://jenkins.qa.ubuntu.com/job/compiz-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/38/console

review: Approve (continuous-integration)

[lp:~3v1n0/compiz/scale-selection-tools]

3349. By Marco Trevisan (Treviño) on 2012-09-06

Scale: introduce selectWindowAt (int x, int y) that would consider the "click_to_focus" option

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3349
http://jenkins.qa.ubuntu.com/job/compiz-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/39/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Because the prototype of getHoveredWindow has changed, you need to increment COMPIZ_SCALE_ABI too.

Other than that, it seems to work fine and looks good.

review: Approve

[Daniel van Vugt (vanvugt)]

Argh, I meant Needs fixing for the COMPIZ_SCALE_ABI increment.

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> Argh, I meant Needs fixing for the COMPIZ_SCALE_ABI increment.

True, my fault. Fixed version coming.

[lp:~3v1n0/compiz/scale-selection-tools]

3350. By Marco Trevisan (Treviño) on 2012-09-07

Scale: increase the scale ABI

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3350
http://jenkins.qa.ubuntu.com/job/compiz-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/56/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

Approved, but merge held back while we complete the 0.9.8.2 release today. This will be the first thing merged to 0.9.8.4.

=== modified file 'plugins/scale/include/scale/scale.h'
--- plugins/scale/include/scale/scale.h	2012-01-18 16:26:45 +0000
+++ plugins/scale/include/scale/scale.h	2012-09-07 17:41:20 +0000
@@ -31,7 +31,7 @@
 #include <composite/composite.h>
 #include <opengl/opengl.h>
 
-#define COMPIZ_SCALE_ABI 2
+#define COMPIZ_SCALE_ABI 3
 
 class ScaleScreen;
 class PrivateScaleScreen;
@@ -93,7 +93,8 @@
 	State getState () const;
 	ScaleType getType () const;
 
-	const Window & getHoveredWindow ();
+	const Window & getHoveredWindow () const;
+	const Window & getSelectedWindow () const;
 
 	const CompMatch & getCustomMatch () const;
 	const WindowList& getWindows () const;

=== modified file 'plugins/scale/src/privates.h'
--- plugins/scale/src/privates.h	2012-06-22 10:10:44 +0000
+++ plugins/scale/src/privates.h	2012-09-07 17:41:20 +0000
@@ -91,6 +91,7 @@
 	bool ensureDndRedirectWindow ();
 
 	bool selectWindowAt (int x, int y, bool moveInputFocus);
+	bool selectWindowAt (int x, int y);
 
 	void moveFocusWindow (int dx, int dy);
 

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-08-16 11:23:34 +0000
+++ plugins/scale/src/scale.cpp	2012-09-07 17:41:20 +0000
@@ -929,7 +929,12 @@
 		}
 	    }
 	    else if (state == ScaleScreen::Out)
+	    {
 		state = ScaleScreen::Wait;
+
+		// When the animation is completed, select the window under mouse
+		selectWindowAt (pointerX, pointerY);
+	    }
 	}
     }
 
@@ -1346,11 +1351,17 @@
 }
 
 const Window &
-ScaleScreen::getHoveredWindow ()
+ScaleScreen::getHoveredWindow () const
 {
     return priv->hoveredWindow;
 }
 
+const Window &
+ScaleScreen::getSelectedWindow () const
+{
+    return priv->selectedWindow;
+}
+
 bool
 PrivateScaleScreen::selectWindowAt (int  x,
 				    int  y,
@@ -1379,6 +1390,16 @@
     return false;
 }
 
+bool
+PrivateScaleScreen::selectWindowAt (int  x,
+				    int  y)
+{
+    CompOption *o = screen->getOption ("click_to_focus");
+    bool focus = (o && !o->value ().b ());
+
+    return selectWindowAt (x, y, focus);
+}
+
 void
 PrivateScaleScreen::moveFocusWindow (int dx,
 				     int dy)
@@ -1598,15 +1619,7 @@
 		grabIndex                              &&
 		state != ScaleScreen::In)
 	    {
-		bool       focus = false;
-		CompOption *o = screen->getOption ("click_to_focus");
-
-		if (o && !o->value ().b ())
-		    focus = true;
-
-		selectWindowAt (event->xmotion.x_root,
-				event->xmotion.y_root,
-				focus);
+		selectWindowAt (event->xmotion.x_root, event->xmotion.y_root);
 	    }
 	    break;
 	case DestroyNotify:
@@ -1629,12 +1642,6 @@
 		w = screen->findWindow (event->xclient.window);
 		if (w)
 		{
-		    bool       focus = false;
-		    CompOption *o = screen->getOption ("click_to_focus");
-
-		    if (o && !o->value ().b ())
-			focus = true;
-
 		    if (w->id () == dndTarget)
 			sendDndStatusMessage (event->xclient.data.l[0]);
 
@@ -1662,7 +1669,7 @@
 				hover.start (time, (float) time * 1.2);
 			    }
 
-			    selectWindowAt (pointerX, pointerY, focus);
+			    selectWindowAt (pointerX, pointerY);
 			}
 			else
 			{