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

[Marco Trevisan (Treviño)]

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

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

3933. 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:3933
http://jenkins.qa.ubuntu.com/job/compiz-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/28/console

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

review: Needs Fixing (continuous-integration)

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

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

Move: set default type to WmMoveResizeInvalid

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

Move: push full grab in case that we arrived here because of different kind of activation

Such as ModifierKey+MouseButton. Also remove the unused type.

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

Merging with parent branch (lp:~3v1n0/compiz/push-grab-types)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[MC Return (mc-return)]

I am already used to typing into my windows while moving them - it is quasi an "essential feature" from now on - although it takes quite some keyboard-mouse magic to do the trick ;)

review: Approve

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2013-06-28 01:10:57 +0000
+++ plugins/move/src/move.cpp	2015-10-09 15:12:43 +0000
@@ -104,7 +104,12 @@
 	ms->snapOffY  = y - workArea.y ();
 
 	if (!ms->grab)
-	    ms->grab = s->pushGrab (ms->moveCursor, "move");
+	{
+	    if (state & CompAction::StateInitButton)
+		ms->grab = s->pushPointerGrab (ms->moveCursor, "move");
+	    else
+		ms->grab = s->pushGrab (ms->moveCursor, "move");
+	}
 
 	if (ms->grab)
 	{
@@ -572,10 +577,10 @@
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::wmMoveResize)
 	    {
-		unsigned   long type = (unsigned long) event->xclient.data.l[2];
-
 		MOVE_SCREEN (screen);
 
+		unsigned long type = event->xclient.data.l[2];
+
 		if (type == WmMoveResizeMove ||
 		    type == WmMoveResizeMoveKeyboard)
 		{