X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fkeyboard.h;h=143921ff2fa927e667d40aa5792a32d08e9e6ad8;hb=7c2eb3a781b4434d243b3d135e3dc1ce288cf464;hp=a9029df39bd7337c7805778301078abcea7432fe;hpb=1124d1036984f920dcd5b2caec9ff8fe2d788b8a;p=chaz%2Fopenbox

diff --git a/obt/keyboard.h b/obt/keyboard.h
index a9029df3..143921ff 100644
--- a/obt/keyboard.h
+++ b/obt/keyboard.h
@@ -21,6 +21,7 @@
 
 #include <glib.h>
 #include <X11/Xlib.h>
+#include <X11/keysym.h>
 
 G_BEGIN_DECLS
 
@@ -40,7 +41,9 @@ typedef enum {
     OBT_KEYBOARD_NUM_MODKEYS
 } ObtModkeysKey;
 
-void obt_keyboard_reload();
+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)) */
@@ -54,16 +57,24 @@ guint obt_keyboard_only_modmasks(guint mask);
   right keys when there are both. */
 guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key);
 
-/*! Convert a KeySym to a KeyCode, because the X function is terrible - says
-  valgrind. */
-KeyCode obt_keyboard_keysym_to_keycode(KeySym sym);
+/*! Convert a KeySym to all the KeyCodes which generate it. */
+KeyCode* obt_keyboard_keysym_to_keycode(KeySym sym);
+
+/*! Translate a KeyPress event to the unicode character it represents */
+gunichar obt_keyboard_keypress_to_unichar(ObtIC *ic, XEvent *ev);
 
-/*! Give the string form of a KeyCode */
-gchar *obt_keyboard_keycode_to_string(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);
 
-/*! Translate a KeyCode to the unicode character it represents */
-gunichar obt_keyboard_keycode_to_unichar(guint keycode);
+/*! 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);
 
 G_END_DECLS