Merge branch 'backport'

[chaz/openbox] / openbox / keyboard.h

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 1dfff6548e5e563b91e09e68fd28cf0d77382934..995cdbc5f0757ad0246a95bfd4023954732f20f5 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -34,6 +34,8 @@ extern KeyBindingTree *keyboard_firstnode;
 void keyboard_startup(gboolean reconfig);
 void keyboard_shutdown(gboolean reconfig);
 
+void keyboard_rebind();
+
 void keyboard_chroot(GList *keylist);
 gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
 void keyboard_unbind_all();
@@ -43,12 +45,4 @@ void keyboard_event(struct _ObClient *client, const XEvent *e);
  */
 void keyboard_reset_chains(gint break_chroots);
 
-gboolean keyboard_interactive_grab(guint state, struct _ObClient *client,
-                                   struct _ObActionsAct *action);
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           struct _ObClient **client);
-gboolean keyboard_interactively_grabbed();
-
-void keyboard_interactive_cancel();
-
 #endif