Merge lp:~townsend/compiz/fix-expo-clicks into lp:compiz/0.9.12

[Christopher Townsend]

Expo plugin: Make sure the Expo animation is completed before allowing clicks to be handled.

[Stephen M. Webb (bregma)]

Looks fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3939
http://jenkins.qa.ubuntu.com/job/compiz-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/35

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

review: Approve (continuous-integration)

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2014-06-24 18:40:39 +0000
+++ plugins/expo/src/expo.cpp	2015-04-02 13:31:14 +0000
@@ -48,7 +48,7 @@
 		     CompAction::State  state,
 		     CompOption::Vector &options)
 {
-    if (expoMode)
+    if (expoMode && expoCam == 1.0f)
     {
 	dndState = DnDStart;
 	action->setState (action->state () | CompAction::StateTermButton);
@@ -65,7 +65,7 @@
 		     CompAction::State  state,
 		     CompOption::Vector &options)
 {
-    if (dndState == DnDDuring || dndState == DnDStart)
+    if (expoCam == 1.0f && (dndState == DnDDuring || dndState == DnDStart))
     {
 	if (dndWindow)
 	    finishWindowMovement ();
@@ -141,10 +141,13 @@
     if (dndState != DnDNone)
 	dndFini (action, state, options);
 
-    if (state & CompAction::StateCancel)
-	vpUpdateMode = VPUpdatePrevious;
-    else
-	vpUpdateMode = VPUpdateMouseOver;
+    if (expoCam == 1.0f)
+    {
+	if (state & CompAction::StateCancel)
+	    vpUpdateMode = VPUpdatePrevious;
+	else
+	    vpUpdateMode = VPUpdateMouseOver;
+    }
 
     dndState  = DnDNone;
     dndWindow = NULL;
@@ -324,6 +327,7 @@
 
 	case ButtonPress:
 	    if (expoMode			    &&
+		expoCam == 1.0f			    &&
 		event->xbutton.button == Button1    &&
 		event->xbutton.root   == screen->root ())
 	    {
@@ -354,6 +358,7 @@
 
 	case ButtonRelease:
 	    if (expoMode			    &&
+		expoCam == 1.0f			    &&
 		event->xbutton.button == Button1    &&
 		event->xbutton.root   == screen->root ())
 	    {