X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=aee2bcd6660407050f7a9e5dab3230622e0f8772;hb=f1f946ea02814bc06f23d6b402d3e901cce13ee1;hp=198d073599a22b2068e64c15453077257a97386d;hpb=740c8af41e77a0cf5a748a7530d19405ad6739c0;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 198d0735..aee2bcd6 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -38,6 +38,7 @@ #include "menuframe.h" #include "grab.h" #include "group.h" +#include "propwin.h" #include "config.h" #include "mainloop.h" #include "gettext.h" @@ -75,6 +76,10 @@ #include #endif +#include +#include + + RrInstance *ob_rr_inst; RrTheme *ob_rr_theme; ObMainLoop *ob_main_loop; @@ -96,10 +101,8 @@ static gint exitcode = 0; static guint remote_control = 0; static gboolean being_replaced = FALSE; static gchar *config_type = NULL; -static pid_t reconfigure_notify = 0; 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_args(gint *argc, gchar **argv); static Cursor load_cursor(const gchar *name, guint fontval); @@ -121,15 +124,12 @@ gint main(gint argc, gchar **argv) g_message(_("Unable to change to home directory '%s': %s"), g_get_home_dir(), g_strerror(errno)); - /* parse the environment first, it can change the argv[0] */ - parse_env(&argv[0]); + /* parse the command line args, which can change the argv[0] */ + parse_args(&argc, argv); program_name = g_path_get_basename(argv[0]); g_set_prgname(program_name); - /* parse the command line args */ - parse_args(&argc, argv); - if (!remote_control) { parse_paths_startup(); @@ -139,9 +139,9 @@ gint main(gint argc, gchar **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(); @@ -170,7 +170,7 @@ gint main(gint argc, gchar **argv) 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); @@ -205,32 +205,27 @@ 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(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(); @@ -267,7 +262,7 @@ 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.")); } if (reconfigure) { @@ -287,6 +282,7 @@ gint main(gint argc, gchar **argv) sn_startup(reconfigure); screen_startup(reconfigure); grab_startup(reconfigure); + propwin_startup(reconfigure); group_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); @@ -344,6 +340,7 @@ gint main(gint argc, gchar **argv) dock_shutdown(reconfigure); client_shutdown(reconfigure); group_shutdown(reconfigure); + propwin_shutdown(reconfigure); grab_shutdown(reconfigure); screen_shutdown(reconfigure); focus_shutdown(reconfigure); @@ -469,9 +466,6 @@ static void print_help() g_print(_(" --version Display the version and exit\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(_("\nDebugging options:\n")); g_print(_(" --sync Run in synchronous mode\n")); g_print(_(" --debug Display debugging output\n")); @@ -479,25 +473,11 @@ static void print_help() 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"); - - /* notify this application when openbox reconfigures */ - if ((c = getenv("OPENBOX_RECONFIGURE_NOTIFY_PID"))) - reconfigure_notify = (pid_t) atol(c); -} - 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; @@ -512,31 +492,41 @@ 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")) { + } + else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); ob_debug_enable(OB_DEBUG_SM, TRUE); ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); - } else if (!strcmp(argv[i], "--debug-focus")) { + } + 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], "--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")) { + } + else if (!strcmp(argv[i], "--config")) { if (i == *argc - 1) /* no args left */ g_printerr(_("--config requires an argument\n")); else { @@ -547,28 +537,35 @@ static void parse_args(gint *argc, gchar **argv) #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\n", + 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\n", ob_sm_id); } - } else if (!strcmp(argv[i], "--sm-disable")) { + } + else if (!strcmp(argv[i], "--sm-disable")) { ob_sm_use = FALSE; } #endif 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); } } @@ -588,7 +585,7 @@ static Cursor load_cursor(const gchar *name, guint fontval) void ob_exit_with_error(const gchar *msg) { - g_critical(msg); + g_message(msg); session_shutdown(TRUE); exit(EXIT_FAILURE); } @@ -607,9 +604,6 @@ void ob_restart() void ob_reconfigure() { - if (reconfigure_notify) - kill(reconfigure_notify, SIGUSR2); - reconfigure = TRUE; ob_exit(0); }