+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ openbox.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "debug.h"
#include "openbox.h"
#include "session.h"
#include "dock.h"
+#include "modkeys.h"
#include "event.h"
#include "menu.h"
#include "client.h"
#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 "grab.h"
#include "group.h"
#include "config.h"
+#include "ping.h"
#include "mainloop.h"
#include "gettext.h"
#include "parser/parse.h"
# include <sys/stat.h>
# include <sys/types.h>
#endif
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <errno.h>
#include <X11/cursorfont.h>
+#if USE_XCURSOR
+#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;
+gboolean ob_replace_wm = FALSE;
+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 gboolean xsync;
-static gboolean reconfigure;
-static gboolean restart;
-static char *restart_path;
+static gboolean xsync = FALSE;
+static gboolean reconfigure = FALSE;
+static gboolean restart = FALSE;
+static gchar *restart_path = NULL;
static Cursor cursors[OB_NUM_CURSORS];
static KeyCode keys[OB_NUM_KEYS];
static gint exitcode = 0;
+static guint remote_control = 0;
+static gboolean being_replaced = FALSE;
+static gchar *config_file = NULL;
-static void signal_handler(int signal, gpointer data);
-static void parse_args(int argc, char **argv);
+static void signal_handler(gint signal, gpointer data);
+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);
-int main(int argc, char **argv)
+gint main(gint argc, gchar **argv)
{
-#ifdef DEBUG
- ob_debug_show_output(TRUE);
-#endif
+ gchar *program_name;
state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
- g_warning("Couldn't set locale from environment.\n");
+ 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]);
-
- parse_paths_startup();
+ 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 */
+ parse_env();
+
+ program_name = g_path_get_basename(argv[0]);
+ g_set_prgname(program_name);
- session_startup(&argc, &argv);
+ if (!remote_control) {
+ parse_paths_startup();
+
+ session_startup(argc, argv);
+ }
- /* parse out command line args */
- parse_args(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();
+
+ /* Send client message telling the OB process to:
+ * remote_control = 1 -> reconfigure
+ * remote_control = 2 -> restart */
+ PROP_MSG(RootWindow(ob_display, ob_screen),
+ ob_control, remote_control, 0, 0, 0);
+ XCloseDisplay(ob_display);
+ exit(EXIT_SUCCESS);
+ }
ob_main_loop = ob_main_loop_new(ob_display);
ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL);
ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL);
ob_screen = DefaultScreen(ob_display);
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."));
- /* XXX fork self onto other screens */
-
XSynchronize(ob_display, xsync);
/* check for locale support */
if (!XSupportsLocale())
- g_warning("X server does not support locale.");
+ g_message(_("X server does not support locale."));
if (!XSetLocaleModifiers(""))
- g_warning("Cannot set locale modifiers for the X server.");
+ g_message(_("Cannot set locale modifiers for the X server."));
/* set our error handler */
XSetErrorHandler(xerror_handler);
/* 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] =
- XCreateFontCursor(ob_display, XC_left_ptr);
- cursors[OB_CURSOR_BUSY] =
- XCreateFontCursor(ob_display, XC_watch);
- cursors[OB_CURSOR_MOVE] =
- XCreateFontCursor(ob_display, XC_fleur);
- cursors[OB_CURSOR_NORTH] =
- XCreateFontCursor(ob_display, XC_top_side);
- cursors[OB_CURSOR_NORTHEAST] =
- XCreateFontCursor(ob_display, XC_top_right_corner);
- cursors[OB_CURSOR_EAST] =
- XCreateFontCursor(ob_display, XC_right_side);
- cursors[OB_CURSOR_SOUTHEAST] =
- XCreateFontCursor(ob_display, XC_bottom_right_corner);
- cursors[OB_CURSOR_SOUTH] =
- XCreateFontCursor(ob_display, XC_bottom_side);
- cursors[OB_CURSOR_SOUTHWEST] =
- XCreateFontCursor(ob_display, XC_bottom_left_corner);
- cursors[OB_CURSOR_WEST] =
- XCreateFontCursor(ob_display, XC_left_side);
- cursors[OB_CURSOR_NORTHWEST] =
- XCreateFontCursor(ob_display, 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"));
+ cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr);
+ 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",
+ XC_top_right_corner);
+ cursors[OB_CURSOR_EAST] = load_cursor("right_side", XC_right_side);
+ cursors[OB_CURSOR_SOUTHEAST] = load_cursor("bottom_right_corner",
+ XC_bottom_right_corner);
+ cursors[OB_CURSOR_SOUTH] = load_cursor("bottom_side", XC_bottom_side);
+ cursors[OB_CURSOR_SOUTHWEST] = load_cursor("bottom_left_corner",
+ XC_bottom_left_corner);
+ cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side);
+ cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
+ XC_top_left_corner);
+
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
if (screen_annex()) { /* 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;
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(&doc, &node))
+ if (parse_load_rc(config_file, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
+ parse_close(doc);
+ }
+ else {
+ g_message(_("Unable to find a valid config file, using some simple defaults"));
+ config_file = NULL;
+ }
+
+ 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 */
- xmlFreeDoc(doc);
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,
+ config_font_menuitem,
+ config_font_osd)))
+ {
RrThemeFree(ob_rr_theme);
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."));
+
+ 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 */
- focus_startup(reconfigure);
- window_startup(reconfigure);
sn_startup(reconfigure);
+ window_startup(reconfigure);
+ focus_startup(reconfigure);
+ focus_cycle_startup(reconfigure);
+ focus_cycle_indicator_startup(reconfigure);
+ focus_cycle_popup_startup(reconfigure);
screen_startup(reconfigure);
grab_startup(reconfigure);
group_startup(reconfigure);
+ ping_startup(reconfigure);
client_startup(reconfigure);
dock_startup(reconfigure);
moveresize_startup(reconfigure);
keyboard_startup(reconfigure);
mouse_startup(reconfigure);
+ menu_frame_startup(reconfigure);
menu_startup(reconfigure);
if (!reconfigure) {
+ guint32 xid;
+ ObWindow *w;
+
/* get all the existing windows */
client_manage_all();
+ 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;
/* 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, 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);
}
}
}
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);
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);
}
+ XSync(ob_display, FALSE);
+
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
- session_shutdown();
+ session_shutdown(being_replaced);
XCloseDisplay(ob_display);
if (restart) {
if (restart_path != NULL) {
- int argcp;
- char **argvp;
+ gint argcp;
+ gchar **argvp;
GError *err = NULL;
- /* run other shit */
+ /* run other window manager */
if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) {
execvp(argvp[0], argvp);
g_strfreev(argvp);
} else {
- g_warning("failed to execute '%s': %s", restart_path,
- err->message);
+ g_message(
+ _("Restart failed to execute new executable '%s': %s"),
+ restart_path, err->message);
+ g_error_free(err);
+ }
+ }
+
+ /* 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 + 1 +
+ (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;
}
+ nargv[i++] = g_strdup("--sm-no-load");
+ g_assert(i == l);
+ argv = nargv;
}
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
- execlp(argv[0], g_path_get_basename(argv[0])); /* 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(program_name);
+
return exitcode;
}
-static void signal_handler(int signal, gpointer data)
+static void signal_handler(gint signal, gpointer data)
{
- if (signal == SIGUSR1) {
- fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
+ switch (signal) {
+ case SIGUSR1:
+ ob_debug("Caught signal %d. Restarting.\n", signal);
ob_restart();
- } else if (signal == SIGUSR2) {
- fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
+ break;
+ case SIGUSR2:
+ ob_debug("Caught signal %d. Reconfiguring.\n", signal);
ob_reconfigure();
- } else {
- fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
+ break;
+ case SIGCHLD:
+ /* reap children */
+ while (waitpid(-1, NULL, WNOHANG) > 0);
+ break;
+ default:
+ ob_debug("Caught signal %d. Exiting.\n", signal);
/* TERM and INT return a 0 code */
ob_exit(!(signal == SIGTERM || signal == SIGINT));
}
static void print_version()
{
- g_print("Openbox %s\n\n", PACKAGE_VERSION);
+ g_print("Openbox %s\n", PACKAGE_VERSION);
+ g_print(_("Copyright (c)"));
+ g_print(" 2008 Mikael Magnusson\n");
+ g_print(_("Copyright (c)"));
+ 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");
static void print_help()
{
- print_version();
- g_print("Syntax: openbox [options]\n\n");
- g_print("Options:\n\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\n"
- " from\n");
-#endif
- g_print(" --replace Replace the currently running window "
- "manager\n");
- g_print(" --help Display this help and exit\n");
- g_print(" --version Display the version and exit\n");
- g_print(" --sync Run in synchronous mode (this is slow and\n"
- " meant for debugging X routines)\n");
- g_print(" --debug Display debugging output\n");
- g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
+ g_print(_("Syntax: openbox [options]\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(_(" --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"));
+ g_print(_(" --debug-focus Display debugging output for focus handling\n"));
+ g_print(_(" --debug-xinerama Split the display into fake xinerama screens\n"));
+ g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
+}
+
+static void remove_args(gint *argc, gchar **argv, gint index, gint num)
+{
+ gint 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");
}
-static void parse_args(int argc, char **argv)
+static void parse_args(gint *argc, gchar **argv)
{
- int i;
+ gint i;
- for (i = 1; i < argc; ++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 {
- g_printerr("Invalid option: '%s'\n\n", argv[i]);
- print_help();
- exit(1);
+ 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], "--debug-xinerama")) {
+ ob_debug_xinerama = TRUE;
+ }
+ else if (!strcmp(argv[i], "--reconfigure")) {
+ remote_control = 1;
+ }
+ 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 */
+ /* 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 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
+ (_("Invalid command line argument '%s'\n"), argv[i]);
+ ob_exit_with_error(err);
}
}
}
-void ob_exit_with_error(gchar *msg)
+static Cursor load_cursor(const gchar *name, guint fontval)
+{
+ Cursor c = None;
+
+#if USE_XCURSOR
+ c = XcursorLibraryLoadCursor(ob_display, name);
+#endif
+ if (c == None)
+ c = XCreateFontCursor(ob_display, fontval);
+ return c;
+}
+
+void ob_exit_with_error(const gchar *msg)
{
- g_critical(msg);
- session_shutdown();
+ g_message(msg);
+ session_shutdown(TRUE);
exit(EXIT_FAILURE);
}
ob_main_loop_exit(ob_main_loop);
}
+void ob_exit_replace()
+{
+ exitcode = 0;
+ being_replaced = TRUE;
+ ob_main_loop_exit(ob_main_loop);
+}
+
Cursor ob_cursor(ObCursor cursor)
{
g_assert(cursor < OB_NUM_CURSORS);