some changes to ConfigureRequest, based on what I found in FVWM.

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index dac9d2224378354f9e2f48d2072cc2d74ba0050c..2cd8958f51d2968580d9b1e2d86b4400005fa7d8 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -21,6 +21,7 @@
 #include "openbox.h"
 #include "session.h"
 #include "dock.h"
+#include "modkeys.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -111,7 +112,7 @@ gint main(gint argc, gchar **argv)
     g_set_prgname(argv[0]);
 
     if (chdir(g_get_home_dir()) == -1)
-        g_message(_("Unable to change to home directory (%s): %s"),
+        g_message(_("Unable to change to home directory '%s': %s"),
                   g_get_home_dir(), g_strerror(errno));
      
     /* parse out command line args */
@@ -136,7 +137,7 @@ gint main(gint argc, gchar **argv)
          * remote_control = 1 -> reconfigure 
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
-                 ob_control, remote_control, 0, 0, 0);
+                 openbox_control, remote_control, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(EXIT_SUCCESS);
     }
@@ -215,6 +216,8 @@ gint main(gint argc, gchar **argv)
                 xmlDocPtr doc;
                 xmlNodePtr node;
 
+                modkeys_startup(reconfigure);
+
                 /* startup the parsing so everything can register sections
                    of the rc */
                 i = parse_startup();
@@ -241,7 +244,8 @@ gint main(gint argc, gchar **argv)
                                         config_font_activewindow,
                                         config_font_inactivewindow,
                                         config_font_menutitle,
-                                        config_font_menuitem)))
+                                        config_font_menuitem,
+                                        config_font_osd)))
                 {
                     RrThemeFree(ob_rr_theme);
                     ob_rr_theme = theme;
@@ -319,6 +323,7 @@ gint main(gint argc, gchar **argv)
             window_shutdown(reconfigure);
             event_shutdown(reconfigure);
             config_shutdown();
+            modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }
 
@@ -436,8 +441,10 @@ static void parse_args(gint argc, gchar **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
+            ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
         } else if (!strcmp(argv[i], "--debug-focus")) {
             ob_debug_show_output(TRUE);
+            ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
             ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
         } else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;