Merge lp:~compiz-team/compiz/compiz.expo.fix_1037142 into lp:compiz/0.9.8

[Sam Spilsbury]

Remove redundant checks in Expo which could cause grid to be triggered in expo. We'd be checking for a condition that could never be true, as we pass noOptions () to expoTerm. Better just to not have that check at all, since its useless in a post 0.8 world.

Remove redundant checks in Expo which could cause grid to be triggered in expo. We'd be checking for a condition that could never be true, as we pass noOptions () to expoTerm. Better just to not have that check at all, since its useless in a post 0.8 world.

Tested by the branch this one depends on.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3391
http://jenkins.qa.ubuntu.com/job/compiz-ci/94/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/94/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

CI appears to be 404ing

[Martin Mrazik (mrazik)]

> CI appears to be 404ing

Sorry. That is a but that needs to be workarounded every now and then. Should work now. This is the relevant error:

patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
patching file plugins/expo/src/client-list-generator.h
patching file plugins/expo/src/viewport-member-window.h
Patch 100_expo_layout.patch does not apply (enforce with -f)
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
make[1]: *** [override_dh_quilt_patch] Error 1
make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package

[Daniel van Vugt (vanvugt)]

Resubmit per the prereq branch.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

Actually, it should just be possible to have the fix inside the grid plugin in Q for now and leave the rest for later (which "properly" fixes it). I've split up the branches in this case, and this one is marked resubmit because it depends on the tests.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

review: Needs Resubmitting

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3387
http://jenkins.qa.ubuntu.com/job/compiz-ci/102/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/102/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3387
http://jenkins.qa.ubuntu.com/job/compiz-ci/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/106/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

The prerequisite link points to a superseded branch, which is sure to cause Tarmac/Jenkins confusion.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

It doesn't matter anyways, we're not having this in the next 3 hours ....

Unmerged revisions

3387. By Sam Spilsbury on 2012-09-24

Merge lp:~compiz-team/compiz/compiz.fix_1053280

3386. By Sam Spilsbury on 2012-09-24

Remove redundant checks

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-09-05 17:15:39 +0000
+++ plugins/expo/src/expo.cpp	2012-09-24 11:55:23 +0000
@@ -46,10 +46,6 @@
 		     CompAction::State   state,
 		     CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (expoMode)
     {
 	dndState = DnDStart;
@@ -67,10 +63,6 @@
 		     CompAction::State   state,
 		     CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (dndState == DnDDuring || dndState == DnDStart)
     {
 	if (dndWindow)
@@ -93,10 +85,6 @@
 		    CompAction::State   state,
 		    CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (screen->otherGrabExist ("expo", NULL))
 	return false;
 
@@ -139,10 +127,6 @@
 		      CompAction::State   state,
 		      CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid && xid != screen->root ())
-	return false;
-
     if (!expoMode)
 	return true;
 
@@ -175,10 +159,6 @@
 		      CompAction::State   state,
 		      CompOption::Vector& options)
 {
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
     if (!expoMode)
 	return false;
 
@@ -195,9 +175,6 @@
 		    CompOption::Vector& options)
 {
     unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
 
     if (!expoMode)
 	return false;
@@ -226,9 +203,6 @@
 		    CompOption::Vector& options)
 {
     int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
 
     if (!expoMode)
 	return false;

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-09-24 11:55:23 +0000
+++ src/event.cpp	2012-09-24 11:55:23 +0000
@@ -111,6 +111,9 @@
     if (!(option.value ().action ().state () & state))
 	return false;
 
+    if (!option.value ().action ().active ())
+	return false;
+
     return true;
 }
 
@@ -126,9 +129,6 @@
     if (option.value ().action ().initiate ().empty ())
 	return false;
 
-    if (!option.value ().action ().active ())
-	return false;
-
     *action = &option.value ().action ();
 
     return true;

=== added file 'src/eventmanagement.h'
--- src/eventmanagement.h	1970-01-01 00:00:00 +0000
+++ src/eventmanagement.h	2012-09-24 11:55:23 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2012 Canonical, Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical, Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical, Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL Canonical, Ltd. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Sam Spilsbury <[e-mail]>
+ */
+#ifndef _COMPIZ_EVENT_MANAGEMENT_H
+#define _COMPIZ_EVENT_MANAGEMENT_H
+
+#include <boost/function.hpp>
+
+class CompScreenEdge;
+class CompOption;
+
+namespace compiz
+{
+    namespace private_screen
+    {
+	struct GrabList;
+	class EventManager;
+    }
+
+    namespace events
+    {
+	namespace cps = compiz::private_screen;
+	typedef std::vector <CompOption> EventArguments;
+	typedef boost::function <bool (unsigned int, unsigned int)> ActionModsMatchesEventStateFunc;
+
+	int
+	processButtonPressOnEdgeWindow (Window               edgeWindow,
+				        Window               root,
+				        Window               eventWindow,
+				        Window               eventRoot,
+				        cps::GrabList        &grabList,
+				        const CompScreenEdge *screenEdge);
+
+	void
+	setEventWindowInButtonPressArguments (EventArguments &arguments,
+					      Window         eventWindow);
+
+	bool
+	activateButtonPressOnWindowBindingOption (CompOption                            &option,
+						  unsigned int                          eventButton,
+						  unsigned int                          eventState,
+						  cps::EventManager                     &eventManager,
+						  const ActionModsMatchesEventStateFunc &matchEventState,
+						  EventArguments                        &arguments);
+
+	bool
+	activateButtonPressOnEdgeBindingOption (CompOption                            &option,
+					        unsigned int                          eventButton,
+					        unsigned int                          eventState,
+					        int                                   edge,
+					        cps::EventManager                     &eventManager,
+					        const ActionModsMatchesEventStateFunc &matchEventState,
+					        EventArguments                        &arguments);
+    }
+}
+
+	
+
+#endif