Merge lp:~compiz-team/compiz/0.9.11.2 into lp:compiz/0.9.11

[Christopher Townsend]

Prepare for upstream micro-release 0.9.11.2 which includes fixes for the following bugs:
Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
Bug #727904: Launcher, Window management - Switching between spreads when dragging a file over the Launcher is broken
Bug #1308112: Scale should not select a window when clicking on an empty area

Prepare for upstream micro-release 0.9.11.2.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3865
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/11
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3865
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/12

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

OK, lets get this in to 14.04

review: Approve

[lp:~compiz-team/compiz/0.9.11.2]

3866. By Christopher Townsend on 2014-07-14

Previously merged in wrong value for breaks/replaces and this fixes it.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-01 11:51:27 +0000
+++ debian/changelog	2014-07-14 13:30:01 +0000
@@ -1,3 +1,17 @@
+compiz (1:0.9.11.1+14.04.20140701-0ubuntu2) trusty; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * Scale: use XShape extension to exclude dnd input in the screen-parts
+    outside workArea This will work property also in multi-monitor,
+    without requiring multiple X windows for each output device. Also
+    don't terminate the scale unless a drag-n-drop action is not really
+    over. Add a spinner that shows up over a window, during the DnD
+    timeout. Plus, make sure we terminate the scale without focusing the
+    selected icon when cancelling it and some code cleanup (LP: #607796)
+    (LP: #727904) (LP: #1308112)
+
+ -- Chris Townsend <[e-mail]>  Fri, 11 Jul 2014 12:26:28 -0400
+
 compiz (1:0.9.11.1+14.04.20140701-0ubuntu1) trusty; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'debian/compiz-core.install'
--- debian/compiz-core.install	2012-06-19 11:22:48 +0000
+++ debian/compiz-core.install	2014-07-14 13:30:01 +0000
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin/compiz*
 debian/tmp/usr/lib/libcompiz_core.so.*
-debian/tmp/usr/share/compiz/cube/images/*.png
 debian/tmp/usr/share/compiz/*.png
 debian/tmp/usr/share/compiz/core.xml
 debian/source_compiz.py usr/share/apport/package-hooks

=== modified file 'debian/compiz-plugins-default.install'
--- debian/compiz-plugins-default.install	2013-08-19 15:39:46 +0000
+++ debian/compiz-plugins-default.install	2014-07-14 13:30:01 +0000
@@ -17,6 +17,7 @@
 debian/tmp/usr/*/compiz/*regex.*
 debian/tmp/usr/*/compiz/*resize.*
 debian/tmp/usr/*/compiz/*scale.*
+debian/tmp/usr/share/compiz/scale
 debian/tmp/usr/*/compiz/*session.*
 debian/tmp/usr/*/compiz/*snap.*
 debian/tmp/usr/*/compiz/*vpswitch.*

=== modified file 'debian/compiz-plugins.install'
--- debian/compiz-plugins.install	2013-08-19 15:39:46 +0000
+++ debian/compiz-plugins.install	2014-07-14 13:30:01 +0000
@@ -4,6 +4,7 @@
 debian/tmp/usr/*/compiz/*clone.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
+debian/tmp/usr/share/compiz/cube
 debian/tmp/usr/*/compiz/*cubeaddon.*
 debian/tmp/usr/share/compiz/cubeaddon
 debian/tmp/usr/*/compiz/*dbus.*

=== modified file 'debian/compiz-plugins.install.armel'
--- debian/compiz-plugins.install.armel	2013-07-28 10:35:40 +0000
+++ debian/compiz-plugins.install.armel	2014-07-14 13:30:01 +0000
@@ -5,6 +5,7 @@
 debian/tmp/usr/*/compiz/*copytex.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
+debian/tmp/usr/share/compiz/cube
 debian/tmp/usr/*/compiz/*cubeaddon.*
 debian/tmp/usr/share/compiz/cubeaddon
 debian/tmp/usr/*/compiz/*dbus.*

=== modified file 'debian/compiz-plugins.install.armhf'
--- debian/compiz-plugins.install.armhf	2013-07-28 10:35:40 +0000
+++ debian/compiz-plugins.install.armhf	2014-07-14 13:30:01 +0000
@@ -5,6 +5,7 @@
 debian/tmp/usr/*/compiz/*copytex.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
+debian/tmp/usr/share/compiz/cube
 debian/tmp/usr/*/compiz/*cubeaddon.*
 debian/tmp/usr/share/compiz/cubeaddon
 debian/tmp/usr/*/compiz/*dbus.*

=== modified file 'debian/control'
--- debian/control	2014-02-16 21:23:37 +0000
+++ debian/control	2014-07-14 13:30:01 +0000
@@ -188,8 +188,10 @@
 Replaces: compiz-plugins-main (<< 1:0.9.8),
           compiz-plugins-extra (<< 1:0.9.8),
           compiz-plugins-main-default (<< 1:0.9.8),
+          compiz-core (<= 1:0.9.11.1+14.04.20140701-0ubuntu1),
 Breaks: compiz-plugins-main (<< 1:0.9.8),
         compiz-plugins-extra (<< 1:0.9.8),
+        compiz-core (<= 1:0.9.11.1+14.04.20140701-0ubuntu1),
 Description: OpenGL window and compositing manager - plugins
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users

=== added directory 'plugins/scale/images'
=== added file 'plugins/scale/images/dnd-spinner-000.png'
Binary files plugins/scale/images/dnd-spinner-000.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-000.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-125.png'
Binary files plugins/scale/images/dnd-spinner-125.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-125.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-250.png'
Binary files plugins/scale/images/dnd-spinner-250.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-250.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-375.png'
Binary files plugins/scale/images/dnd-spinner-375.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-375.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-500.png'
Binary files plugins/scale/images/dnd-spinner-500.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-500.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-625.png'
Binary files plugins/scale/images/dnd-spinner-625.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-625.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-750.png'
Binary files plugins/scale/images/dnd-spinner-750.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-750.png	2014-07-14 13:30:01 +0000 differ
=== added file 'plugins/scale/images/dnd-spinner-875.png'
Binary files plugins/scale/images/dnd-spinner-875.png	1970-01-01 00:00:00 +0000 and plugins/scale/images/dnd-spinner-875.png	2014-07-14 13:30:01 +0000 differ
=== modified file 'plugins/scale/include/scale/scale.h'
--- plugins/scale/include/scale/scale.h	2012-10-12 09:05:18 +0000
+++ plugins/scale/include/scale/scale.h	2014-07-14 13:30:01 +0000
@@ -100,7 +100,6 @@
 
 	const CompMatch & getCustomMatch () const;
 	const WindowList& getWindows () const;
-	
 
 	void relayoutSlots (const CompMatch& match);
 

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2014-02-17 20:36:26 +0000
+++ plugins/scale/scale.xml.in	2014-07-14 13:30:01 +0000
@@ -7,10 +7,12 @@
 	<deps>
 	    <requirement>
 		<plugin>opengl</plugin>
+		<plugin>imgpng</plugin>
 	    </requirement>
 	    <relation type="after">
 		<plugin>fade</plugin>
 		<plugin>decor</plugin>
+		<plugin>imgpng</plugin>
 	    </relation>
 	</deps>
 	<options>
@@ -104,6 +106,18 @@
 				<min>0</min>
 				<max>250</max>
 			</option>
+			<option name="dnd_timeout_spinner" type="bool">
+				<_short>Show a spinner during th Drag and Drop timeout</_short>
+				<_long>Whether to show a spinner over the windows during dnd Timeout.</_long>
+				<default>true</default>
+			</option>
+			<option name="dnd_timeout_spinner_speed" type="int">
+				<_short>The speed of the DnD timeout spinner</_short>
+				<_long>The animation speed (in ms) of the Drag and Drop spinner.</_long>
+				<default>100</default>
+				<min>50</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/privates.h'
--- plugins/scale/src/privates.h	2014-02-17 03:02:06 +0000
+++ plugins/scale/src/privates.h	2014-07-14 13:30:01 +0000
@@ -45,7 +45,6 @@
 {
     public:
 	PrivateScaleScreen (CompScreen *);
-	~PrivateScaleScreen ();
 
 	void handleEvent (XEvent *event);
 
@@ -57,6 +56,7 @@
 			    CompOutput *, unsigned int);
 
 	void activateEvent (bool activating);
+	void terminateScale (bool accept);
 
 	void layoutSlotsForArea (const CompRect&, int);
 	void layoutSlots ();
@@ -70,7 +70,8 @@
 
 	ScaleWindow * checkForWindowAt (int x, int y);
 
-	void sendDndStatusMessage (Window);
+	void sendDndStatusMessage (Window, bool asks);
+	void sendDndFinishedMessage (Window);
 
 	bool
 	actionShouldToggle (CompAction        *action,
@@ -98,6 +99,7 @@
 	void windowRemove (CompWindow *);
 
 	bool hoverTimeout ();
+	bool dndCheckTimeout ();
 
 	void updateOpacity ();
 
@@ -121,14 +123,18 @@
 	CompScreen::GrabHandle grabIndex;
 
 	Window dndTarget;
+	Atom xdndSelection;
+	Atom xdndFinished;
+	Atom xdndActionAsk;
+
+	std::vector<GLTexture::List> dndSpinners;
 
 	CompTimer hover;
+	CompTimer dndCheck;
 
 	ScaleScreen::State state;
 	int                moreAdjust;
 
-	Cursor cursor;
-
 	std::vector<ScaleSlot> slots;
 	int                  nSlots;
 

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2014-04-04 14:44:54 +0000
+++ plugins/scale/src/scale.cpp	2014-07-14 13:30:01 +0000
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 
 #include <X11/Xatom.h>
-#include <X11/cursorfont.h>
+#include <X11/extensions/shape.h>
 
 #include <core/atoms.h>
 #include <scale/scale.h>
@@ -244,6 +244,70 @@
 	    }
 	}
     }
+
+    if (spScreen->optionGetDndTimeoutSpinner () &&
+	priv->window->id() == spScreen->selectedWindow &&
+	priv->slot &&
+	spScreen->hover.active ())
+    {
+	GLTexture* spinner = NULL;
+
+	if (!spScreen->dndSpinners.empty ())
+	{
+	    int speed = spScreen->optionGetDndTimeoutSpinnerSpeed ();
+	    unsigned dndSpinnerIdx = (spScreen->hover.minTime() - spScreen->hover.minLeft()) / speed;
+	    const GLTexture::List& tex_list = spScreen->dndSpinners[dndSpinnerIdx % spScreen->dndSpinners.size()];
+	    spinner = tex_list.empty() ? NULL : tex_list.front();
+	}
+
+	if (spinner)
+	{
+	    float  scale;
+	    int    x, y;
+	    int    size;
+	    int    scaledWinWidth, scaledWinHeight;
+	    int    spinnerMaxSize = spinner->width();
+
+	    scaledWinWidth  = priv->window->width () * priv->scale;
+	    scaledWinHeight = priv->window->height () * priv->scale;
+
+	    size = MIN (spinnerMaxSize, MIN (scaledWinWidth, scaledWinHeight));
+	    x = priv->tx + priv->window->x () + (scaledWinWidth - size) / 2;
+	    y = priv->ty + priv->window->y () + (scaledWinHeight - size) / 2;
+	    scale = 1.0;
+
+	    if (size != spinnerMaxSize)
+	    {
+		size = spinnerMaxSize;
+		scale = MIN (scaledWinWidth, scaledWinHeight) / (float) spinnerMaxSize;
+	    }
+
+	    priv->cWindow->addDamageRect (CompRect (x, y, size / scale, size / scale));
+
+	    mask |= PAINT_WINDOW_BLEND_MASK;
+
+	    CompRegion            iconReg (0, 0, size, size);
+	    GLTexture::MatrixList ml (1);
+
+	    ml[0] = spinner->matrix ();
+	    priv->gWindow->vertexBuffer ()->begin ();
+
+	    if (size)
+		priv->gWindow->glAddGeometry (ml, iconReg, iconReg);
+
+	    if (priv->gWindow->vertexBuffer ()->end ())
+	    {
+		GLMatrix            wTransform (transform);
+		GLWindowPaintAttrib sAttrib (attrib);
+
+		wTransform.scale (scale, scale, 1.0f);
+		wTransform.translate (x / scale, y / scale, 0.0f);
+		sAttrib.brightness *= 0.65f;
+
+		priv->gWindow->glDrawTexture (spinner, wTransform, sAttrib, mask);
+	    }
+	}
+    }
 }
 
 bool
@@ -924,6 +988,7 @@
 		activateEvent (false);
 		state = ScaleScreen::Idle;
 
+		screen->handleEventSetEnabled (this, false);
 		cScreen->preparePaintSetEnabled (this, false);
 		cScreen->donePaintSetEnabled (this, false);
 		gScreen->glPaintOutputSetEnabled (this, false);
@@ -982,7 +1047,7 @@
 }
 
 void
-PrivateScaleScreen::sendDndStatusMessage (Window source)
+PrivateScaleScreen::sendDndStatusMessage (Window source, bool asks)
 {
     XEvent xev;
 
@@ -994,11 +1059,36 @@
     xev.xclient.window	     = source;
 
     xev.xclient.data.l[0] = dndTarget;
-    xev.xclient.data.l[1] = 2;
+    xev.xclient.data.l[1] = 0;
     xev.xclient.data.l[2] = 0;
     xev.xclient.data.l[3] = 0;
     xev.xclient.data.l[4] = None;
 
+    if (asks)
+    {
+	xev.xclient.data.l[1] = 1 << 0 | 1 << 1;
+	xev.xclient.data.l[4] = xdndActionAsk;
+    }
+
+    XSendEvent (screen->dpy (), source, false, 0, &xev);
+}
+
+void
+PrivateScaleScreen::sendDndFinishedMessage (Window source)
+{
+    XEvent xev;
+
+    xev.xclient.type    = ClientMessage;
+    xev.xclient.display = screen->dpy ();
+    xev.xclient.format  = 32;
+
+    xev.xclient.message_type = xdndFinished;
+    xev.xclient.window	     = source;
+
+    xev.xclient.data.l[0] = dndTarget;
+    xev.xclient.data.l[1] = 0; // Not accepted
+    xev.xclient.data.l[2] = None;
+
     XSendEvent (screen->dpy (), source, false, 0, &xev);
 }
 
@@ -1037,7 +1127,10 @@
     }
 
     if (ss->priv->dndTarget)
+    {
+	ss->priv->dndCheck.stop ();
 	XUnmapWindow (::screen->dpy (), ss->priv->dndTarget);
+    }
 
     ss->priv->grab = false;
 
@@ -1103,9 +1196,9 @@
     if (!dndTarget)
     {
 	XSetWindowAttributes attr;
-	long		     xdndVersion = 3;
+	long		     xdndVersion = 5;
 
-	attr.override_redirect = true;
+	attr.override_redirect = True;
 
 	dndTarget = XCreateWindow (screen->dpy (), screen->root (),
 				   0, 0, 1, 1, 0, CopyFromParent,
@@ -1118,9 +1211,20 @@
 			 (unsigned char *) &xdndVersion, 1);
     }
 
+    if (screen->XShape ())
+    {
+	CompRegion workAreaRegion;
+
+	foreach (const CompOutput& output, screen->outputDevs ())
+	    workAreaRegion |= output.workArea ();
+
+	XShapeCombineRegion (screen->dpy (), dndTarget, ShapeBounding, 0, 0, workAreaRegion.handle (), ShapeSet);
+    }
+
     XMoveResizeWindow (screen->dpy (), dndTarget,
 		       0, 0, screen->width (), screen->height ());
     XMapRaised (screen->dpy (), dndTarget);
+    XSync (screen->dpy (), False);
 
     return true;
 }
@@ -1212,7 +1316,7 @@
 	}
 	else if (!grabIndex)
 	{
-	    grabIndex = screen->pushGrab (cursor, "scale");
+	    grabIndex = screen->pushGrab (screen->normalCursor (), "scale");
 	    if (grabIndex)
 		grab = true;
 	}
@@ -1249,6 +1353,7 @@
 
 	cScreen->damageScreen ();
 
+	screen->handleEventSetEnabled (this, true);
 	cScreen->preparePaintSetEnabled (this, true);
 	cScreen->donePaintSetEnabled (this, true);
 	gScreen->glPaintOutputSetEnabled (this, true);
@@ -1531,35 +1636,34 @@
 	    }
 	    else
 	    {
-		CompOption::Vector o (0);
-		CompAction         *action;
-
 		/* terminate scale mode if the recently closed
 		 * window was the last scaled window */
-
-		o.push_back (CompOption ("root", CompOption::TypeInt));
-		o[0].value ().set ((int) screen->root ());
-
-		action = &optionGetInitiateEdge ();
-		scaleTerminate (action, CompAction::StateCancel, o);
-
-		action = &optionGetInitiateKey ();
-		scaleTerminate (action, CompAction::StateCancel, o);
+		terminateScale (false);
 		break;
 	    }
 	}
     }
 }
 
