remove non-planar surfaces

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 044098fc9a5836e30aaa2970a75eaef39fb460df..85bf036d44b488f13a62e3fb659721507bffe07b 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "dock.h"
+#include "xerror.h"
 #include "prop.h"
 #include "startup.h"
 #include "timer.h"
@@ -91,7 +92,7 @@ gboolean screen_annex()
     PROP_SET32(ob_root, net_supporting_wm_check, window, support_window);
 
     /* set properties on the supporting window */
-    PROP_SETS(support_window, net_wm_name, "Openbox");
+    PROP_SETS(support_window, net_wm_name, "Openbox3");
     PROP_SET32(support_window, net_supporting_wm_check, window,support_window);
 
     /* set the _NET_SUPPORTED_ATOMS hint */
@@ -335,7 +336,9 @@ void screen_set_desktop(guint num)
     /* focus the last focused window on the desktop, and ignore enter events
        from the switch so it doesnt mess with the focus */
     while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+    g_message("switch fallback");
     focus_fallback(Fallback_Desktop);
+    g_message("/switch fallback");
 
     dispatch_ob(Event_Ob_Desktop, num, old);
 }
@@ -487,10 +490,12 @@ void screen_install_colormap(Client *client, gboolean install)
     } else {
        if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
+            xerror_set_ignore(TRUE);
            if (install)
                XInstallColormap(ob_display, wa.colormap);
            else
                XUninstallColormap(ob_display, wa.colormap);
+            xerror_set_ignore(FALSE);
        }
     }
 }
@@ -578,11 +583,11 @@ static void screen_update_area()
                Client *c = it->data;
                if (i < screen_num_desktops) {
                    if (c->desktop == i)
-                       client_remaximize(c);
+                        client_reconfigure(c);
                } else {
                    /* the 'all desktops' size */
                    if (c->desktop == DESKTOP_ALL)
-                       client_remaximize(c);
+                        client_reconfigure(c);
                }
            }
        }