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

[Sam Spilsbury]

Check if expo is active before tracking grabbed windows so that grid doesn't fire
(LP: #1037142)

Check if expo is active before tracking grabbed windows so that grid doesn't fire. Tests added.

[jenkins (martin-mrazik+qa)]

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

The following tests FAILED:
 509 - GridGrabHandlerTest.TestMoveHandler (Failed)
 510 - GridGrabHandlerTest.TestResizeHandler (Failed)
Errors while running CTest

...

test 509
        Start 509: GridGrabHandlerTest.TestMoveHandler

509: Test command: /home/dan/bzr/compiz/tmp.142/build/plugins/grid/src/grabhandler/tests/compiz_test_grid_grabhandler "--gtest_filter=GridGrabHandlerTest.TestMoveHandler"
509: Test timeout computed to be: 1500
509: Running main() from gtest_main.cc
509: Note: Google Test filter = GridGrabHandlerTest.TestMoveHandler
509: [==========] Running 1 test from 1 test case.
509: [----------] Global test environment set-up.
509: [----------] 1 test from GridGrabHandlerTest
509: [ RUN ] GridGrabHandlerTest.TestMoveHandler
509: unknown file: Failure
509: C++ exception with description "call to empty boost::function" thrown in the test body.
509: [ FAILED ] GridGrabHandlerTest.TestMoveHandler (0 ms)
509: [----------] 1 test from GridGrabHandlerTest (1 ms total)
509:
509: [----------] Global test environment tear-down
509: [==========] 1 test from 1 test case ran. (1 ms total)
509: [ PASSED ] 0 tests.
509: [ FAILED ] 1 test, listed below:
509: [ FAILED ] GridGrabHandlerTest.TestMoveHandler
509:
509: 1 FAILED TEST
509/540 Test #509: GridGrabHandlerTest.TestMoveHandler .........................................................................................................................***Failed 0.00 sec
test 510
        Start 510: GridGrabHandlerTest.TestResizeHandler

510: Test command: /home/dan/bzr/compiz/tmp.142/build/plugins/grid/src/grabhandler/tests/compiz_test_grid_grabhandler "--gtest_filter=GridGrabHandlerTest.TestResizeHandler"
510: Test timeout computed to be: 1500
510: Running main() from gtest_main.cc
510: Note: Google Test filter = GridGrabHandlerTest.TestResizeHandler
510: [==========] Running 1 test from 1 test case.
510: [----------] Global test environment set-up.
510: [----------] 1 test from GridGrabHandlerTest
510: [ RUN ] GridGrabHandlerTest.TestResizeHandler
510: unknown file: Failure
510: C++ exception with description "call to empty boost::function" thrown in the test body.
510: [ FAILED ] GridGrabHandlerTest.TestResizeHandler (0 ms)
510: [----------] 1 test from GridGrabHandlerTest (0 ms total)
510:
510: [----------] Global test environment tear-down
510: [==========] 1 test from 1 test case ran. (0 ms total)
510: [ PASSED ] 0 tests.
510: [ FAILED ] 1 test, listed below:
510: [ FAILED ] GridGrabHandlerTest.TestResizeHandler
510:
510: 1 FAILED TEST

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Why on earth did CI not catch that ....

[Sam Spilsbury (smspillaz)]

Okay, it was a memory error. Not something that CI is set up to catch at the moment.

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Aaaaannnnnndddd CI is once again broken

[jenkins (martin-mrazik+qa)]

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

It works.

I just had an idea for a simpler and more general fix though...
(in grid) If the last repaint used PAINT_SCREEN_TRANSFORMED_MASK then disable grid behaviour.

review: Approve

=== modified file 'plugins/grid/src/grabhandler/include/grabhandler.h'
--- plugins/grid/src/grabhandler/include/grabhandler.h	2012-05-26 23:31:12 +0000
+++ plugins/grid/src/grabhandler/include/grabhandler.h	2012-09-26 00:23:25 +0000
@@ -1,3 +1,33 @@
+/*
+ * Compiz Fusion Grid plugin, GrabHandler class
+ *
+ * Copyright (c) 2011 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Description:
+ *
+ * Plugin to act like winsplit revolution (http://www.winsplit-revolution.com/)
+ * use <Control><Alt>NUMPAD_KEY to move and tile your windows.
+ *
+ * Press the tiling keys several times to cycle through some tiling options.
+ *
+ * Authored By:
+ * Sam Spilsbury <[e-mail]>
+ */
+#ifndef _COMPIZ_GRID_GRABHANDLER_H
+#define _COMPIZ_GRID_GRABHANDLER_H
+
+#include <boost/function.hpp>
+
 #define CompWindowGrabKeyMask         (1 << 0)
 #define CompWindowGrabButtonMask      (1 << 1)
 #define CompWindowGrabMoveMask        (1 << 2)
@@ -11,11 +41,14 @@
 namespace window
 {
 
+typedef boost::function <bool (const char *)> GrabActiveFunc;
+
 class GrabWindowHandler
 {
     public:
 
-	GrabWindowHandler (unsigned int mask);
+	GrabWindowHandler (unsigned int         mask,
+			   const GrabActiveFunc &grabActive);
 	~GrabWindowHandler ();
 
     	bool track ();
@@ -23,9 +56,12 @@
 
     private:
 
-	unsigned int mMask;
+	unsigned int         mMask;
+	GrabActiveFunc       mGrabActive;
 
 };
 }
 }
 }
