Merge lp:~3v1n0/compiz-grid-plugin/oneiric.fix_891886 into lp:~compiz-team/compiz-grid-plugin/oneiric

[Marco Trevisan (Treviño)]

This branch fixes the issue causing the grid plugin to be fired on window resize introduced by the branch lp:~smspillaz/compiz-grid-plugin/oneiric.fix_750316 .

I've added an extra check to see if we're not resizing, however just using the check

   if (mask & CompWindowGrabMoveMask)

seems to do the trick as well, but I'm not totally sure that this won't interfere with the multitouch issue related to bug #750316, also if using the three-fingers move in my notebook seems to work fine.

So, if anyone can re-test both the fixes...

[Sam Spilsbury (smspillaz)]

Hi Marco,

Can you confirm that the testcase here would be that resizing a window to the corner *wont* show the grid overlay ?

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

Yes, I confirm. The same should happen when resizing a window grabbing the top edge near to the panel.

[lp:~3v1n0/compiz-grid-plugin/oneiric.fix_891886]

94. By Marco Trevisan (Treviño) on 2011-11-21

Merged Sam's branch, which includes a test

[Sam Spilsbury (smspillaz)]

Approved, works with tests, works with multitouch

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-09-29 11:18:56 +0000
+++ CMakeLists.txt	2011-11-22 00:00:28 +0000
@@ -5,3 +5,5 @@
 set (CMAKE_CXX_FLAGS -std=c++0x)
 
 compiz_plugin(grid PLUGINDEPS composite opengl)
+
+add_subdirectory (tests/grabhandler)

=== added file 'src/grabhandler.cpp'
--- src/grabhandler.cpp	1970-01-01 00:00:00 +0000
+++ src/grabhandler.cpp	2011-11-22 00:00:28 +0000
@@ -0,0 +1,47 @@
+/*
+ * Compiz Fusion Grid plugin
+ *
+ * Copyright (c) 2008 Stephen Kennedy <[e-mail]>
+ * Copyright (c) 2010 Scott Moreau <[e-mail]>
+ *
+ * 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.
+ */
+
+#include "grabhandler.h"
+
+compiz::grid::window::GrabWindowHandler::GrabWindowHandler (unsigned int mask) :
+    mMask (mask)
+{
+}
+
+compiz::grid::window::GrabWindowHandler::~GrabWindowHandler ()
+{
+}
+
+bool
+compiz::grid::window::GrabWindowHandler::track ()
+{
+    return ((mMask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask)) &&
+	    !(mMask & CompWindowGrabResizeMask));
+}
+
+bool
+compiz::grid::window::GrabWindowHandler::resetResize ()
+{
+    return (mMask & CompWindowGrabResizeMask);
+}

=== added file 'src/grabhandler.h'
--- src/grabhandler.h	1970-01-01 00:00:00 +0000
+++ src/grabhandler.h	2011-11-22 00:00:28 +0000
@@ -0,0 +1,31 @@
+#define CompWindowGrabKeyMask         (1 << 0)
+#define CompWindowGrabButtonMask      (1 << 1)
+#define CompWindowGrabMoveMask        (1 << 2)
+#define CompWindowGrabResizeMask      (1 << 3)
+#define CompWindowGrabExternalAppMask (1 << 4)
+
+namespace compiz
+{
+namespace grid
+{
+namespace window
+{
+
+class GrabWindowHandler
+{
+    public:
+
+	GrabWindowHandler (unsigned int mask);
+	~GrabWindowHandler ();
+
+    	bool track ();
+	bool resetResize ();
+
+    private:
+
+	unsigned int mMask;
+
+};
+}
+}
+}

=== modified file 'src/grid.cpp'
--- src/grid.cpp	2011-10-05 17:41:22 +0000
+++ src/grid.cpp	2011-11-22 00:00:28 +0000
@@ -23,6 +23,7 @@
  */
 
 #include "grid.h"
+#include "grabhandler.h"
 
 using namespace GridWindowType;
 
