Merge branch 'master' into chaz

[chaz/openbox] / openbox / keyboard.h

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 3d70448f4655c9215421087a6cede97a0b3c0b52..c89f67e941f084439f988c576c240318d228dc08 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -27,28 +27,22 @@
 #include <X11/Xlib.h>
 
 struct _ObClient;
-struct _ObAction;
+struct _ObActionsAct;
 
 extern KeyBindingTree *keyboard_firstnode;
 
 void keyboard_startup(gboolean reconfig);
 void keyboard_shutdown(gboolean reconfig);
 
+void keyboard_rebind(void);
+
 void keyboard_chroot(GList *keylist);
-gboolean keyboard_bind(GList *keylist, ObAction *action);
-void keyboard_unbind_all();
+gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
+void keyboard_unbind_all(void);
 
-void keyboard_event(struct _ObClient *client, const XEvent *e);
+gboolean keyboard_event(struct _ObClient *client, const XEvent *e);
 /*! @param break_chroots how many chroots to break. -1 means to break them ALL!
  */
 void keyboard_reset_chains(gint break_chroots);
 
-gboolean keyboard_interactive_grab(guint state, struct _ObClient *client,
-                                   struct _ObAction *action);
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           struct _ObClient **client);
-gboolean keyboard_interactively_grabbed();
-
-void keyboard_interactive_cancel();
-
 #endif