Merge lp:~mc-return/compiz/compiz.merge-fix284158-cube-rotate-eats-mouse-clicks-on-side-of-screen into lp:compiz/0.9.11

[MC Return]

Rotate Cube plugin:
Do not eat mouse clicks on the sides of the screen.

(Credits and thanks for this patch, Matija Skala <email address hidden>)

(LP: #284158) !!!

It fixes the bug, but seems to break "Edge Flip Pointer" and "Edge Flip DnD" here...

[MC Return (mc-return)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3773
http://jenkins.qa.ubuntu.com/job/compiz-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/92

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

review: Approve (continuous-integration)

[MC Return (mc-return)]

This needs information from the original author.
Let us see if he comments on it, otherwise we might have to reject it.

review: Needs Information

Unmerged revisions

3773. By MC Return on 2013-07-21

Minor improvements:
No need to negate, added name of the bool

3772. By Matija Skala on 2013-07-21

Rotate cube plugin:
Do not eat mouse clicks on the sides of the screen

(LP: #284158) !!!

=== modified file 'plugins/rotate/src/rotate.cpp'
--- plugins/rotate/src/rotate.cpp	2013-05-21 14:13:15 +0000
+++ plugins/rotate/src/rotate.cpp	2013-07-24 16:00:47 +0000
@@ -800,6 +800,17 @@
 
 	    break;
 
+	case FocusIn:
+	case FocusOut:
+	    /* Edges on when grabbed */
+	    if (!optionGetEdgeFlipPointer ())
+	    {
+		if (event->xfocus.mode == NotifyGrab)
+		    toggleEdges (true);
+		else if (event->xfocus.mode == NotifyUngrab)
+		    toggleEdges (false);
+	    }
+
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::desktopViewport)
 	    {
@@ -892,6 +903,23 @@
     window->activate ();
 }
 
+void
+RotateScreen::toggleEdges (bool enabled)
+{
+    ROTATE_SCREEN (screen);
+
+    if (enabled)
+    {
+	screen->addAction (&rs->optionGetRotateFlipLeftEdge ());
+	screen->addAction (&rs->optionGetRotateFlipRightEdge ());
+    }
+    else
+    {
+	screen->removeAction (&rs->optionGetRotateFlipLeftEdge ());
+	screen->removeAction (&rs->optionGetRotateFlipRightEdge ());
+    }
+}
+
 void 
 RotateWindow::grabNotify (int          x,
 			  int          y,

=== modified file 'plugins/rotate/src/rotate.h'
--- plugins/rotate/src/rotate.h	2013-05-19 13:44:51 +0000
+++ plugins/rotate/src/rotate.h	2013-07-24 16:00:47 +0000
@@ -105,7 +105,9 @@
 			    CompOption::Vector &options);
 
 	int rotateToDirection (int face);
-	
+
+	void toggleEdges (bool enabled);
+
 	bool rotateTo (CompAction         *action,
 		       CompAction::State  state,
 		       CompOption::Vector &options,