[Pkg-xfce-commits] r7153 - in desktop/branches/experimental/xfwm4/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-09-02 19:10:39 +0000 (Sun, 02 Sep 2012)
New Revision: 7153

Added:
   desktop/branches/experimental/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch
Modified:
   desktop/branches/experimental/xfwm4/debian/changelog
   desktop/branches/experimental/xfwm4/debian/patches/series
Log:
* debian/patches:
  - 0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949 added, fix
    window grab/move triggered on mouse click with gtk3.      closes: #684911

Modified: desktop/branches/experimental/xfwm4/debian/changelog
===================================================================
--- desktop/branches/experimental/xfwm4/debian/changelog	2012-09-02 15:09:02 UTC (rev 7152)
+++ desktop/branches/experimental/xfwm4/debian/changelog	2012-09-02 19:10:39 UTC (rev 7153)
@@ -1,3 +1,11 @@
+xfwm4 (4.10.0-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949 added, fix
+      window grab/move triggered on mouse click with gtk3.      closes: #684911
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Sep 2012 20:48:42 +0200
+
 xfwm4 (4.10.0-2) experimental; urgency=low
 
   * debian/patches:

Added: desktop/branches/experimental/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch
===================================================================
--- desktop/branches/experimental/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch	                        (rev 0)
+++ desktop/branches/experimental/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch	2012-09-02 19:10:39 UTC (rev 7153)
@@ -0,0 +1,90 @@
+From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Wed, 18 Jul 2012 22:12:07 +0200
+Subject: [PATCH] Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
+
+as gtk+-3.4 now uses it.
+---
+ src/display.h    |    3 ++-
+ src/moveresize.c |   15 +++++++++++++--
+ src/netwm.c      |    7 ++++++-
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/src/display.h b/src/display.h
+index 1ad2ef8..8797237 100644
+--- a/src/display.h
++++ b/src/display.h
+@@ -163,7 +163,8 @@ enum
+     NET_WM_MOVERESIZE_SIZE_LEFT,
+     NET_WM_MOVERESIZE_MOVE,
+     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
+-    NET_WM_MOVERESIZE_MOVE_KEYBOARD
++    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
++    NET_WM_MOVERESIZE_CANCEL
+ };
+ 
+ enum
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 9893c30..a98bdf7 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+     eventFilterStatus status = EVENT_FILTER_STOP;
+     MoveResizeData *passdata = (MoveResizeData *) data;
+     Client *c = NULL;
+-    gboolean moving = TRUE;
++    gboolean moving;
+     XWindowChanges wc;
+     int prev_x, prev_y;
+ 
+@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
+     display_info = screen_info->display_info;
+     configure_flags = NO_CFG_FLAG;
+ 
++    /*
++     * Clients may choose to end the move operation,
++     * we use XFWM_FLAG_MOVING_RESIZING for that.
++     */
++    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++
+     /* Update the display time */
+     myDisplayUpdateCurrentTime (display_info, xevent);
+ 
+@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+     screen_info = c->screen_info;
+     display_info = screen_info->display_info;
+     status = EVENT_FILTER_STOP;
+-    resizing = TRUE;
++
++    /*
++     * Clients may choose to end the resize operation,
++     * we use XFWM_FLAG_MOVING_RESIZING for that.
++     */
++    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+ 
+     frame_x = frameX (c);
+     frame_y = frameY (c);
+diff --git a/src/netwm.c b/src/netwm.c
+index 545e64a..1352f08 100644
+--- a/src/netwm.c
++++ b/src/netwm.c
+@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
+             resize = TRUE; /* Resize */
+             break;
+         case NET_WM_MOVERESIZE_MOVE:
+-        default:
+             event->type = ButtonPress;
+             resize = FALSE; /* Move */
+             break;
++        case NET_WM_MOVERESIZE_CANCEL:
++            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
++            /* Walk through */
++        default: /* Do nothing */
++            return;
++            break;
+     }
+ 
+     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+-- 
+1.7.10.4
+

Modified: desktop/branches/experimental/xfwm4/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfwm4/debian/patches/series	2012-09-02 15:09:02 UTC (rev 7152)
+++ desktop/branches/experimental/xfwm4/debian/patches/series	2012-09-02 19:10:39 UTC (rev 7153)
@@ -1 +1,2 @@
 0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
+0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch