X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=80f81594aeaa9c18ce16ad05ec9b0da007403115;hb=76464a604ee2999b00b806be25722f7fcac1cd9c;hp=53299873dfc7b94b6d7cf079a5ffae0b45eb4bad;hpb=58b79ed35fe0c93509ebee979623b25075c411d7;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 53299873..80f81594 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -21,29 +21,33 @@ #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 "menuframe.h" #include "grab.h" #include "group.h" #include "config.h" -#include "mainloop.h" +#include "ping.h" #include "gettext.h" -#include "parser/parse.h" #include "render/render.h" #include "render/theme.h" +#include "obt/display.h" +#include "obt/prop.h" +#include "obt/keyboard.h" +#include "obt/parse.h" #ifdef HAVE_FCNTL_H # include @@ -75,15 +79,19 @@ #include #endif -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; +#include +#include + +RrInstance *ob_rr_inst; +RrTheme *ob_rr_theme; +ObtMainLoop *ob_main_loop; +gint ob_screen; +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 = FALSE; @@ -95,18 +103,22 @@ static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; static guint remote_control = 0; static gboolean being_replaced = FALSE; -static gchar *config_type = NULL; +static gchar *config_file = NULL; static void signal_handler(gint signal, gpointer data); -static void parse_env(char **argv0); 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; + ob_debug_startup(); + /* initialize the locale */ if (!setlocale(LC_ALL, "")) g_message("Couldn't set locale from environment."); @@ -114,59 +126,48 @@ gint main(gint argc, gchar **argv) 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 environment and command line args */ - parse_env(&argv[0]); + /* parse the command line args, which can change the argv[0] */ parse_args(&argc, argv); + /* parse the environment variables */ + parse_env(); - if (!remote_control) { - parse_paths_startup(); + program_name = g_path_get_basename(argv[0]); + g_set_prgname(program_name); + if (!remote_control) session_startup(argc, argv); - } - - ob_display = XOpenDisplay(NULL); - if (ob_display == NULL) - ob_exit_with_error("Failed to open the display."); - if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) - ob_exit_with_error("Failed to set display as close-on-exec."); + if (!obt_display_open(NULL)) + ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable.")); if (remote_control) { - 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), - openbox_control, remote_control, 0, 0, 0); - XCloseDisplay(ob_display); + OBT_PROP_MSG(ob_screen, obt_root(ob_screen), + OB_CONTROL, remote_control, 0, 0, 0, 0); + obt_display_close(obt_display); exit(EXIT_SUCCESS); } - ob_main_loop = ob_main_loop_new(ob_display); + ob_main_loop = obt_main_loop_new(); /* set up signal handler */ - ob_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL, NULL); - ob_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL, NULL); - ob_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL, NULL); - 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); + obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL); + obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL); - ob_screen = DefaultScreen(ob_display); + ob_screen = DefaultScreen(obt_display); - ob_rr_inst = RrInstanceNew(ob_display, ob_screen); + ob_rr_inst = RrInstanceNew(obt_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); + XSynchronize(obt_display, xsync); /* check for locale support */ if (!XSupportsLocale()) @@ -174,17 +175,15 @@ gint main(gint argc, gchar **argv) if (!XSetLocaleModifiers("")) 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(obt_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", @@ -199,58 +198,63 @@ gint main(gint argc, gchar **argv) 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! */ do { - { - ObParseInst *i; - xmlDocPtr doc; - xmlNodePtr node; + if (reconfigure) obt_keyboard_reload(); + + /* get the keycodes for keys we use */ + keys[OB_KEY_RETURN] = obt_keyboard_keysym_to_keycode(XK_Return); + keys[OB_KEY_ESCAPE] = obt_keyboard_keysym_to_keycode(XK_Escape); + keys[OB_KEY_LEFT] = obt_keyboard_keysym_to_keycode(XK_Left); + keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right); + keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up); + keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down); - modkeys_startup(reconfigure); + { + ObtParseInst *i; /* startup the parsing so everything can register sections of the rc */ - i = parse_startup(); + i = obt_parse_instance_new(); + /* 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(config_type, &doc, &node)) { - parse_tree(i, doc, node->xmlChildrenNode); - parse_close(doc); - } else + if ((config_file && + obt_parse_load_file(i, config_file, "openbox_config")) || + obt_parse_load_config_file(i, "openbox", "rc.xml", + "openbox_config")) + { + obt_parse_tree_from_root(i); + obt_parse_close(i); + } + 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), - openbox_config, config_type); + if (config_file) { + gchar *p = g_filename_to_utf8(config_file, -1, + NULL, NULL, NULL); + if (p) + OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, + utf8, p); + g_free(p); + } + else + OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE); /* we're done with parsing now, kill it */ - parse_shutdown(i); + obt_parse_instance_unref(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, @@ -261,7 +265,10 @@ gint main(gint argc, gchar **argv) 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.")); + + OBT_PROP_SETS(obt_root(ob_screen), + OB_THEME, utf8, ob_rr_theme->name); } if (reconfigure) { @@ -276,33 +283,36 @@ gint main(gint argc, gchar **argv) 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_startup(reconfigure); menu_frame_startup(reconfigure); + menu_startup(reconfigure); if (!reconfigure) { guint32 xid; ObWindow *w; /* get all the existing windows */ - client_manage_all(); + window_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)) + if (OBT_PROP_GET32(obt_root(ob_screen), + NET_ACTIVE_WINDOW, WINDOW, &xid) && + (w = window_find(xid)) && WINDOW_IS_CLIENT(w)) { client_focus(WINDOW_AS_CLIENT(w)); } @@ -312,53 +322,57 @@ gint main(gint argc, gchar **argv) /* 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); } } reconfigure = FALSE; state = OB_STATE_RUNNING; - ob_main_loop_run(ob_main_loop); + obt_main_loop_run(ob_main_loop); state = OB_STATE_EXITING; - if (!reconfigure) { - dock_remove_all(); - client_unmanage_all(); - } + if (!reconfigure) + window_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); 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(); - modkeys_shutdown(reconfigure); + actions_shutdown(reconfigure); } while (reconfigure); } - XSync(ob_display, FALSE); + XSync(obt_display, FALSE); RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); session_shutdown(being_replaced); - XCloseDisplay(ob_display); - - parse_paths_shutdown(); + obt_display_close(obt_display); if (restart) { if (restart_path != NULL) { @@ -378,12 +392,13 @@ gint main(gint argc, gchar **argv) } } - /* 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); @@ -398,21 +413,23 @@ gint main(gint argc, gchar **argv) 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]), - (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(config_type); - + g_free(program_name); + + ob_debug_shutdown(); + return exitcode; } @@ -420,19 +437,19 @@ static void signal_handler(gint signal, gpointer data) { switch (signal) { case SIGUSR1: - ob_debug("Caught signal %d. Restarting.\n", signal); + ob_debug("Caught signal %d. Restarting.", signal); ob_restart(); break; case SIGUSR2: - ob_debug("Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); + ob_debug("Caught signal %d. Reconfiguring.", signal); + ob_reconfigure(); break; case SIGCHLD: /* reap children */ while (waitpid(-1, NULL, WNOHANG) > 0); break; default: - ob_debug("Caught signal %d. Exiting.\n", signal); + ob_debug("Caught signal %d. Exiting.", signal); /* TERM and INT return a 0 code */ ob_exit(!(signal == SIGTERM || signal == SIGINT)); } @@ -442,9 +459,9 @@ static void print_version() { 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"); @@ -454,46 +471,41 @@ static void print_help() { g_print(_("Syntax: openbox [options]\n")); g_print(_("\nOptions:\n")); - g_print(_(" --config TYPE Specify the configuration profile to use\n")); -#ifdef USE_SM - g_print(_(" --sm-disable Disable connection to the session manager\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(_(" --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(_("\nOptions for internal use:\n")); - g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n")); - g_print(_(" --sm-client-id ID Specify session management ID\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-session Display debugging output for session managment\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 parse_env(gchar **argv0) -{ - const char *c; - - /* pretend we are this other application */ - if ((c = getenv("OPENBOX_RESTART_BINARY"))) - *argv0 = g_strdup(c); - unsetenv("OPENBOX_RESTART_BINARY"); -} - static void remove_args(gint *argc, gchar **argv, gint index, gint num) { gint i; - for (i = index; i < index + num; ++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(gint *argc, gchar **argv) { gint i; @@ -502,63 +514,95 @@ static void parse_args(gint *argc, gchar **argv) 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")) { - ob_debug_show_output(TRUE); - ob_debug_enable(OB_DEBUG_SM, TRUE); + } + else if (!strcmp(argv[i], "--debug")) { + ob_debug_enable(OB_DEBUG_NORMAL, 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); + } + else if (!strcmp(argv[i], "--debug-focus")) { + ob_debug_enable(OB_DEBUG_NORMAL, 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-session")) { + ob_debug_enable(OB_DEBUG_NORMAL, TRUE); + ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); + ob_debug_enable(OB_DEBUG_SM, TRUE); + } + 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")) { + } + else if (!strcmp(argv[i], "--restart")) { remote_control = 2; -*/ - } else if (!strcmp(argv[i], "--config")) { + } + else if (!strcmp(argv[i], "--exit")) { + remote_control = 3; + } + else if (!strcmp(argv[i], "--config-file")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--config requires an argument\n")); + /* not translated cuz it's sekret */ + g_printerr(_("--config-file requires an argument\n")); else { - config_type = g_strdup(argv[i+1]); - ++i; + /* 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); } } -#ifdef USE_SM else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--sm-save-file requires an argument\n")); + /* 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", + ob_sm_save_file); } - } else if (!strcmp(argv[i], "--sm-client-id")) { + } + else if (!strcmp(argv[i], "--sm-client-id")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--sm-client-id requires an argument\n")); + /* 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", ob_sm_id); } - } else if (!strcmp(argv[i], "--sm-disable")) { + } + else if (!strcmp(argv[i], "--sm-disable")) { ob_sm_use = FALSE; } -#endif + 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]); + (_("Invalid command line argument '%s'\n"), argv[i]); ob_exit_with_error(err); } } @@ -569,16 +613,16 @@ static Cursor load_cursor(const gchar *name, guint fontval) Cursor c = None; #if USE_XCURSOR - c = XcursorLibraryLoadCursor(ob_display, name); + c = XcursorLibraryLoadCursor(obt_display, name); #endif if (c == None) - c = XCreateFontCursor(ob_display, fontval); + c = XCreateFontCursor(obt_display, fontval); return c; } void ob_exit_with_error(const gchar *msg) { - g_critical(msg); + g_message(msg); session_shutdown(TRUE); exit(EXIT_FAILURE); } @@ -604,14 +648,14 @@ void ob_reconfigure() void ob_exit(gint code) { exitcode = code; - ob_main_loop_exit(ob_main_loop); + obt_main_loop_exit(ob_main_loop); } void ob_exit_replace() { exitcode = 0; being_replaced = TRUE; - ob_main_loop_exit(ob_main_loop); + obt_main_loop_exit(ob_main_loop); } Cursor ob_cursor(ObCursor cursor)