From 6ff529992be58c05011a1fa9df2a31f8a16903c6 Mon Sep 17 00:00:00 2001
From: sandmann <sandmann@fedoraproject.org>
Date: Thu, 28 Sep 2006 19:48:12 +0000
Subject: [PATCH] Add patch to terminate moves when a mouse button is clicked

---
 compiz.spec          |  7 ++++++-
 terminate-move.patch | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 terminate-move.patch

diff --git a/compiz.spec b/compiz.spec
index e8cee44..f44f7ee 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -10,7 +10,7 @@ Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.29.%{snapshot}git%{?dist}
+Release:        0.30.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,7 @@ Patch112: positioning.patch
 Patch113: resize-offset.patch
 Patch114: restart.patch
 Patch115: icon-menu.patch
+Patch116: terminate-move.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -98,6 +99,7 @@ windows and compositing manager.
 %patch113 -p1 -b .resize-offset
 %patch114 -p1 -b .restart
 %patch115 -p1 -b .icon-menu
+%patch116 -p1 -b .terminate-move
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -177,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/compiz
 
 %changelog
+* Thu Sep 28 2006 Soren Sandmann <sandmann@redhat.com> - 0.0.13-0.30.20060817git.fc6
+- Add patch to terminate keyboard moves when a mouse buttons is pressed. (Bug 207792).
+
 * Thu Sep 28 2006 Soren Sandmann <sandmann@redhat.com>
 - Change default plugin list to not include the plane plugin. (Bug 208448).
 - Change default keybinding for shrink to be Pause (Bug 206187).
diff --git a/terminate-move.patch b/terminate-move.patch
new file mode 100644
index 0000000..047f688
--- /dev/null
+++ b/terminate-move.patch
@@ -0,0 +1,23 @@
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/move.c.move-terminate	2006-09-28 15:42:09.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/move.c	2006-09-28 15:42:29.000000000 -0400
+@@ -365,6 +365,20 @@
+     MOVE_DISPLAY (d);
+ 
+     switch (event->type) {
++    case ButtonPress:
++	s = findScreenAtDisplay (d, event->xbutton.root);
++	if (s)
++	{
++	    MOVE_SCREEN (s);
++
++	    if (ms->grabIndex)
++	    {
++		moveTerminate (d,
++			       &md->opt[MOVE_DISPLAY_OPTION_INITIATE].value.action,
++			       0, NULL, 0);
++	    }
++	}
++	break;
+     case KeyPress:
+     case KeyRelease:
+ 	s = findScreenAtDisplay (d, event->xkey.root);