X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=18d9884d8f0dcc831a1dfab869cefc8e2bc6037e;hb=6194acb2710554a95090811eb6a4897fb7ee1a60;hp=633796418f26c499c49a9153ec0108f4a295178a;hpb=1bf9de380991206d4afa104cd31c567583f288c2;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 63379641..18d9884d 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; @@ -98,32 +103,33 @@ static gboolean being_replaced = FALSE; static gchar *config_type = 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_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 environment and command line args */ - 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); + if (!remote_control) { parse_paths_startup(); @@ -199,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()) { /* 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(); @@ -281,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); @@ -338,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); @@ -379,31 +382,39 @@ gint main(gint argc, gchar **argv) } /* we remove the session arguments from argv, so put them back */ - if (ob_sm_save_file != NULL) { - guint l = g_strv_length(argv); - argv = g_renew(gchar*, argv, l+2); - argv[l] = g_strdup("--sm-save-file"); - argv[l+1] = ob_sm_save_file; - argv[l+2] = NULL; - } - if (ob_sm_id != NULL) { - guint l = g_strv_length(argv); - argv = g_renew(gchar*, argv, l+2); - argv[l] = g_strdup("--sm-client-id"); - argv[l+1] = ob_sm_id; - argv[l+2] = NULL; + 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; } /* 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); return exitcode; } @@ -455,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")); @@ -465,21 +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"); -} - 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; @@ -494,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 { @@ -529,21 +537,28 @@ 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