X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=a1bf55fada21c71a28d822aa348848a32e41b594;hb=373a4584d603a4dc14c64d5f27653c83a1fe686b;hp=5e3b36e255bae28af48dc5448ae18133d0dbe938;hpb=32390c6b6dceeb72e4e4ceb0e79ba4d8c8ede9a3;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 5e3b36e2..a1bf55fa 100644
--- 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"
@@ -10,7 +11,7 @@
 #include "focus.h"
 #include "dispatch.h"
 #include "extensions.h"
-#include "../render/render.h"
+#include "render/render.h"
 
 #ifdef USE_LIBSN
 #  define SN_API_NOT_YET_FROZEN
@@ -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);
 }
@@ -481,17 +484,17 @@ void screen_install_colormap(Client *client, gboolean install)
 
     if (client == NULL) {
 	if (install)
-	    XInstallColormap(ob_display, render_colormap);
+	    XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
 	else
-	    XUninstallColormap(ob_display, render_colormap);
+	    XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
 	if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
             xerror_set_ignore(TRUE);
 	    if (install)
-		XInstallColormap(ob_display, wa.colormap);
+		XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
 	    else
-		XUninstallColormap(ob_display, wa.colormap);
+		XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
             xerror_set_ignore(FALSE);
 	}
     }
@@ -580,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);
 		}
 	    }
 	}