[Pkg-xfce-commits] r7136 - in desktop/trunk/xfwm4/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-08-15 16:12:51 +0000 (Wed, 15 Aug 2012)
New Revision: 7136

Added:
   desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch
   desktop/trunk/xfwm4/debian/patches/series
Modified:
   desktop/trunk/xfwm4/debian/changelog
Log:
* debian/patches:
  - 01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch: added,
    fix window grab/move triggered on mouse click with gtk3.  Closes: #684911

Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2012-08-15 11:52:18 UTC (rev 7135)
+++ desktop/trunk/xfwm4/debian/changelog	2012-08-15 16:12:51 UTC (rev 7136)
@@ -1,3 +1,11 @@
+xfwm4 (4.8.3-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch: added,
+      fix window grab/move triggered on mouse click with gtk3.  Closes: #684911
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 15 Aug 2012 18:04:05 +0200
+
 xfwm4 (4.8.3-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Added: desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch	                        (rev 0)
+++ desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch	2012-08-15 16:12:51 UTC (rev 7136)
@@ -0,0 +1,79 @@
+Description: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
+ as gtk+-3.4 now uses it.
+
+ Backported to apply cleanly against xfwm 4.8.x.
+
+Origin: upstream, http://git.xfce.org/xfce/xfwm4/commit/?h=xfce-4.10&id=0b39bbe0b3b5bf514dea223ec96cd25ea4e1444f
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8949
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684911
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1001936
+
+--- xfwm4-4.8.3.orig/src/moveresize.c
++++ xfwm4-4.8.3/src/moveresize.c
+@@ -617,7 +617,7 @@ clientMoveEventFilter (XEvent * xevent,
+     eventFilterStatus status = EVENT_FILTER_STOP;
+     MoveResizeData *passdata = (MoveResizeData *) data;
+     Client *c = NULL;
+-    gboolean moving = TRUE;
++    gboolean moving;
+     gboolean warp_pointer = FALSE;
+     XWindowChanges wc;
+     int prev_x, prev_y, delta;
+@@ -631,6 +631,12 @@ clientMoveEventFilter (XEvent * xevent,
+     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);
+ 
+@@ -1184,7 +1190,12 @@ clientResizeEventFilter (XEvent * xevent
+     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);
+--- xfwm4-4.8.3.orig/src/netwm.c
++++ xfwm4-4.8.3/src/netwm.c
+@@ -671,10 +671,15 @@ clientNetMoveResize (Client * c, XClient
+             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))
+--- xfwm4-4.8.3.orig/src/display.h
++++ xfwm4-4.8.3/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

Added: desktop/trunk/xfwm4/debian/patches/series
===================================================================
--- desktop/trunk/xfwm4/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfwm4/debian/patches/series	2012-08-15 16:12:51 UTC (rev 7136)
@@ -0,0 +1 @@
+01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch