#include "menuframe.h"
#include "grab.h"
#include "group.h"
+#include "propwin.h"
#include "config.h"
#include "mainloop.h"
#include "gettext.h"
#include <X11/Xcursor/Xcursor.h>
#endif
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
+
RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
ObMainLoop *ob_main_loop;
Display *ob_display;
gint ob_screen;
gboolean ob_replace_wm = FALSE;
+gboolean ob_sm_use = TRUE;
+gchar *ob_sm_id = NULL;
+gchar *ob_sm_save_file = NULL;
+gchar *ob_config_type = NULL;
+gboolean ob_debug_xinerama = FALSE;
static ObState state;
static gboolean xsync = FALSE;
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 parse_args(gint argc, gchar **argv);
+static void remove_args(gint *argc, gchar **argv, gint index, gint num);
+static void parse_env();
+static void parse_args(gint *argc, gchar **argv);
static Cursor load_cursor(const gchar *name, guint fontval);
gint main(gint argc, gchar **argv)
{
+ gchar *program_name;
+
state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
- g_message(_("Couldn't set locale from environment."));
+ g_message("Couldn't set locale from environment.");
bindtextdomain(PACKAGE_NAME, LOCALEDIR);
bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
textdomain(PACKAGE_NAME);
- g_set_prgname(argv[0]);
-
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 out command line args */
- parse_args(argc, argv);
+ /* parse the command line args, which can change the argv[0] */
+ parse_args(&argc, argv);
+ /* parse the environment variables */
+ parse_env();
+
+ program_name = g_path_get_basename(argv[0]);
+ g_set_prgname(program_name);
if (!remote_control) {
parse_paths_startup();
session_startup(argc, argv);
}
+
ob_display = XOpenDisplay(NULL);
if (ob_display == NULL)
- ob_exit_with_error("Failed to open the display.");
+ ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
- ob_exit_with_error("Failed to set display as close-on-exec.");
+ ob_exit_with_error("Failed to set display as close-on-exec");
if (remote_control) {
prop_startup();
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 render library."));
XSynchronize(ob_display, xsync);
cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
XC_top_left_corner);
- /* create available keycodes */
- keys[OB_KEY_RETURN] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
- keys[OB_KEY_ESCAPE] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
- keys[OB_KEY_LEFT] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
- keys[OB_KEY_RIGHT] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
- keys[OB_KEY_UP] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
- keys[OB_KEY_DOWN] =
- XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
- if (screen_annex()) { /* it will be ours! */
+ if (screen_annex(program_name)) { /* it will be ours! */
do {
+ modkeys_startup(reconfigure);
+
+ /* get the keycodes for keys we use */
+ keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return);
+ keys[OB_KEY_ESCAPE] = modkeys_sym_to_code(XK_Escape);
+ keys[OB_KEY_LEFT] = modkeys_sym_to_code(XK_Left);
+ keys[OB_KEY_RIGHT] = modkeys_sym_to_code(XK_Right);
+ keys[OB_KEY_UP] = modkeys_sym_to_code(XK_Up);
+ keys[OB_KEY_DOWN] = modkeys_sym_to_code(XK_Down);
+
{
ObParseInst *i;
xmlDocPtr doc;
xmlNodePtr node;
- modkeys_startup(reconfigure);
-
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
+ /* start up config which sets up with the parser */
config_startup(i);
+
/* parse/load user options */
- if (parse_load_rc(config_file, &doc, &node, &config_file)) {
- PROP_SETS(RootWindow(ob_display, ob_screen),
- openbox_rc, config_file);
+ if (parse_load_rc(ob_config_type, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
- } else {
+ parse_close(doc);
+ } else
g_message(_("Unable to find a valid config file, using some simple defaults"));
- PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);
- }
+
+ if (ob_config_type != NULL)
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ ob_config, ob_config_type);
+
/* we're done with parsing now, kill it */
- parse_close(doc);
parse_shutdown(i);
}
ob_rr_theme = theme;
}
if (ob_rr_theme == NULL)
- ob_exit_with_error("Unable to load a theme.");
+ ob_exit_with_error(_("Unable to load a theme."));
}
if (reconfigure) {
sn_startup(reconfigure);
screen_startup(reconfigure);
grab_startup(reconfigure);
+ propwin_startup(reconfigure);
group_startup(reconfigure);
client_startup(reconfigure);
dock_startup(reconfigure);
menu_frame_startup(reconfigure);
if (!reconfigure) {
+ guint32 xid;
+ ObWindow *w;
+
/* get all the existing windows */
client_manage_all();
- focus_fallback(TRUE);
+ focus_nothing();
+
+ /* focus what was focused if a wm was already running */
+ if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ net_active_window, window, &xid) &&
+ (w = g_hash_table_lookup(window_map, &xid)) &&
+ WINDOW_IS_CLIENT(w))
+ {
+ client_focus(WINDOW_AS_CLIENT(w));
+ }
} else {
GList *it;
dock_shutdown(reconfigure);
client_shutdown(reconfigure);
group_shutdown(reconfigure);
+ propwin_shutdown(reconfigure);
grab_shutdown(reconfigure);
screen_shutdown(reconfigure);
focus_shutdown(reconfigure);
XSync(ob_display, FALSE);
- g_free(config_file); /* this is set by parse_load_rc */
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
}
}
+ /* we remove the session arguments from argv, so put them back */
+ if (ob_sm_save_file != NULL || ob_sm_id != NULL) {
+ gchar **nargv;
+ gint i, l;
+
+ l = argc +
+ (ob_sm_save_file != NULL ? 2 : 0) +
+ (ob_sm_id != NULL ? 2 : 0);
+ nargv = g_new0(gchar*, l+1);
+ for (i = 0; i < argc; ++i)
+ nargv[i] = argv[i];
+
+ if (ob_sm_save_file != NULL) {
+ nargv[i++] = g_strdup("--sm-save-file");
+ nargv[i++] = ob_sm_save_file;
+ }
+ if (ob_sm_id != NULL) {
+ nargv[i++] = g_strdup("--sm-client-id");
+ nargv[i++] = ob_sm_id;
+ }
+ g_assert(i == l);
+ argv = nargv;
+ }
+
+ /* we also remove some environment variables, so put them back */
+ if (ob_config_type)
+ setenv("OPENBOX_CONFIG_NAMESPACE", ob_config_type, 1);
+
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
- execlp(argv[0], g_path_get_basename(argv[0]),
- (char *)NULL); /* last resort */
+ execlp(argv[0], program_name, (gchar*)NULL); /* last resort */
}
+
+ /* free stuff passed in from the command line or environment */
+ g_free(ob_sm_save_file);
+ g_free(ob_sm_id);
+ g_free(ob_config_type);
+ g_free(program_name);
return exitcode;
}
static void print_help()
{
g_print(_("Syntax: openbox [options]\n"));
- g_print(_("\nOptions:\n\n"));
- g_print(_(" --config-file FILE Specify the file to load for the config file\n"));
-#ifdef USE_SM
- g_print(_(" --sm-disable Disable connection to session manager\n"));
- g_print(_(" --sm-client-id ID Specify session management ID\n"));
- g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n"));
-#endif
- g_print(_(" --replace Replace the currently running window manager\n"));
+ g_print(_("\nOptions:\n"));
g_print(_(" --help Display this help and exit\n"));
g_print(_(" --version Display the version and exit\n"));
- g_print(_("\nPassing messages to a running Openbox instance:\n\n"));
+ g_print(_(" --replace Replace the currently running window manager\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(_("\nDebugging options:\n\n"));
+ g_print(_("\nDebugging options:\n"));
g_print(_(" --sync Run in synchronous mode\n"));
g_print(_(" --debug Display debugging output\n"));
g_print(_(" --debug-focus Display debugging output for focus handling\n"));
- g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT);
+ g_print(_(" --debug-xinerama Split the display into fake xinerama screens\n"));
+ g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
}
-static void parse_args(gint argc, gchar **argv)
+static void remove_args(gint *argc, gchar **argv, gint index, gint num)
{
gint i;
- for (i = 1; i < argc; ++i) {
+ for (i = index; i < *argc - num; ++i)
+ argv[i] = argv[i+num];
+ for (; i < *argc; ++i)
+ argv[i] = NULL;
+ *argc -= num;
+}
+
+static void parse_env()
+{
+ /* unset this so we don't pass it on unknowingly */
+ unsetenv("DESKTOP_STARTUP_ID");
+
+ if (getenv("OPENBOX_CONFIG_NAMESPACE"))
+ ob_config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
+}
+
+static void parse_args(gint *argc, gchar **argv)
+{
+ gint i;
+
+ for (i = 1; i < *argc; ++i) {
if (!strcmp(argv[i], "--version")) {
print_version();
exit(0);
- } else if (!strcmp(argv[i], "--help")) {
+ }
+ else if (!strcmp(argv[i], "--help")) {
print_help();
exit(0);
- } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+ }
+ else if (!strcmp(argv[i], "--g-fatal-warnings")) {
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
- } else if (!strcmp(argv[i], "--replace")) {
+ }
+ else if (!strcmp(argv[i], "--replace")) {
ob_replace_wm = TRUE;
- } else if (!strcmp(argv[i], "--sync")) {
+ remove_args(argc, argv, i, 1);
+ --i; /* this arg was removed so go back */
+ }
+ else if (!strcmp(argv[i], "--sync")) {
xsync = TRUE;
- } else if (!strcmp(argv[i], "--debug")) {
+ }
+ else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
- } else if (!strcmp(argv[i], "--debug-focus")) {
+ ob_debug_enable(OB_DEBUG_SM, TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+ }
+ else if (!strcmp(argv[i], "--debug-focus")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_SM, TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
- } else if (!strcmp(argv[i], "--reconfigure")) {
+ }
+ else if (!strcmp(argv[i], "--debug-xinerama")) {
+ ob_debug_xinerama = TRUE;
+ }
+ 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")) {
remote_control = 2;
- } else if (!strcmp(argv[i], "--config-file")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--config-file requires an argument\n"));
+*/
+ }
+ else if (!strcmp(argv[i], "--config-namespace")) {
+ if (i == *argc - 1) /* no args left */
+ /* not translated cuz it's sekret */
+ g_printerr("--config-namespace requires an argument\n");
else {
- config_file = g_strdup(argv[i+1]);
- ++i;
+ ob_config_type = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--config-namespace %s\n",
+ ob_sm_save_file);
}
}
+ else if (!strcmp(argv[i], "--sm-save-file")) {
+ if (i == *argc - 1) /* no args left */
+ /* not translated cuz it's sekret */
+ g_printerr("--sm-save-file requires an argument\n");
+ else {
+ ob_sm_save_file = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--sm-save-file %s\n",
+ ob_sm_save_file);
+ }
+ }
+ else if (!strcmp(argv[i], "--sm-client-id")) {
+ if (i == *argc - 1) /* no args left */
+ /* not translated cuz it's sekret */
+ g_printerr("--sm-client-id requires an argument\n");
+ else {
+ ob_sm_id = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s\n", ob_sm_id);
+ }
+ }
+ else if (!strcmp(argv[i], "--sm-disable")) {
+ ob_sm_use = FALSE;
+ }
+ else {
+ /* this is a memleak.. oh well.. heh */
+ gchar *err = g_strdup_printf
+ (_("Invalid command line argument '%s'\n"), argv[i]);
+ ob_exit_with_error(err);
+ }
}
}
void ob_exit_with_error(const gchar *msg)
{
- g_critical(msg);
+ g_message(msg);
session_shutdown(TRUE);
exit(EXIT_FAILURE);
}