consistant glib type usage

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 73cc6e77821e8ce55323bfffe948521412ff2781..7c68e2a5d93b9bcbcbf357f88b5e7ab450295365 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   openbox.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "debug.h"
 #include "openbox.h"
 #include "session.h"
@@ -58,14 +76,15 @@ static ObState   state;
 static gboolean  xsync;
 static gboolean  reconfigure;
 static gboolean  restart;
-static char     *restart_path;
+static gchar    *restart_path;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
+static gint      exitcode = 0;
 
-static void signal_handler(int signal, gpointer data);
-static void parse_args(int argc, char **argv);
+static void signal_handler(gint signal, gpointer data);
+static void parse_args(gint argc, gchar **argv);
 
-int main(int argc, char **argv)
+gint main(gint argc, gchar **argv)
 {
 #ifdef DEBUG
     ob_debug_show_output(TRUE);
@@ -81,6 +100,8 @@ int main(int argc, char **argv)
     textdomain(PACKAGE_NAME);
 
     g_set_prgname(argv[0]);
+
+    chdir(g_get_home_dir());
      
     parse_paths_startup();
 
@@ -111,8 +132,6 @@ int main(int argc, char **argv)
     if (ob_rr_inst == NULL)
         ob_exit_with_error("Failed to initialize the render library.");
 
-    /* XXX fork self onto other screens */
-     
     XSynchronize(ob_display, xsync);
 
     /* check for locale support */
@@ -186,7 +205,7 @@ int main(int argc, char **argv)
                 if (parse_load_rc(&doc, &node))
                     parse_tree(i, doc, node->xmlChildrenNode);
                 /* we're done with parsing now, kill it */
-                xmlFreeDoc(doc);
+                parse_close(doc);
                 parse_shutdown(i);
             }
 
@@ -229,6 +248,7 @@ int main(int argc, char **argv)
             if (!reconfigure) {
                 /* get all the existing windows */
                 client_manage_all();
+                focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
             } else {
                 GList *it;
 
@@ -267,6 +287,8 @@ int main(int argc, char **argv)
         } while (reconfigure);
     }
 
+    XSync(ob_display, FALSE);
+
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
@@ -278,8 +300,8 @@ int main(int argc, char **argv)
 
     if (restart) {
         if (restart_path != NULL) {
-            int argcp;
-            char **argvp;
+            gint argcp;
+            gchar **argvp;
             GError *err = NULL;
 
             /* run other shit */
@@ -297,26 +319,28 @@ int main(int argc, char **argv)
         execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
     }
      
-    return 0;
+    return exitcode;
 }
 
-static void signal_handler(int signal, gpointer data)
+static void signal_handler(gint signal, gpointer data)
 {
     if (signal == SIGUSR1) {
-       fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
+        ob_debug("Caught signal %d. Restarting.\n", signal);
         ob_restart();
     } else if (signal == SIGUSR2) {
-       fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
+        ob_debug("Caught signal %d. Reconfiguring.\n", signal);
         ob_reconfigure();
     } else {
-       fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
-        ob_exit();
+        ob_debug("Caught signal %d. Exiting.\n", signal);
+        /* TERM and INT return a 0 code */
+        ob_exit(!(signal == SIGTERM || signal == SIGINT));
     }
 }
 
 static void print_version()
 {
-    g_print("Openbox %s\n\n", PACKAGE_VERSION);
+    g_print("Openbox %s\n", PACKAGE_VERSION);
+       g_print("Copyright (c) 2003 Ben Jansens, and others\n\n");
     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");
@@ -324,28 +348,28 @@ static void print_version()
 
 static void print_help()
 {
-    print_version();
     g_print("Syntax: openbox [options]\n\n");
     g_print("Options:\n\n");
 #ifdef USE_SM
     g_print("  --sm-disable        Disable connection to session manager\n");
     g_print("  --sm-client-id ID   Specify session management ID\n");
-    g_print("  --sm-save-file FILE Specify file to load a saved session\n"
-            "                      from\n");
+    g_print("  --sm-save-file FILE Specify file to load a saved session"
+            "from\n");
 #endif
     g_print("  --replace           Replace the currently running window "
             "manager\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\n"
-            "                      meant for debugging X routines)\n");
+    g_print("  --sync              Run in synchronous mode (this is slow and "
+            "meant for\n"
+                       "                      debugging X routines)\n");
     g_print("  --debug             Display debugging output\n");
-    g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
+    g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
 
-static void parse_args(int argc, char **argv)
+static void parse_args(gint argc, gchar **argv)
 {
-    int i;
+    gint i;
 
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--version")) {
@@ -386,17 +410,18 @@ void ob_restart_other(const gchar *path)
 void ob_restart()
 {
     restart = TRUE;
-    ob_exit();
+    ob_exit(0);
 }
 
 void ob_reconfigure()
 {
     reconfigure = TRUE;
-    ob_exit();
+    ob_exit(0);
 }
 
-void ob_exit()
+void ob_exit(gint code)
 {
+    exitcode = code;
     ob_main_loop_exit(ob_main_loop);
 }