Merge branch 'backport'

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 014199dc3779cf9bb9dd5110ea4813ad5afb7b60..a6a81cef7dec11e813e67f9ac8dd5d3b23b0fd1d 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -41,6 +41,7 @@
 #include "group.h"
 #include "config.h"
 #include "ping.h"
+#include "prompt.h"
 #include "gettext.h"
 #include "render/render.h"
 #include "render/theme.h"
@@ -209,6 +210,8 @@ gint main(gint argc, gchar **argv)
             keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right);
             keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up);
             keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down);
+            keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab);
+            keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space);
 
             {
                 ObtParseInst *i;
@@ -293,6 +296,7 @@ gint main(gint argc, gchar **argv)
             grab_startup(reconfigure);
             group_startup(reconfigure);
             ping_startup(reconfigure);
+            prompt_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
             moveresize_startup(reconfigure);
@@ -349,6 +353,7 @@ gint main(gint argc, gchar **argv)
             moveresize_shutdown(reconfigure);
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
+            prompt_shutdown(reconfigure);
             ping_shutdown(reconfigure);
             group_shutdown(reconfigure);
             grab_shutdown(reconfigure);