Update copyright notice in --version output

[dana/openbox.git] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index fb43b97..a7eb6a2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -46,6 +46,8 @@
 #include "obrender/render.h"
 #include "obrender/theme.h"
 #include "obt/display.h"
+#include "obt/xqueue.h"
+#include "obt/signal.h"
 #include "obt/prop.h"
 #include "obt/keyboard.h"
 #include "obt/xml.h"
@@ -83,7 +85,7 @@
 RrInstance   *ob_rr_inst;
 RrImageCache *ob_rr_icons;
 RrTheme      *ob_rr_theme;
-ObtMainLoop  *ob_main_loop;
+GMainLoop    *ob_main_loop;
 gint          ob_screen;
 gboolean      ob_replace_wm = FALSE;
 gboolean      ob_sm_use = TRUE;
@@ -116,6 +118,8 @@ gint main(gint argc, gchar **argv)
 {
     gchar *program_name;
 
+    obt_signal_listen();
+
     ob_set_state(OB_STATE_STARTING);
 
     ob_debug_startup();
@@ -157,18 +161,19 @@ gint main(gint argc, gchar **argv)
         exit(EXIT_SUCCESS);
     }
 
-    ob_main_loop = obt_main_loop_new();
+    ob_main_loop = g_main_loop_new(NULL, FALSE);
 
-    /* set up signal handler */
-    obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler,  NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler,  NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGTTIN, signal_handler, NULL,NULL);
-    obt_main_loop_signal_add(ob_main_loop, SIGTTOU, signal_handler, NULL,NULL);
+    /* set up signal handlers, they are called from the mainloop
+       in the main program's thread */
+    obt_signal_add_callback(SIGUSR1, signal_handler, NULL);
+    obt_signal_add_callback(SIGUSR2, signal_handler, NULL);
+    obt_signal_add_callback(SIGTERM, signal_handler, NULL);
+    obt_signal_add_callback(SIGINT,  signal_handler, NULL);
+    obt_signal_add_callback(SIGHUP,  signal_handler, NULL);
+    obt_signal_add_callback(SIGPIPE, signal_handler, NULL);
+    obt_signal_add_callback(SIGCHLD, signal_handler, NULL);
+    obt_signal_add_callback(SIGTTIN, signal_handler, NULL);
+    obt_signal_add_callback(SIGTTOU, signal_handler, NULL);
 
     ob_screen = DefaultScreen(obt_display);
 
@@ -191,7 +196,7 @@ gint main(gint argc, gchar **argv)
 
     /* set the DISPLAY environment variable for any lauched children, to the
        display we're using, so they open in the right place. */
-    setenv("DISPLAY", DisplayString(obt_display), TRUE);
+    g_setenv("DISPLAY", DisplayString(obt_display), TRUE);
 
     /* create available cursors */
     cursors[OB_CURSOR_NONE] = None;
@@ -253,8 +258,7 @@ gint main(gint argc, gchar **argv)
                     gchar *p = g_filename_to_utf8(config_file, -1,
                                                   NULL, NULL, NULL);
                     if (p)
-                        OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE,
-                                      utf8, p);
+                        OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, p);
                     g_free(p);
                 }
                 else
@@ -281,8 +285,8 @@ gint main(gint argc, gchar **argv)
                 if (ob_rr_theme == NULL)
                     ob_exit_with_error(_("Unable to load a theme."));
 
-                OBT_PROP_SETS(obt_root(ob_screen),
-                              OB_THEME, utf8, ob_rr_theme->name);
+                OBT_PROP_SETS(obt_root(ob_screen), OB_THEME,
+                              ob_rr_theme->name);
             }
 
             if (reconfigure) {
@@ -316,6 +320,10 @@ gint main(gint argc, gchar **argv)
             menu_startup(reconfigure);
             prompt_startup(reconfigure);
 
+            /* do this after everything is started so no events will get
+               missed */
+            xqueue_listen();
+
             if (!reconfigure) {
                 guint32 xid;
                 ObWindow *w;
@@ -347,11 +355,11 @@ gint main(gint argc, gchar **argv)
                 }
             }
 
