fixed to accomodate the changes to the render/ API.

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index a1ad36e0e5fe69b06b78a399cbc80b78eec314ec..d438a8000114e67192672eddd0ff16f0ae71c373 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -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);
        }
     }
@@ -581,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);
                }
            }
        }