+void PrivateScaleScreen::terminateScale (bool accept)
+{
+    CompOption::Vector o (0);
+
+    o.push_back (CompOption ("root", CompOption::TypeInt));
+    o[0].value ().set ((int) screen->root ());
+
+    scaleTerminate (&optionGetInitiateEdge (), accept ? 0 : CompAction::StateCancel, o);
+    scaleTerminate (&optionGetInitiateKey (), accept ? 0 : CompAction::StateCancel, o);
+
+    activateEvent (false);
+}
+
 bool
 PrivateScaleScreen::hoverTimeout ()
 {
     if (grab && state != ScaleScreen::In)
     {
-	CompWindow         *w;
-	CompOption::Vector o (0);
-
-	w = screen->findWindow (selectedWindow);
+	CompWindow *w = screen->findWindow (selectedWindow);
 	if (w)
 	{
 	    lastActiveNum    = w->activeNum ();
@@ -1568,13 +1672,39 @@
 	    w->moveInputFocusTo ();
 	}
 
-	o.push_back (CompOption ("root", CompOption::TypeInt));
-	o[0].value ().set ((int) screen->root ());
-
-	scaleTerminate (&optionGetInitiateEdge (), 0, o);
-	scaleTerminate (&optionGetInitiateKey (), 0, o);
-    }
-
+	terminateScale (true);
+    }
+
+    return false;
+}
+
+bool
+PrivateScaleScreen::dndCheckTimeout ()
+{
+    if (!dndTarget)
+	return false;
+
+    CompWindow *w = screen->findWindow (dndTarget);
+
+    if (!w || !w->isMapped ())
+	return false;
+
+    Window drag_owner = XGetSelectionOwner (screen->dpy (), xdndSelection);
+
+    if (drag_owner)
+    {
+	// evil hack because some apps (Qt) don't release the selection owner on drag finished
+	Window root_r, child_r;
+	int root_x_r, root_y_r, win_x_r, win_y_r;
+	unsigned int mask;
+	XQueryPointer (screen->dpy (), screen->root (), &root_r, &child_r,
+		       &root_x_r, &root_y_r, &win_x_r, &win_y_r, &mask);
+
+	if (mask & (Button1Mask | Button2Mask | Button3Mask))
+	    return true;
+    }
+
+    terminateScale (false);
     return false;
 }
 
