Merge branch 'master' into chaz

[chaz/openbox] / openbox / keyboard.h

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 464606b263c43930f0fcaf7fad4c55d6e7726575..c89f67e941f084439f988c576c240318d228dc08 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -1,13 +1,48 @@
-#ifndef __keyboard_h
-#define __keyboard_h
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   keyboard.h for the Openbox window manager
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#ifndef ob__keybaord_h
+#define ob__keybaord_h
+
+#include "keytree.h"
+#include "frame.h"
 
 #include <glib.h>
+#include <X11/Xlib.h>
+
+struct _ObClient;
+struct _ObActionsAct;
+
+extern KeyBindingTree *keyboard_firstnode;
+
+void keyboard_startup(gboolean reconfig);
+void keyboard_shutdown(gboolean reconfig);
 
-void keyboard_startup();
-void keyboard_shutdown();
+void keyboard_rebind(void);
 
-guint keyboard_translate_modifier(char *str);
+void keyboard_chroot(GList *keylist);
+gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
+void keyboard_unbind_all(void);
 
-void keyboard_event(XKeyEvent *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);
 
 #endif