[Pkg-xfce-commits] r7436 - in desktop/trunk/xfwm4/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 09:34:30 UTC 2013
Author: corsac
Date: 2013-05-21 21:34:30 +0000 (Tue, 21 May 2013)
New Revision: 7436
Removed:
desktop/trunk/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
desktop/trunk/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch
desktop/trunk/xfwm4/debian/patches/0003-Some-small-optimizations-in-placement-code.patch
desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch
Modified:
desktop/trunk/xfwm4/debian/changelog
desktop/trunk/xfwm4/debian/patches/series
Log:
* debian/patches:
- 0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del,
0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949,
0003-Some-small-optimizations-in-placement-code,
01_implement-NET_WM_MOVERESIZE_CANCEL-message dropped, included upstream.
Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/changelog 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,6 +1,11 @@
xfwm4 (4.10.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches:
+ - 0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del,
+ 0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949,
+ 0003-Some-small-optimizations-in-placement-code,
+ 01_implement-NET_WM_MOVERESIZE_CANCEL-message dropped, included upstream.
-- Yves-Alexis Perez <corsac at debian.org> Tue, 21 May 2013 23:29:33 +0200
Deleted: desktop/trunk/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/patches/0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,42 +0,0 @@
-From c4d89dd11e2c33f6f5797fb82910b97d483fb599 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan at xfce.org>
-Date: Wed, 18 Jul 2012 22:30:36 +0200
-Subject: [PATCH] Revert part of git commit 8637c3a as this breaks deletetion
- of current workspace (bug 8827)
-
----
- src/workspaces.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/workspaces.c b/src/workspaces.c
-index fb19ab0..f57eec9 100644
---- a/src/workspaces.c
-+++ b/src/workspaces.c
-@@ -492,7 +492,8 @@ workspaceInsert (ScreenInfo * screen_info, guint position)
- void
- workspaceDelete (ScreenInfo * screen_info, guint position)
- {
-- guint count;
-+ Client *c;
-+ guint i, count;
-
- g_return_if_fail (screen_info != NULL);
-
-@@ -504,6 +505,14 @@ workspaceDelete (ScreenInfo * screen_info, guint position)
- return;
- }
-
-+ for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
-+ {
-+ if (c->win_workspace > position)
-+ {
-+ clientSetWorkspace (c, c->win_workspace - 1, TRUE);
-+ }
-+ }
-+
- workspaceSetCount(screen_info, count - 1);
- }
-
---
-1.7.10.4
-
Deleted: desktop/trunk/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/patches/0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,90 +0,0 @@
-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
-
Deleted: desktop/trunk/xfwm4/debian/patches/0003-Some-small-optimizations-in-placement-code.patch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/0003-Some-small-optimizations-in-placement-code.patch 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/patches/0003-Some-small-optimizations-in-placement-code.patch 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,72 +0,0 @@
-From e207a6bb16b5396544fa57e0b5cb5e621e8eaefb Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Fri, 30 Nov 2012 22:50:59 +0100
-Subject: [PATCH] Some small optimizations in placement code.
-
-Callgrind showed that the frameX/Y functions were called
-a lot, so save the result inside the loop to do less calls.
-
-Also inline the overlap functions, both are just simple calculations
-so help the compiler a bit.
----
- src/placement.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/placement.c b/src/placement.c
-index f926de3..01f2590 100644
---- a/src/placement.c
-+++ b/src/placement.c
-@@ -38,9 +38,10 @@
- #include "frame.h"
- #include "netwm.h"
-
-+
- /* Compute rectangle overlap area */
-
--static unsigned long
-+static inline unsigned long
- segment_overlap (int x0, int x1, int tx0, int tx1)
- {
- if (tx0 > x0)
-@@ -58,7 +59,7 @@ segment_overlap (int x0, int x1, int tx0, int tx1)
- return (x1 - x0);
- }
-
--static unsigned long
-+static inline unsigned long
- overlap (int x0, int y0, int x1, int y1, int tx0, int ty0, int tx1, int ty1)
- {
- /* Compute overlapping box */
-@@ -541,6 +542,7 @@ smartPlacement (Client * c, int full_x, int full_y, int full_w, int full_h)
- gint test_x, test_y, xmax, ymax, best_x, best_y;
- gint frame_height, frame_width, frame_left, frame_top;
- gboolean first;
-+ gint c2_x, c2_y;
-
- g_return_if_fail (c != NULL);
- TRACE ("entering smartPlacement");
-@@ -574,14 +576,17 @@ smartPlacement (Client * c, int full_x, int full_y, int full_w, int full_h)
- && (c->win_workspace == c2->win_workspace)
- && FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE))
- {
-+ c2_x = frameX (c2);
-+ c2_y = frameY (c2);
-+
- count_overlaps += overlap (test_x - frame_left,
- test_y - frame_top,
- test_x - frame_left + frame_width,
- test_y - frame_top + frame_height,
-- frameX (c2),
-- frameY (c2),
-- frameX (c2) + frameWidth (c2),
-- frameY (c2) + frameHeight (c2));
-+ c2_x,
-+ c2_y,
-+ c2_x + frameWidth (c2),
-+ c2_y + frameHeight (c2));
- }
- }
- if (count_overlaps < 0.1)
---
-1.7.10.4
-
Deleted: 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 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/patches/01_implement-NET_WM_MOVERESIZE_CANCEL-message.patch 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,79 +0,0 @@
-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
Modified: desktop/trunk/xfwm4/debian/patches/series
===================================================================
--- desktop/trunk/xfwm4/debian/patches/series 2013-05-21 21:29:40 UTC (rev 7435)
+++ desktop/trunk/xfwm4/debian/patches/series 2013-05-21 21:34:30 UTC (rev 7436)
@@ -1,4 +1 @@
-0001-Revert-part-of-git-commit-8637c3a-as-this-breaks-del.patch
-0002-Implement-NET_WM_MOVERESIZE_CANCEL-message-bug-8949.patch
-0003-Some-small-optimizations-in-placement-code.patch
0004-Optimize-smart-placement-bug-5785.patch
More information about the Pkg-xfce-commits
mailing list