X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=04e07ab628fc1e8d73e70e2d30fbcfced47234bc;hb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;hp=4556fc8fcc677d94e40fb2274a632ad774750920;hpb=9a5f1d7b5e153b18dbc7f63263ed927bd5a2000b;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 4556fc8f..04e07ab6 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -19,9 +19,6 @@
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>
 #endif
@@ -35,6 +32,9 @@
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
 #include <X11/cursorfont.h>
 
@@ -46,10 +46,12 @@ gboolean ob_shutdown = FALSE;
 gboolean ob_restart  = FALSE;
 char    *ob_restart_path = NULL;
 gboolean ob_remote   = FALSE;
-gboolean ob_sync     = TRUE;
+gboolean ob_sync     = FALSE;
 Cursors  ob_cursors;
+char    *ob_rc_path  = NULL;
 
 void signal_handler(const ObEvent *e, void *data);
+void parse_args(int argc, char **argv);
 
 int main(int argc, char **argv)
 {
@@ -73,7 +75,7 @@ int main(int argc, char **argv)
     sigemptyset(&sigset);
     action.sa_handler = dispatch_signal;
     action.sa_mask = sigset;
-    action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
+    action.sa_flags = SA_NOCLDSTOP;
     sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
     sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
     sigaction(SIGSEGV, &action, (struct sigaction *) NULL);
@@ -86,8 +88,8 @@ int main(int argc, char **argv)
     /* anything that died while we were restarting won't give us a SIGCHLD */
     while (waitpid(-1, NULL, WNOHANG) > 0);
      
-    /* XXX parse out command line args */
-    (void)argc;(void)argv;
+    /* parse out command line args */
+    parse_args(argc, argv);
 
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL) {
@@ -145,6 +147,8 @@ int main(int argc, char **argv)
         plugin_open("focus");
         plugin_open("keyboard");
         plugin_open("mouse");
+        plugin_open("placement");
+        plugin_open("resistance");
 
 	/* get all the existing windows */
 	client_manage_all();
@@ -172,7 +176,26 @@ int main(int argc, char **argv)
 
     XCloseDisplay(ob_display);
 
-    /* XXX if (ob_restart) */
+    if (ob_restart) {
+        if (ob_restart_path != NULL) {
+            int argcp;
+            char **argvp;
+            GError *err = NULL;
+
+            /* run other shit */
+            if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) {
+                execvp(argvp[0], argvp);
+                g_strfreev(argvp);
+            } else {
+                g_warning("failed to execute '%s': %s", ob_restart_path,
+                          err->message);
+            }
+        }
+
+        /* re-run me */
+        execvp(argv[0], argv); /* try how we were run */
+        execlp(BINARY, BINARY, NULL); /* try this as a last resort */
+    }
      
     return 0;
 }
@@ -205,3 +228,50 @@ void signal_handler(const ObEvent *e, void *data)
 	g_error("Caught signal %d. Aborting and dumping core.", s);
     }
 }
+
+void print_version()
+{
+    g_print("Openbox %s\n\n", VERSION);
+    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");
+}
+
+void print_help()
+{
+    print_version();
+    g_print("Syntax: %s [options]\n\n", BINARY);
+    g_print("Options:\n\n");
+    g_print("  -rc PATH     Specify the path to the rc file to use\n");
+    g_print("  -help        Display this help and exit\n");
+    g_print("  -version     Display the version and exit\n");
+    g_print("  -sync        Run in synchronous mode (this is slow and meant\n"
+            "               for debugging X routines)\n");
+    g_print("\nPlease report bugs at %s\n", BUGURL);
+}
+
+void parse_args(int argc, char **argv)
+{
+    int i;
+
+    for (i = 1; i < argc; ++i) {
+        if (!strcmp(argv[i], "-version")) {
+            print_version();
+            exit(0);
+        } else if (!strcmp(argv[i], "-help")) {
+            print_help();
+            exit(0);
+        } else if (!strcmp(argv[i], "-sync")) {
+            ob_sync = TRUE;
+        } else if (!strcmp(argv[i], "-rc")) {
+            if (i == argc - 1) /* no args left */
+                g_printerr("-rc requires an argument\n");
+            else
+                ob_rc_path = argv[++i];
+        } else {
+            g_printerr("Invalid option: '%s'\n\n", argv[i]);
+            print_help();
+            exit(1);
+        }
+    }
+}