-            reconfigure = FALSE;
-
             ob_set_state(OB_STATE_RUNNING);
 
-            if (startup_cmd) run_startup_cmd();
+            if (!reconfigure && startup_cmd) run_startup_cmd();
+
+            reconfigure = FALSE;
 
             /* look for parsing errors */
             {
@@ -367,7 +375,7 @@ gint main(gint argc, gchar **argv)
                 }
             }
 
-            obt_main_loop_run(ob_main_loop);
+            g_main_loop_run(ob_main_loop);
             ob_set_state(reconfigure ?
                          OB_STATE_RECONFIGURING : OB_STATE_EXITING);
 
@@ -415,6 +423,7 @@ gint main(gint argc, gchar **argv)
 
     if (restart) {
         ob_debug_shutdown();
+        obt_signal_stop();
         if (restart_path != NULL) {
             gint argcp;
             gchar **argvp;
@@ -468,8 +477,10 @@ gint main(gint argc, gchar **argv)
     g_free(ob_sm_id);
     g_free(program_name);
 
-    if (!restart)
+    if (!restart) {
         ob_debug_shutdown();
+        obt_signal_stop();
+    }
 
     return exitcode;
 }
@@ -504,9 +515,9 @@ static void print_version(void)
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
     g_print(_("Copyright (c)"));
-    g_print(" 2008        Mikael Magnusson\n");
+    g_print(" 2008-2011   Mikael Magnusson\n");
     g_print(_("Copyright (c)"));
-    g_print(" 2003-2006   Dana Jansens\n\n");
+    g_print(" 2003-2011   Dana Jansens\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");
@@ -578,12 +589,12 @@ static void parse_env(void)
     const gchar *id;
 
     /* unset this so we don't pass it on unknowingly */
-    unsetenv("DESKTOP_STARTUP_ID");
+    g_unsetenv("DESKTOP_STARTUP_ID");
 
     /* this is how gnome-session passes in a session client id */
     id = g_getenv("DESKTOP_AUTOSTART_ID");
     if (id) {
-        unsetenv("DESKTOP_AUTOSTART_ID");
+        g_unsetenv("DESKTOP_AUTOSTART_ID");
         if (ob_sm_id) g_free(ob_sm_id);
         ob_sm_id = g_strdup(id);
         ob_debug_type(OB_DEBUG_SM,
@@ -618,7 +629,7 @@ static void parse_args(gint *argc, gchar **argv)
         }
         else if (!strcmp(argv[i], "--startup")) {
             if (i == *argc - 1) /* no args left */
-                g_printerr(_("--startup requires an argument\n"));
+                g_printerr(_("%s requires an argument\n"), "--startup");
             else {
                 /* this will be in the current locale encoding, which is
                    what we want */
@@ -652,7 +663,7 @@ static void parse_args(gint *argc, gchar **argv)
         }
         else if (!strcmp(argv[i], "--config-file")) {
             if (i == *argc - 1) /* no args left */
-                g_printerr(_("--config-file requires an argument\n"));
+                g_printerr(_("%s requires an argument\n"), "--config-file");
             else {
                 /* this will be in the current locale encoding, which is
                    what we want */
@@ -741,14 +752,14 @@ void ob_reconfigure(void)
 void ob_exit(gint code)
 {
     exitcode = code;
-    obt_main_loop_exit(ob_main_loop);
+    g_main_loop_quit(ob_main_loop);
 }
 
 void ob_exit_replace(void)
 {
     exitcode = 0;
     being_replaced = TRUE;
-    obt_main_loop_exit(ob_main_loop);
+    g_main_loop_quit(ob_main_loop);
 }
 
 Cursor ob_cursor(ObCursor cursor)