@@ -1606,46 +1736,29 @@
 		state != ScaleScreen::In)
 	    {
 		XButtonEvent       *button = &event->xbutton;
-		CompOption::Vector o (0);
-
-		o.push_back (CompOption ("root", CompOption::TypeInt));
-		o[0].value ().set ((int) screen->root ());
 
 		/* Button1 terminates scale mode, other buttons can select
 		 * windows */
-		if (selectWindowAt (button->x_root, button->y_root, true) &&
-		    event->xbutton.button == Button1)
-		{
-		    scaleTerminate (&optionGetInitiateEdge (), 0, o);
-		    scaleTerminate (&optionGetInitiateKey (), 0, o);
-		}
-		else if (optionGetClickOnDesktop () == 1 &&
-			 event->xbutton.button == Button1)
-		{
-		    CompPoint pointer (button->x_root, button->y_root);
-		    CompRect  workArea (screen->workArea ());
-		    workArea.setX (workArea.x() + optionGetXOffset ());
-		    workArea.setY (workArea.y() + optionGetYOffset ());
-
-		    if (workArea.contains (pointer))
-		    {
-			scaleTerminate (&optionGetInitiateEdge (), 0, o);
-			scaleTerminate (&optionGetInitiateKey (), 0, o);
-			screen->enterShowDesktopMode ();
-		    }
-		}
-		else if (optionGetClickOnDesktop () == 2 &&
-			 event->xbutton.button == Button1)
-		{
-		    CompPoint pointer (button->x_root, button->y_root);
-		    CompRect  workArea (screen->workArea ());
-		    workArea.setX (workArea.x() + optionGetXOffset ());
-		    workArea.setY (workArea.y() + optionGetYOffset ());
-
-		    if (workArea.contains (pointer))
-		    {
-			scaleTerminate (&optionGetInitiateEdge (), 0, o);
-			scaleTerminate (&optionGetInitiateKey (), 0, o);
+		if (event->xbutton.button != Button1)
+		    break;
+
+		if (selectWindowAt (button->x_root, button->y_root, true))
+		{
+		    terminateScale (true);
+		}
+		else if (optionGetClickOnDesktop () != ScaleOptions::ClickOnDesktopNone)
+		{
+		    CompPoint pointer (button->x_root, button->y_root);
+		    CompRect  workArea (screen->workArea ());
+		    workArea.setX (workArea.x() + optionGetXOffset ());
+		    workArea.setY (workArea.y() + optionGetYOffset ());
+
+		    if (workArea.contains (pointer))
+		    {
+			terminateScale (false);
+
+			if (optionGetClickOnDesktop () == ScaleOptions::ClickOnDesktopShowDesktop)
+			    screen->enterShowDesktopMode ();
 		    }
 		}
 	    }
@@ -1669,33 +1782,31 @@
 	    w = screen->findWindow (event->xdestroywindow.window);
 	    break;
 	case UnmapNotify:
-
 	     w = screen->findWindow (event->xunmap.window);
 	     break;
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::xdndPosition)
 	    {
-		w = screen->findWindow (event->xclient.window);
-		if (w)
+		if (event->xclient.window == dndTarget)
 		{
-		    if (w->id () == dndTarget)
-			sendDndStatusMessage (event->xclient.data.l[0]);
+		    bool acceptsDnd = false;
 
-		    if (grab			 &&
-			state != ScaleScreen::In &&
-			w->id () == dndTarget)
+		    if (grab && state != ScaleScreen::In)
 		    {
+			dndCheck.stop ();
+
 			ScaleWindow *sw = checkForWindowAt (pointerX, pointerY);
 			if (sw && sw->priv->isScaleWin ())
 			{
 			    int time;
 
 			    time = optionGetHoverTime ();
+			    acceptsDnd = true;
 
 			    if (hover.active ())
 			    {
 				int lastMotion = sqrt (pow (pointerX - lastPointerX, 2) + pow (pointerY - lastPointerY, 2));
-				
+
 				if (sw->window->id () != selectedWindow || lastMotion > optionGetDndDistance ())
 				    hover.stop ();
 			    }
@@ -1713,24 +1824,35 @@
 				hover.stop ();
 			}
 		    }
-		}
-	    }
-	    else if (event->xclient.message_type == Atoms::xdndDrop ||
-		     event->xclient.message_type == Atoms::xdndLeave)
-	    {
-		w = screen->findWindow (event->xclient.window);
-		if (w)
-		{
-		    if (grab			 &&
-			state != ScaleScreen::In &&
-			w->id () == dndTarget)
+
+		    sendDndStatusMessage (event->xclient.data.l[0], acceptsDnd);
+		}
+	    }
+	    else if (event->xclient.message_type == Atoms::xdndEnter)
+	    {
+		if (event->xclient.window == dndTarget &&
+		    grab && state != ScaleScreen::In)
+		{
+		    dndCheck.stop ();
+		}
+	    }
+	    else if (event->xclient.message_type == Atoms::xdndLeave)
+	    {
+		if (event->xclient.window == dndTarget &&
+		    grab && state != ScaleScreen::In)
+		{
+		    dndCheck.start ();
+		}
+	    }
+	    else if (event->xclient.message_type == Atoms::xdndDrop)
+	    {
+		if (event->xclient.window == dndTarget)
+		{
+		    sendDndFinishedMessage (event->xclient.data.l[0]);
+
+		    if (grab && state != ScaleScreen::In)
 		    {
-			CompOption::Vector o (0);
-			o.push_back (CompOption ("root", CompOption::TypeInt));
-			o[0].value ().set ((int) screen->root ());
-
-			scaleTerminate (&optionGetInitiateEdge (), 0, o);
-			scaleTerminate (&optionGetInitiateKey (), 0, o);
+			terminateScale (true);
 		    }
 		}
 	    }
@@ -1746,6 +1868,7 @@
 
     switch (event->type) {
 	case UnmapNotify:
+	    dndCheck.start ();
 	    if (w)
 		windowRemove (w);
 	    break;
@@ -1832,9 +1955,11 @@
     grab (false),
     grabIndex (0),
     dndTarget (None),
+    xdndSelection (XInternAtom (screen->dpy (), "XdndSelection", False)),
+    xdndFinished (XInternAtom (screen->dpy (), "XdndFinished", False)),
+    xdndActionAsk (XInternAtom (screen->dpy (), "XdndActionAsk", False)),
     state (ScaleScreen::Idle),
     moreAdjust (false),
-    cursor (0),
     nSlots (0)
 {
     leftKeyCode  = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Left"));
@@ -1842,11 +1967,11 @@
     upKeyCode    = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Up"));
     downKeyCode  = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Down"));
 
-    cursor = XCreateFontCursor (screen->dpy (), XC_left_ptr);
-
     opacity = (OPAQUE * optionGetOpacity ()) / 100;
 
     hover.setCallback (boost::bind (&PrivateScaleScreen::hoverTimeout, this));
+    dndCheck.setCallback (boost::bind (&PrivateScaleScreen::dndCheckTimeout, this));
+    dndCheck.setTimes (200);
 
     optionSetOpacityNotify (boost::bind (&PrivateScaleScreen::updateOpacity, this));
 
@@ -1883,15 +2008,35 @@
 
 #undef SCALEBIND
 
+    CompString pluginName("scale");
+    CompSize size;
+    CompString file;
+
+    file = "dnd-spinner-000.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-125.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-250.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-375.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-500.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-625.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-750.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+    file = "dnd-spinner-875.png";
+    dndSpinners.push_back(GLTexture::readImageToTexture(file, pluginName, size));
+
     ScreenInterface::setHandler (s);
     CompositeScreenInterface::setHandler (cScreen, false);
     GLScreenInterface::setHandler (gScreen, false);
-}
 
-PrivateScaleScreen::~PrivateScaleScreen ()
-{
-    if (cursor)
-	XFreeCursor (screen->dpy (), cursor);
+    screen->handleEventSetEnabled (this, false);
+    cScreen->preparePaintSetEnabled (this, false);
+    cScreen->donePaintSetEnabled (this, false);
+    gScreen->glPaintOutputSetEnabled (this, false);
 }
 
 void