Merge branch 'master' into chaz

[chaz/openbox] / openbox / keyboard.h

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 6ea1881d87731de6e7cd32c28dbf2336f69bd74e..c89f67e941f084439f988c576c240318d228dc08 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keyboard.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,25 +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);
 
-gboolean keyboard_bind(GList *keylist, ObAction *action);
-void keyboard_unbind_all();
+void keyboard_rebind(void);
 
-void keyboard_event(struct _ObClient *client, const XEvent *e);
-void keyboard_reset_chains();
+void keyboard_chroot(GList *keylist);
+gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
+void keyboard_unbind_all(void);
 
-void keyboard_interactive_grab(guint state, struct _ObClient *client,
-                               struct _ObAction *action);
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           struct _ObClient **client);
-gboolean keyboard_interactive_grab_in_progress();
-
-void keyboard_grab_for_client(struct _ObClient *c, gboolean grab);
+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);
 
 #endif