#include "openbox.h"
#include "dock.h"
+#include "xerror.h"
#include "prop.h"
#include "startup.h"
#include "timer.h"
#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
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 */
/* 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);
}
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);
}
}
}
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);
}
}
}