Merge lp:~3v1n0/compiz/resize-selective-grab into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

Resize: remember the type of movement and use the proper grabbing for it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3933
http://jenkins.qa.ubuntu.com/job/compiz-ci/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/23/console

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/compiz/resize-selective-grab]

3934. By Marco Trevisan (Treviño) on 2015-09-18

Merge with parent lp:~3v1n0/compiz/push-grab-types

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3934
http://jenkins.qa.ubuntu.com/job/compiz-ci/82/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/27/console

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/compiz/resize-selective-grab]

3935. By Marco Trevisan (Treviño) on 2015-10-09

Merging with parent branch (lp:~3v1n0/compiz/move-selective-grab)

3936. By Marco Trevisan (Treviño) on 2015-10-09

Resize: only grab pointer in the case we had a mouse initialization

Otherwise we still need mouse grabbing. Remove type variable, we can be smarter.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3935
http://jenkins.qa.ubuntu.com/job/compiz-ci/95/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/40
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/40

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3936
http://jenkins.qa.ubuntu.com/job/compiz-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/42

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[MC Return (mc-return)]

Also nice. :)

review: Approve

=== modified file 'plugins/resize/src/logic/include/screen-interface.h'
--- plugins/resize/src/logic/include/screen-interface.h	2013-01-08 09:17:25 +0000
+++ plugins/resize/src/logic/include/screen-interface.h	2015-10-09 15:46:30 +0000
@@ -56,6 +56,8 @@
 	virtual bool otherGrabExist (const char *, void *) = 0;
 	virtual void updateGrab (CompScreen::GrabHandle handle, Cursor cursor) = 0;
 	virtual CompScreen::GrabHandle pushGrab (Cursor cursor, const char *name) = 0;
+	virtual CompScreen::GrabHandle pushPointerGrab (Cursor cursor, const char *name) = 0;
+	virtual CompScreen::GrabHandle pushKeyboardGrab (const char *name) = 0;
 	virtual void removeGrab (CompScreen::GrabHandle handle, CompPoint *restorePointer) = 0;
 
 	/* CompOption::Class */

=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2015-03-19 15:14:55 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2015-10-09 15:46:30 +0000
@@ -139,7 +139,7 @@
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::wmMoveResize)
 	    {
-		unsigned long	    type = event->xclient.data.l[2];
+		unsigned long type = event->xclient.data.l[2];
 
 		if (type <= WmMoveResizeSizeLeft ||
 		    type == WmMoveResizeSizeKeyboard)
@@ -161,7 +161,7 @@
 				     CompOption::TypeBool));
 			o[1].value ().set (true);
 
-			if (event->xclient.data.l[2] == WmMoveResizeSizeKeyboard)
+			if (type == WmMoveResizeSizeKeyboard)
 			{
 			    initiateResizeDefaultMode (&options->optionGetInitiateKey (),
 						       CompAction::StateInitKey,
@@ -1331,7 +1331,14 @@
 	    else
 		cursor = cursorFromResizeMask (mask);
 
-	    grabIndex = mScreen->pushGrab (cursor, "resize");
+	    if (state & CompAction::StateInitButton)
+	    {
+		grabIndex = mScreen->pushPointerGrab (cursor, "resize");
+	    }
+	    else
+	    {
+		grabIndex = mScreen->pushGrab (cursor, "resize");
+	    }
 	}
 
 	if (grabIndex)

=== modified file 'plugins/resize/src/logic/tests/mock-screen.h'
--- plugins/resize/src/logic/tests/mock-screen.h	2012-08-16 14:04:59 +0000
+++ plugins/resize/src/logic/tests/mock-screen.h	2015-10-09 15:46:30 +0000
@@ -51,6 +51,8 @@
 	MOCK_METHOD2(otherGrabExist, bool(const char *, void *));
 	MOCK_METHOD2(updateGrab, void(CompScreen::GrabHandle handle, Cursor cursor));
 	MOCK_METHOD2(pushGrab, CompScreen::GrabHandle(Cursor cursor, const char *name));
+	MOCK_METHOD2(pushPointerGrab, CompScreen::GrabHandle(Cursor cursor, const char *name));
+	MOCK_METHOD1(pushKeyboardGrab, CompScreen::GrabHandle(const char *name));
 	MOCK_METHOD2(removeGrab, void(CompScreen::GrabHandle handle, CompPoint *restorePointer));
 
 	MOCK_METHOD1(getOption, CompOption*(const CompString &name));

=== modified file 'plugins/resize/src/screen-impl.h'
--- plugins/resize/src/screen-impl.h	2013-01-08 09:17:25 +0000
+++ plugins/resize/src/screen-impl.h	2015-10-09 15:46:30 +0000
@@ -102,6 +102,16 @@
 	    return mImpl->pushGrab (cursor, name);
 	}
 
+	virtual CompScreen::GrabHandle pushPointerGrab (Cursor cursor, const char *name)
+	{
+		return mImpl->pushPointerGrab (cursor, name);
+	}
+
+	virtual CompScreen::GrabHandle pushKeyboardGrab (const char *name)
+	{
+		return mImpl->pushKeyboardGrab (name);
+	}
+
 	virtual void removeGrab (CompScreen::GrabHandle handle, CompPoint *restorePointer)
 	{
 	    mImpl->removeGrab (handle, restorePointer);