#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 "frame.h"
+#include "framerender.h"
#include "keyboard.h"
#include "mouse.h"
#include "extensions.h"
#include "menuframe.h"
#include "grab.h"
#include "group.h"
-#include "propwin.h"
#include "config.h"
+#include "ping.h"
#include "mainloop.h"
#include "gettext.h"
#include "parser/parse.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;
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
+static gchar *config_file = NULL;
static void signal_handler(gint signal, gpointer data);
static void remove_args(gint *argc, gchar **argv, gint index, gint num);
if (chdir(g_get_home_dir()) == -1)
g_message(_("Unable to change to home directory '%s': %s"),
g_get_home_dir(), g_strerror(errno));
-
+
/* parse the command line args, which can change the argv[0] */
parse_args(&argc, argv);
/* parse the environment variables */
prop_startup();
/* Send client message telling the OB process to:
- * remote_control = 1 -> reconfigure
+ * remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
ob_control, remote_control, 0, 0, 0);
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);
/* set the DISPLAY environment variable for any lauched children, to the
display we're using, so they open in the right place. */
- putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
+ setenv("DISPLAY", DisplayString(ob_display), TRUE);
/* create available cursors */
cursors[OB_CURSOR_NONE] = None;
cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr);
- cursors[OB_CURSOR_BUSY] = load_cursor("left_ptr_watch", XC_watch);
+ cursors[OB_CURSOR_BUSYPOINTER] = load_cursor("left_ptr_watch",XC_left_ptr);
+ cursors[OB_CURSOR_BUSY] = load_cursor("watch", XC_watch);
cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur);
cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side);
cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner",
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);
/* parse/load user options */
- if (parse_load_rc(NULL, &doc, &node)) {
+ if (parse_load_rc(config_file, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
parse_close(doc);
- } else
+ }
+ else {
g_message(_("Unable to find a valid config file, using some simple defaults"));
+ config_file = NULL;
+ }
-/*
- if (config_type != NULL)
- PROP_SETS(RootWindow(ob_display, ob_screen),
- ob_config, config_type);
-*/
+ if (config_file) {
+ gchar *p = g_filename_to_utf8(config_file, -1,
+ NULL, NULL, NULL);
+ if (p)
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ ob_config_file, p);
+ g_free(p);
+ }
+ else
+ PROP_ERASE(RootWindow(ob_display, ob_screen),
+ ob_config_file);
/* we're done with parsing now, kill it */
parse_shutdown(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) {
event_startup(reconfigure);
/* focus_backup is used for stacking, so this needs to come before
anything that calls stacking_add */
+ sn_startup(reconfigure);
+ window_startup(reconfigure);
focus_startup(reconfigure);
focus_cycle_startup(reconfigure);
- window_startup(reconfigure);
- sn_startup(reconfigure);
+ focus_cycle_indicator_startup(reconfigure);
+ focus_cycle_popup_startup(reconfigure);
screen_startup(reconfigure);
grab_startup(reconfigure);
- propwin_startup(reconfigure);
group_startup(reconfigure);
+ ping_startup(reconfigure);
client_startup(reconfigure);
dock_startup(reconfigure);
moveresize_startup(reconfigure);
keyboard_startup(reconfigure);
mouse_startup(reconfigure);
- menu_startup(reconfigure);
menu_frame_startup(reconfigure);
+ menu_startup(reconfigure);
if (!reconfigure) {
guint32 xid;
/* 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);
}
}
client_unmanage_all();
}
- menu_frame_shutdown(reconfigure);
menu_shutdown(reconfigure);
+ menu_frame_shutdown(reconfigure);
mouse_shutdown(reconfigure);
keyboard_shutdown(reconfigure);
moveresize_shutdown(reconfigure);
dock_shutdown(reconfigure);
client_shutdown(reconfigure);
+ ping_shutdown(reconfigure);
group_shutdown(reconfigure);
- propwin_shutdown(reconfigure);
grab_shutdown(reconfigure);
screen_shutdown(reconfigure);
+ focus_cycle_popup_shutdown(reconfigure);
+ focus_cycle_indicator_shutdown(reconfigure);
focus_cycle_shutdown(reconfigure);
focus_shutdown(reconfigure);
- sn_shutdown(reconfigure);
window_shutdown(reconfigure);
+ sn_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;
}
g_free(ob_sm_save_file);
g_free(ob_sm_id);
g_free(program_name);
-
+
return exitcode;
}
break;
case SIGUSR2:
ob_debug("Caught signal %d. Reconfiguring.\n", signal);
- ob_reconfigure();
+ ob_reconfigure();
break;
case SIGCHLD:
/* reap children */
{
g_print("Openbox %s\n", PACKAGE_VERSION);
g_print(_("Copyright (c)"));
- g_print(" 2007 Mikael Magnusson\n");
+ g_print(" 2008 Mikael Magnusson\n");
g_print(_("Copyright (c)"));
- g_print(" 2003-2007 Dana Jansens\n\n");
+ g_print(" 2003-2006 Dana Jansens\n\n");
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("This is free software, and you are welcome to redistribute it\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
g_print(_(" --help Display this help and exit\n"));
g_print(_(" --version Display the version and exit\n"));
g_print(_(" --replace Replace the currently running window manager\n"));
+ g_print(_(" --config-file FILE Specify the path to the config file to use\n"));
g_print(_(" --sm-disable Disable connection to the session manager\n"));
g_print(_("\nPassing messages to a running Openbox instance:\n"));
g_print(_(" --reconfigure Reload Openbox's configuration\n"));
+ g_print(_(" --restart Restart Openbox\n"));
+ g_print(_(" --exit Exit Openbox\n"));
g_print(_("\nDebugging options:\n"));
g_print(_(" --sync Run in synchronous mode\n"));
g_print(_(" --debug Display debugging output\n"));
}
else if (!strcmp(argv[i], "--reconfigure")) {
remote_control = 1;
-/* don't make this do anything if it's not in --help ..
- } else if (!strcmp(argv[i], "--restart")) {
+ }
+ else if (!strcmp(argv[i], "--restart")) {
remote_control = 2;
-*/
+ }
+ else if (!strcmp(argv[i], "--exit")) {
+ remote_control = 3;
+ }
+ else if (!strcmp(argv[i], "--config-file")) {
+ if (i == *argc - 1) /* no args left */
+ /* not translated cuz it's sekret */
+ g_printerr(_("--config-file requires an argument\n"));
+ else {
+ /* this will be in the current locale encoding, which is
+ what we want */
+ config_file = argv[i+1];
+ ++i; /* skip the argument */
+ ob_debug("--config-file %s\n", config_file);
+ }
}
else if (!strcmp(argv[i], "--sm-save-file")) {
if (i == *argc - 1) /* no args left */
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
projects / mikachu / openbox.git / blobdiff