Attachment 647821 Details for Bug 829906 – modified patch against xfwm-4.8.3

[patch] modified patch against xfwm-4.8.3

xfwm4-fixresizebug-099614e-cleaned.patch (text/plain), 2.37 KB, created by Eric Harney on 2012-11-19 15:07:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Harney

Created: 2012-11-19 15:07:20 UTC

Size: 2.37 KB

patch

obsolete

>diff --git a/src/display.h b/src/display.h
>index 6bf7094..1ba212c 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 7a0ec2a..3cff3be 100644
>--- a/src/moveresize.c
>+++ b/src/moveresize.c
>@@ -617,7 +617,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
>     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, 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);
> 
>@@ -1186,7 +1192,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 f673dd0..2ada54c 100644
>--- a/src/netwm.c
>+++ b/src/netwm.c
>@@ -708,10 +708,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))

Actions: View | Diff

Attachments on bug 829906: 647821