X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fkeyboard.h;h=868cccf48d9922afbbc69fbb6c6723de609ceccf;hb=aa15563feeee03d7748e7d5279decf60db23fda9;hp=d166faa4988d193087974a7e1341cb6d5312412e;hpb=8f1ea42bb147e2a65cf43dfe7aea864d01faedcd;p=chaz%2Fopenbox

diff --git a/obt/keyboard.h b/obt/keyboard.h
index d166faa4..868cccf4 100644
--- a/obt/keyboard.h
+++ b/obt/keyboard.h
@@ -21,12 +21,14 @@
 
 #include <glib.h>
 #include <X11/Xlib.h>
+#include <X11/keysym.h>
 
 G_BEGIN_DECLS
 
 /*! These keys are bound to the modifier masks in any fashion,
   except for CapsLock, Shift, and Control. */
 typedef enum {
+    OBT_KEYBOARD_MODKEY_NONE,
     OBT_KEYBOARD_MODKEY_CAPSLOCK,
     OBT_KEYBOARD_MODKEY_NUMLOCK,
     OBT_KEYBOARD_MODKEY_SCROLLLOCK,
@@ -44,9 +46,10 @@ typedef struct _ObtIC ObtIC;
 
 void obt_keyboard_reload(void);
 
-/*! Get the modifier mask(s) for a KeyCode. (eg. a keycode bound to Alt_L could
-  return a mask of (Mod1Mask | Mask3Mask)) */
-guint obt_keyboard_keycode_to_modmask(guint keycode);
+/*! Get the modifier mask(s) for a keyboard event.
+  (eg. a keycode bound to Alt_L could return a mask of (Mod1Mask | Mask3Mask))
+*/
+guint obt_keyboard_keyevent_to_modmask(XEvent *e);
 
 /*! Strip off all modifiers except for the modifier keys. This strips stuff
   like Button1Mask, and also LockMask, NumlockMask, and ScrolllockMask */
@@ -56,17 +59,24 @@ guint obt_keyboard_only_modmasks(guint mask);
   right keys when there are both. */
 guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key);
 
+/*! Get the modifier key which was pressed or released in a keyboard event */
+ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e);
+
 /*! Convert a KeySym to all the KeyCodes which generate it. */
 KeyCode* obt_keyboard_keysym_to_keycode(KeySym sym);
 
-/*! Give the string form of a KeyCode */
-gchar *obt_keyboard_keycode_to_string(guint keycode);
+/*! Translate a KeyPress event to the unicode character it represents */
+gunichar obt_keyboard_keypress_to_unichar(ObtIC *ic, XEvent *ev);
 
-/*! Translate a KeyCode to the unicode character it represents */
-gunichar obt_keyboard_keycode_to_unichar(guint keycode);
+/*! Translate a KeyPress event to the KeySym that it represents.  Use this
+ for control keys, not for getting text input! */
+KeySym obt_keyboard_keypress_to_keysym(XEvent *ev);
 
-/*! Create an input context for a window */
-ObtIC* obt_keyboard_context_new(Window w);
+/*! Create an input context for a window.
+    @client The top-level client window for the input context.
+    @focus The subwindow within the client for the input context.
+*/
+ObtIC* obt_keyboard_context_new(Window client, Window focus);
 
 void obt_keyboard_context_ref(ObtIC *ic);
 void obt_keyboard_context_unref(ObtIC *ic);