Merge lp:~azzar1/compiz-core/fix-832631 into lp:compiz-core/0.9.5

[Andrea Azzarone]

Does not reset the spread dnd timeout every single motion.

Reset it:
* when a new spread window is selected
* when the mouse motion is quite evident (i use a rect of 8x8px, feel free to use a bigger/lower one)

[lp:~azzar1/compiz-core/fix-832631]

2800. By Andrea Azzarone on 2011-09-01

Adds an option to edit the dnd distance.
Uses pointerX and pointerY instead of x and y
Uses lastPointerX/Y instead of the rect.

[Andrea Azzarone (azzar1)]

Updated as discussed on IRC.

[Sam Spilsbury (smspillaz)]

Looks great. Thanks Andrea!

review: Approve

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2010-05-25 06:26:27 +0000
+++ plugins/scale/scale.xml.in	2011-09-01 18:04:36 +0000
@@ -84,6 +84,13 @@
 				<min>50</min>
 				<max>10000</max>
 			</option>
+			<option name="dnd_distance" type="int">
+				<_short>Drag and Drop Distance</_short>
+				<_long>The minimum distance (in px) beyond which the timeout is reset.</_long>
+				<default>6</default>
+				<min>0</min>
+				<max>250</max>
+			</option>
 			<option name="multioutput_mode" type="int">
 				<_short>Multi Output Mode</_short>
 				<_long>Selects where windows are scaled if multiple output devices are used.</_long>
 
=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2011-03-14 16:12:45 +0000
+++ plugins/scale/src/scale.cpp	2011-09-01 18:04:36 +0000
@@ -1524,10 +1524,7 @@
 			state != ScaleScreen::In &&
 			w->id () == dndTarget)
 		    {
-			int x = event->xclient.data.l[2] >> 16;
-			int y = event->xclient.data.l[2] & 0xffff;
-
-			ScaleWindow *sw = checkForWindowAt (x, y);
+			ScaleWindow *sw = checkForWindowAt (pointerX, pointerY);
 			if (sw && sw->priv->isScaleWin ())
 			{
 			    int time;
@@ -1536,14 +1533,18 @@
 
 			    if (hover.active ())
 			    {
-				if (w->id () != selectedWindow)
+				int lastMotion = sqrt (pow (pointerX - lastPointerX, 2) + pow (pointerY - lastPointerY, 2));
+				
+				if (sw->window->id () != selectedWindow || lastMotion > optionGetDndDistance ())
 				    hover.stop ();
 			    }
 
 			    if (!hover.active ())
+			    {
 				hover.start (time, (float) time * 1.2);
+			    }
 
-			    selectWindowAt (x, y, focus);
+			    selectWindowAt (pointerX, pointerY, focus);
 			}
 			else
 			{