@@ -766,7 +767,9 @@
 			unsigned int state,
 			unsigned int mask)
 {
-    if (mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask))
+    compiz::grid::window::GrabWindowHandler gwHandler (mask);
+
+    if (gwHandler.track ())
     {
 	gScreen->o[0].value ().set ((int) window->id ());
 
@@ -780,8 +783,7 @@
 	    originalSize = gScreen->slotToRect(window,
 						    window->serverBorderRect ());
     }
-
-    if (mask & CompWindowGrabResizeMask)
+    else if (gwHandler.resetResize ())
     {
 	isGridResized = false;
 	resizeCount = 0;
@@ -1018,7 +1020,7 @@
     gridProps[GridRight]  = GridProps {1,0, 2,1};
     gridProps[GridTopLeft]  = GridProps{0,0, 2,2};
     gridProps[GridTop]  = GridProps {0,0, 1,2};
-    gridProps[GridTopRight]  = GridProps {0,0, 1,2};
+    gridProps[GridTopRight]  = GridProps {1,0, 2,2};
     gridProps[GridMaximize]  = GridProps {0,0, 1,1};
 
 	animations.clear ();

=== added directory 'tests'
=== added directory 'tests/grabhandler'
=== added file 'tests/grabhandler/CMakeLists.txt'
--- tests/grabhandler/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/grabhandler/CMakeLists.txt	2011-11-22 00:00:28 +0000
@@ -0,0 +1,9 @@
+include_directories (${compiz_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src)
+
+add_executable (test-grid-grab-handler
+		test-grid-grab-handler.cpp
+		../../src/grabhandler.cpp)
+
+target_link_libraries (test-grid-grab-handler pthread dl)
+
+add_test (test-grid-grab-handler-test test-grid-grab-handler)

=== added file 'tests/grabhandler/test-grid-grab-handler.cpp'
--- tests/grabhandler/test-grid-grab-handler.cpp	1970-01-01 00:00:00 +0000
+++ tests/grabhandler/test-grid-grab-handler.cpp	2011-11-22 00:00:28 +0000
@@ -0,0 +1,47 @@
+#include <stdlib.h>
+#include <iostream>
+#include <string>
+#include <grabhandler.h>
+
+/* FIXME: Not entirely portable, but we can't
+ * include window.h without pulling in bunch of
+ * static initalizers */
+
+#define CompWindowGrabKeyMask         (1 << 0)
+#define CompWindowGrabButtonMask      (1 << 1)
+#define CompWindowGrabMoveMask        (1 << 2)
+#define CompWindowGrabResizeMask      (1 << 3)
+#define CompWindowGrabExternalAppMask (1 << 4)
+
+void pass (const std::string &message)
+{
+    std::cout << "PASS: " << message << std::endl;
+}
+
+void fail (const std::string &message)
+{
+    std::cout << "FAIL: " << message << std::endl;
+    exit (1);
+}
+
+int main (void)
+{
+    compiz::grid::window::GrabWindowHandler moveHandler (CompWindowGrabMoveMask |
+							 CompWindowGrabButtonMask);
+    compiz::grid::window::GrabWindowHandler resizeHandler (CompWindowGrabButtonMask |
+						    	   CompWindowGrabResizeMask);
+
+    std::cout << "TEST: compiz::grid::window::GrabHandler" << std::endl;
+
+    if (moveHandler.track () && !moveHandler.resetResize ())
+	pass ("compiz::grid::window::GrabHandler CompWindowGrabMoveMask | CompWindowGrabButtonMask");
+    else
+	fail ("compiz::grid::window::GrabHandler CompWindowGrabMoveMask | CompWindowGrabButtonMask");
+
+    if (!resizeHandler.track () && resizeHandler.resetResize ())
+        pass ("compiz::grid::window::GrabHandler CompWindowGrabResizeMask | CompWindowGrabButtonMask");
+    else
+        fail ("compiz::grid::window::GrabHandler CompWindowGrabResizeMask | CompWindowGrabButtonMask");
+
+    return 0;
+}