+
+#endif

=== modified file 'plugins/grid/src/grabhandler/src/grabhandler.cpp'
--- plugins/grid/src/grabhandler/src/grabhandler.cpp	2012-05-26 23:31:12 +0000
+++ plugins/grid/src/grabhandler/src/grabhandler.cpp	2012-09-26 00:23:25 +0000
@@ -24,8 +24,10 @@
 
 #include "grabhandler.h"
 
-compiz::grid::window::GrabWindowHandler::GrabWindowHandler (unsigned int mask) :
-    mMask (mask)
+compiz::grid::window::GrabWindowHandler::GrabWindowHandler (unsigned int         mask,
+							    const GrabActiveFunc &grabActive) :
+    mMask (mask),
+    mGrabActive (grabActive)
 {
 }
 
@@ -36,6 +38,9 @@
 bool
 compiz::grid::window::GrabWindowHandler::track ()
 {
+    if (mGrabActive ("expo"))
+	return false;
+
     return ((mMask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask)) &&
 	    !(mMask & CompWindowGrabResizeMask));
 }

=== modified file 'plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp'
--- plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp	2012-05-26 23:31:12 +0000
+++ plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp	2012-09-26 00:23:25 +0000
@@ -1,4 +1,32 @@
+/*
+ * Compiz Fusion Grid plugin, GrabHandler class
+ *
+ * Copyright (c) 2011 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Description:
+ *
+ * Plugin to act like winsplit revolution (http://www.winsplit-revolution.com/)
+ * use <Control><Alt>NUMPAD_KEY to move and tile your windows.
+ *
+ * Press the tiling keys several times to cycle through some tiling options.
+ *
+ * Authored By:
+ * Sam Spilsbury <[e-mail]>
+ */
+
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <boost/bind.hpp>
 
 #include <grabhandler.h>
 
@@ -12,15 +40,26 @@
 #define CompWindowGrabResizeMask      (1 << 3)
 #define CompWindowGrabExternalAppMask (1 << 4)
 
-class GridGrabHandlerTest :
-    public ::testing::Test
+using testing::Eq;
+using testing::Return;
+
+namespace
 {
-};
+    bool returnFalse () { return false; }
+
+    class MockGrabExist
+    {
+	public:
+
+	    MOCK_METHOD1 (grabExist, bool (const char *));
+    };
+}
 
 TEST(GridGrabHandlerTest, TestMoveHandler)
 {
     compiz::grid::window::GrabWindowHandler moveHandler (CompWindowGrabMoveMask |
-							 CompWindowGrabButtonMask);
+							 CompWindowGrabButtonMask,
+							 boost::bind (returnFalse));
 
     EXPECT_TRUE (moveHandler.track ());
     EXPECT_FALSE (moveHandler.resetResize ());
@@ -29,8 +68,22 @@
 TEST(GridGrabHandlerTest, TestResizeHandler)
 {
     compiz::grid::window::GrabWindowHandler resizeHandler (CompWindowGrabButtonMask |
-						    	   CompWindowGrabResizeMask);
+						    	   CompWindowGrabResizeMask,
+							   boost::bind (returnFalse));
 
     EXPECT_FALSE (resizeHandler.track ());
     EXPECT_TRUE (resizeHandler.resetResize ());
 }
+
+TEST(GridGrabHandlerTest, TestNoTrackOnExpoGrab)
+{
+    MockGrabExist                           mge;
+    compiz::grid::window::GrabActiveFunc    grabExist (boost::bind (&MockGrabExist::grabExist,
+								    &mge, _1));
+    compiz::grid::window::GrabWindowHandler moveHandler (CompWindowGrabMoveMask |
+							 CompWindowGrabButtonMask,
+							 grabExist);
+
+    EXPECT_CALL (mge, grabExist (Eq ("expo"))).WillOnce (Return (true));
+    EXPECT_FALSE (moveHandler.track ());
+}

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-08-06 01:36:00 +0000
+++ plugins/grid/src/grid.cpp	2012-09-26 00:23:25 +0000
@@ -22,10 +22,12 @@
  * Press the tiling keys several times to cycle through some tiling options.
  */
 
+#include <boost/bind.hpp>
 #include "grid.h"
 #include "grabhandler.h"
 
 using namespace GridWindowType;
+namespace cgw = compiz::grid::window;
 
 static std::map <unsigned int, GridProps> gridProps;
 
@@ -834,7 +836,9 @@
 			unsigned int state,
 			unsigned int mask)
 {
-    compiz::grid::window::GrabWindowHandler gwHandler (mask);
+    static cgw::GrabActiveFunc grabActive (boost::bind (&CompScreen::grabExist,
+							screen, _1));
+    cgw::GrabWindowHandler gwHandler (mask, grabActive);
 
     if (gwHandler.track ())
     {