fix resizing when drawContents is off, and I think an ifdef was a bit too high up

diff --git a/openbox/client.c b/openbox/client.c
index d5e7f4ce4816ee266c2bd04b6f8f5ffe1c3a50fc..f5eccbc0213d5553bffb9d1f87ce877ba4afab21 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1306,7 +1306,7 @@ void client_update_protocols(ObClient *self)
                 self->focus_notify = TRUE;
 #ifdef SYNC
             else if (proto[i] == prop_atoms.net_wm_sync_request) 
-                /* if this protocol is requested, then the resizing the
+                /* if this protocol is requested, then resizing the
                    window will be synchronized between the frame and the
                    client */
                 self->sync_request = TRUE;

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 39fdd45daefaba48a5f67692be79c3bb5764305c..c34cf81b29e239877cd64419a8e1a577957ea75c 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -174,8 +174,8 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
         g_assert_not_reached();
 
 #ifdef SYNC
-    if (!moving && extensions_shape && moveresize_client->sync_request &&
-        moveresize_client->sync_counter)
+    if (config_resize_redraw && !moving && extensions_shape &&
+        moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         /* Initialize values for the resize syncing, and create an alarm for
            the client's xsync counter */
@@ -269,7 +269,6 @@ static void do_move(gboolean resist)
 
 static void do_resize()
 {
-#ifdef SYNC
     gint x, y, w, h, lw, lh;
 
     /* see if it is actually going to resize */
@@ -285,8 +284,9 @@ static void do_resize()
         return;
     }
 
-    if (extensions_sync && moveresize_client->sync_request &&
-        moveresize_client->sync_counter)
+#ifdef SYNC
+    if (config_resize_redraw && extensions_sync &&
+        moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         XEvent ce;
         XSyncValue val;