fix using uninit'd memory. don't use 0 keycode

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 53299873dfc7b94b6d7cf079a5ffae0b45eb4bad..db26f0d2582fe836c50e0e44a00374614e9eff14 100644 (file)
--- 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"
@@ -98,13 +99,14 @@ 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 */
@@ -114,16 +116,16 @@ 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);
 
+    program_name = g_path_get_basename(argv[0]);
+    g_set_prgname(program_name);
+
     if (!remote_control) {
         parse_paths_startup();
 
@@ -216,7 +218,7 @@ gint main(gint argc, gchar **argv)
     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 {
             {
                 ObParseInst *i;
@@ -281,6 +283,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 +341,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);
@@ -404,14 +408,14 @@ gint main(gint argc, gchar **argv)
 
         /* 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;
 }
@@ -463,9 +467,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"));
@@ -473,16 +474,6 @@ 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;
@@ -537,7 +528,8 @@ 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);
@@ -545,7 +537,8 @@ static void parse_args(gint *argc, gchar **argv)
             }
         } 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);
@@ -555,7 +548,16 @@ static void parse_args(gint *argc, gchar **argv)
             ob_sm_use = FALSE;
         }
 #endif
-        else {
+        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 {
             /* this is a memleak.. oh well.. heh */
             gchar *err = g_strdup_printf
                 ("Invalid command line argument '%s'\n", argv[i]);