add keyboard.[ch] to libobt. these are for tracking modifier keys, and translating...

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 24d05f867dfc9237992ba8e724d071c5c1698d82..fb19cbdfe76ad9528c796aff42b8b93d3c3f8973 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -21,7 +21,6 @@
 #include "openbox.h"
 #include "session.h"
 #include "dock.h"
-#include "modkeys.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -204,7 +203,7 @@ gint main(gint argc, gchar **argv)
 
     if (screen_annex()) { /* it will be ours! */
         do {
-            modkeys_startup(reconfigure);
+            if (reconfigure) obt_keyboard_reload();
 
             /* get the keycodes for keys we use */
             keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return);
@@ -262,7 +261,7 @@ gint main(gint argc, gchar **argv)
                     ob_exit_with_error(_("Unable to load a theme."));
 
                 OBT_PROP_SETS(RootWindow(obt_display, ob_screen),
-                              OB_THEME, ob_rr_theme->name);
+                              OB_THEME, utf8, ob_rr_theme->name);
             }
 
             if (reconfigure) {
@@ -359,7 +358,6 @@ gint main(gint argc, gchar **argv)
             event_shutdown(reconfigure);
             config_shutdown();
             actions_shutdown(reconfigure);
-            modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }