X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fkeyboard.h;h=4fb60186fb2491f2542ca31b8ca4916d81a04c00;hb=7cf9f174db6df032d3addb0c4153c17ff377fde7;hp=348433fbbaabd5aea9fca23b502067097497a96f;hpb=1aac72bc4cfffdd816347d305624b15d0ae2112e;p=chaz%2Fopenbox

diff --git a/obt/keyboard.h b/obt/keyboard.h
index 348433fb..4fb60186 100644
--- a/obt/keyboard.h
+++ b/obt/keyboard.h
@@ -27,20 +27,20 @@ G_BEGIN_DECLS
 /*! These keys are bound to the modifier masks in any fashion,
   except for CapsLock, Shift, and Control. */
 typedef enum {
-    OBT_MODKEY_KEY_CAPSLOCK,
-    OBT_MODKEY_KEY_NUMLOCK,
-    OBT_MODKEY_KEY_SCROLLLOCK,
-    OBT_MODKEY_KEY_SHIFT,
-    OBT_MODKEY_KEY_CONTROL,
-    OBT_MODKEY_KEY_SUPER,
-    OBT_MODKEY_KEY_HYPER,
-    OBT_MODKEY_KEY_META,
-    OBT_MODKEY_KEY_ALT,
-
-    OBT_MODKEY_NUM_KEYS
+    OBT_KEYBOARD_MODKEY_CAPSLOCK,
+    OBT_KEYBOARD_MODKEY_NUMLOCK,
+    OBT_KEYBOARD_MODKEY_SCROLLLOCK,
+    OBT_KEYBOARD_MODKEY_SHIFT,
+    OBT_KEYBOARD_MODKEY_CONTROL,
+    OBT_KEYBOARD_MODKEY_SUPER,
+    OBT_KEYBOARD_MODKEY_HYPER,
+    OBT_KEYBOARD_MODKEY_META,
+    OBT_KEYBOARD_MODKEY_ALT,
+
+    OBT_KEYBOARD_NUM_MODKEYS
 } ObtModkeysKey;
 
-void obt_keyboard_reload();
+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,12 +54,11 @@ 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);
 
 /*! Give the string form of a KeyCode */
-const gchar *obt_keyboard_keycode_to_string(guint keycode);
+gchar *obt_keyboard_keycode_to_string(guint keycode);
 
 /*! Translate a KeyCode to the unicode character it represents */
 gunichar obt_keyboard_keycode_to_unichar(guint keycode);