[Xfce4-commits] [xfce/xfwm4] 02/04: No need to reconfigure on XSync alarm

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit bc992fccfc3eac800bb16d3242892d8c52f6d059
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Thu Jan 22 21:13:58 2015 +0100

    No need to reconfigure on XSync alarm
    
    This is not needed anymore, this was just a hack to work
    around the issue caused by the wrong size increments
    calculation.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/client.c     |    4 ++++
 src/client.h     |    3 +--
 src/moveresize.c |   27 ++-------------------------
 src/xsync.c      |    4 ----
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/client.c b/src/client.c
index 8b4641e..2342067 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1949,6 +1949,10 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     {
         clientGetXSyncCounter (c);
     }
+    if (c->xsync_counter)
+    {
+        clientCreateXSyncAlarm (c);
+    }
 #endif /* HAVE_XSYNC */
 
     /* Window is reparented now, so we can safely release the grab
diff --git a/src/client.h b/src/client.h
index 4f90258..19444a9 100644
--- a/src/client.h
+++ b/src/client.h
@@ -170,8 +170,7 @@
 #define CLIENT_FLAG_XSYNC_WAITING       (1L<<22)
 #define CLIENT_FLAG_XSYNC_ENABLED       (1L<<23)
 #define CLIENT_FLAG_XSYNC_EXT_COUNTER   (1L<<24)
-#define CLIENT_FLAG_XSYNC_CONFIGURE     (1L<<25)
-#define CLIENT_FLAG_RESTORE_SIZE_POS    (1L<<26)
+#define CLIENT_FLAG_RESTORE_SIZE_POS    (1L<<25)
 
 #define WM_FLAG_DELETE                  (1L<<0)
 #define WM_FLAG_INPUT                   (1L<<1)
diff --git a/src/moveresize.c b/src/moveresize.c
index 21eb3f0..aa8d0b9 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -1352,12 +1352,9 @@ clientResizeConfigure (Client *c, int pw, int ph)
         {
             clientXSyncRequest (c);
         }
-        else
-        {
 #endif /* HAVE_XSYNC */
-            clientReconfigure (c, NO_CFG_FLAG);
+        clientReconfigure (c, NO_CFG_FLAG);
 #ifdef HAVE_XSYNC
-        }
     }
 #endif /* HAVE_XSYNC */
 }
@@ -1764,11 +1761,7 @@ clientResize (Client * c, int handle, XEvent * ev)
         return;
     }
 
-    if (!screen_info->params->box_resize)
-    {
-        FLAG_SET (c->flags, CLIENT_FLAG_XSYNC_CONFIGURE);
-    }
-    else if (screen_info->compositor_active)
+    if (screen_info->params->box_resize && screen_info->compositor_active)
     {
         passdata.wireframe = wireframeCreate (c);
     }
@@ -1794,13 +1787,6 @@ clientResize (Client * c, int handle, XEvent * ev)
     /* Clear any previously saved pos flag from screen resize */
     FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_SAVED_POS);
 
-#ifdef HAVE_XSYNC
-    if (c->xsync_counter)
-    {
-        clientCreateXSyncAlarm (c);
-    }
-#endif /* HAVE_XSYNC */
-
     FLAG_SET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
     TRACE ("entering resize loop");
     eventFilterPush (display_info->xfilter, clientResizeEventFilter, &passdata);
@@ -1808,7 +1794,6 @@ clientResize (Client * c, int handle, XEvent * ev)
     eventFilterPop (display_info->xfilter);
     TRACE ("leaving resize loop");
     FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-    FLAG_UNSET (c->flags, CLIENT_FLAG_XSYNC_CONFIGURE);
 
     if (passdata.poswin)
     {
@@ -1837,14 +1822,6 @@ clientResize (Client * c, int handle, XEvent * ev)
             FLAG_UNSET (c->flags, CLIENT_FLAG_RESTORE_SIZE_POS);
         }
     }
-
-#ifdef HAVE_XSYNC
-    if (c->xsync_counter)
-    {
-        clientDestroyXSyncAlarm (c);
-    }
-#endif /* HAVE_XSYNC */
-
     clientReconfigure (c, NO_CFG_FLAG);
 
     if (!passdata.released)
diff --git a/src/xsync.c b/src/xsync.c
index b1ee78a..5b687c8 100644
--- a/src/xsync.c
+++ b/src/xsync.c
@@ -171,10 +171,6 @@ clientXSyncClearTimeout (Client * c)
     TRACE ("entering clientXSyncClearTimeout");
 
     FLAG_UNSET (c->flags, CLIENT_FLAG_XSYNC_WAITING);
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_XSYNC_CONFIGURE))
-    {
-        clientReconfigure (c, NO_CFG_FLAG);
-    }
     if (c->xsync_timeout_id)
     {
         g_source_remove (c->xsync_timeout_id);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.