#include "xerror.h"
#include "prop.h"
#include "screen.h"
+#include "actions.h"
#include "startupnotify.h"
#include "focus.h"
#include "focus_cycle.h"
#include "focus_cycle_indicator.h"
#include "focus_cycle_popup.h"
#include "moveresize.h"
+#include "composite.h"
#include "frame.h"
#include "keyboard.h"
#include "mouse.h"
gboolean ob_sm_use = TRUE;
gchar *ob_sm_id = NULL;
gchar *ob_sm_save_file = NULL;
+gboolean ob_sm_restore = TRUE;
gboolean ob_debug_xinerama = FALSE;
static ObState state;
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL)
- ob_exit_with_error(_("Failed to initialize the render library."));
+ ob_exit_with_error(_("Failed to initialize the obrender library."));
XSynchronize(ob_display, xsync);
of the rc */
i = parse_startup();
+ /* register all the available actions */
+ actions_startup(reconfigure);
/* start up config which sets up with the parser */
config_startup(i);
/* load the theme specified in the rc file */
{
RrTheme *theme;
- if ((theme = RrThemeNew(ob_rr_inst, config_theme,
+ if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE,
config_font_activewindow,
config_font_inactivewindow,
config_font_menutitle,
}
if (ob_rr_theme == NULL)
ob_exit_with_error(_("Unable to load a theme."));
+
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ ob_theme, ob_rr_theme->name);
}
if (reconfigure) {
window_startup(reconfigure);
sn_startup(reconfigure);
screen_startup(reconfigure);
+ composite_startup(reconfigure);
grab_startup(reconfigure);
propwin_startup(reconfigure);
group_startup(reconfigure);
/* redecorate all existing windows */
for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
+
/* the new config can change the window's decorations */
- client_setup_decor_and_functions(c);
+ client_setup_decor_and_functions(c, FALSE);
/* redraw the frames */
frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+ /* the decor sizes may have changed, so the windows may
+ end up in new positions */
+ client_reconfigure(c, FALSE);
}
}
group_shutdown(reconfigure);
propwin_shutdown(reconfigure);
grab_shutdown(reconfigure);
+ composite_shutdown(reconfigure);
screen_shutdown(reconfigure);
focus_cycle_popup_shutdown(reconfigure);
focus_cycle_indicator_shutdown(reconfigure);
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ actions_shutdown(reconfigure);
modkeys_shutdown(reconfigure);
} while (reconfigure);
}
}
}
- /* we remove the session arguments from argv, so put them back */
+ /* we remove the session arguments from argv, so put them back,
+ also don't restore the session on restart */
if (ob_sm_save_file != NULL || ob_sm_id != NULL) {
gchar **nargv;
gint i, l;
- l = argc +
+ l = argc + 1 +
(ob_sm_save_file != NULL ? 2 : 0) +
(ob_sm_id != NULL ? 2 : 0);
nargv = g_new0(gchar*, l+1);
nargv[i++] = g_strdup("--sm-client-id");
nargv[i++] = ob_sm_id;
}
+ nargv[i++] = g_strdup("--sm-no-load");
g_assert(i == l);
argv = nargv;
}
else if (!strcmp(argv[i], "--sm-disable")) {
ob_sm_use = FALSE;
}
+ else if (!strcmp(argv[i], "--sm-no-load")) {
+ ob_sm_restore = FALSE;
+ remove_args(argc, argv, i, 1);
+ --i; /* this arg was removed so go back */
+ }
else {
/* this is a memleak.. oh well.. heh */
gchar *err = g_strdup_printf