merge r5863-5865 from trunk

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/extensions.c b/openbox/extensions.c
index 5b64bc64613299251178bb32fd07f376ef40f18c..d57b835700e97dff36917c0aae803df959eb58fc 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -43,24 +43,32 @@ void extensions_query_all()
     extensions_xkb =
         XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
                           &junk, NULL, NULL);
+    if (!extensions_xkb)
+        ob_debug("XKB extension is not present on the server\n");
 #endif
 
 #ifdef SHAPE
     extensions_shape =
         XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
                              &junk);
+    if (!extensions_shape)
+        ob_debug("X Shape extension is not present on the server\n");
 #endif
 
 #ifdef XINERAMA
     extensions_xinerama =
         XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
                                &junk) && XineramaIsActive(ob_display);
+    if (!extensions_xinerama)
+        ob_debug("Xinerama extension is not present on the server\n");
 #endif
 
 #ifdef XRANDR
     extensions_randr =
         XRRQueryExtension(ob_display, &extensions_randr_event_basep,
                           &junk);
+    if (!extensions_randr)
+        ob_debug("XRandR extension is not present on the server\n");
 #endif
 
 #ifdef SYNC
@@ -70,7 +78,7 @@ void extensions_query_all()
         XSyncInitialize(ob_display, &junk, &junk);
     if (!extensions_sync)
         ob_debug("X Sync extension is not present on the server or is an "
-                 "incompatible version");
+                 "incompatible version\n");
 #endif
 }
 

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;

diff --git a/openbox/prop.c b/openbox/prop.c
index 49eeef9e42a48483131d6670edda49e2dfbccb8c..d13a0515c8bf581c50e28cb36cb2d57dcfb54f22 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -122,7 +122,6 @@ void prop_startup()
     CREATE(net_wm_action_resize, "_NET_WM_ACTION_RESIZE");
     CREATE(net_wm_action_minimize, "_NET_WM_ACTION_MINIMIZE");
     CREATE(net_wm_action_shade, "_NET_WM_ACTION_SHADE");
-    CREATE(net_wm_action_stick, "_NET_WM_ACTION_STICK");
     CREATE(net_wm_action_maximize_horz, "_NET_WM_ACTION_MAXIMIZE_HORZ");
     CREATE(net_wm_action_maximize_vert, "_NET_WM_ACTION_MAXIMIZE_VERT");
     CREATE(net_wm_action_fullscreen, "_NET_WM_ACTION_FULLSCREEN");

diff --git a/openbox/prop.h b/openbox/prop.h
index 09ca25ce65f198e8b5fbea4068fca1c81b3973e7..f4d7f8b63c6933135b1c9397ac48a396e77850ab 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -131,7 +131,6 @@ typedef struct Atoms {
     Atom net_wm_action_resize;
     Atom net_wm_action_minimize;
     Atom net_wm_action_shade;
-    Atom net_wm_action_stick;
     Atom net_wm_action_maximize_horz;
     Atom net_wm_action_maximize_vert;
     Atom net_wm_action_fullscreen;