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

diff --git a/openbox/screen.c b/openbox/screen.c
index 984010bf..a1bf55fa 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -11,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
@@ -336,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);
 }
@@ -482,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);
 	}
     }