X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=aee2bcd6660407050f7a9e5dab3230622e0f8772;hb=f1f946ea02814bc06f23d6b402d3e901cce13ee1;hp=db26f0d2582fe836c50e0e44a00374614e9eff14;hpb=851555348ec39a01a0e150d2e12b71212b8d338b;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index db26f0d2..aee2bcd6 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -76,6 +76,10 @@ #include #endif +#include +#include + + RrInstance *ob_rr_inst; RrTheme *ob_rr_theme; ObMainLoop *ob_main_loop; @@ -135,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(); @@ -166,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); @@ -201,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(); @@ -263,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) { @@ -478,7 +477,7 @@ 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; @@ -493,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 { @@ -534,8 +543,11 @@ static void parse_args(gint *argc, gchar **argv) 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 */ /* not translated cuz it's sekret */ g_printerr("--sm-client-id requires an argument\n"); @@ -543,24 +555,17 @@ static void parse_args(gint *argc, gchar **argv) 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 if (!strcmp(argv[i], "--restart-binary")) { - if (i == *argc - 1) /* no args left */ - /* not translated cuz it's sekret */ - g_printerr("--restart-binary requires an argument\n"); - else { - argv[0] = g_strdup(argv[i+1]); - remove_args(argc, argv, i, 2); - --i; /* this arg was removed so go back */ - } - } else { + 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); } } @@ -580,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); }