[Xcb-commit] 2 commits - keysyms

[Julien Danjou]

 keysyms/keysyms.c     |   16 ++++++++--------
 keysyms/xcb_keysyms.h |   33 ++++++++++++++-------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

New commits:
commit 6cf9c8d121888d688464a1551342de3f9d6206f6
Author: Julien Danjou <julien at danjou.info>
Date:   Tue Dec 16 18:22:06 2008 +0100

    xcb_keysyms: remove xcb_lookup_t
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 2b46239..1202982 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -11,14 +11,6 @@ extern "C" {
 
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
-/* enumeration for col parameter? */
-enum {
-	xcb_lookup_none_t   = 1,
-	xcb_lookup_chars_t  = 2,
-	xcb_lookup_key_sym_t = 3,
-	xcb_lookup_both_t   = 4
-} xcb_lookup_t;
-
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
commit e9db47701cf7ce17c8ab03cc8cc3618bccba2026
Author: Julien Danjou <julien at danjou.info>
Date:   Tue Dec 16 18:21:41 2008 +0100

    Revert "keysyms: use xcb_key_lookup_t type for col paramter"
    
    This reverts commit 24da2934459c7811f77713a3c7aaa6691ad203f2.

diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c
index b6f6ab8..d1f1d52 100644
--- a/keysyms/keysyms.c
+++ b/keysyms/keysyms.c
@@ -185,8 +185,8 @@ rule that is satisfied from the following list:
 */
 
 xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t col)
+				  xcb_keycode_t     keycode,
+				  int            col)
 {
   xcb_keysym_t *keysyms;
   xcb_keysym_t  keysym_null = { XCB_NO_SYMBOL };
@@ -266,17 +266,17 @@ xcb_key_symbols_get_keycode (xcb_key_symbols_t *syms,
 }
 
 xcb_keysym_t
-xcb_key_press_lookup_keysym (xcb_key_symbols_t     *syms,
-                             xcb_key_press_event_t *event,
-                             xcb_key_lookup_t col)
+xcb_key_press_lookup_keysym (xcb_key_symbols_t    *syms,
+			 xcb_key_press_event_t *event,
+			 int               col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
 
 xcb_keysym_t
-xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                               xcb_key_release_event_t *event,
-                               xcb_key_lookup_t col)
+xcb_key_release_lookup_keysym (xcb_key_symbols_t      *syms,
+			   xcb_key_release_event_t *event,
+			   int                 col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 3b408e4..2b46239 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -3,41 +3,43 @@
 
 #include <xcb/xcb.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
 /* enumeration for col parameter? */
-typedef enum {
-        xcb_key_lookup_none_t    = 1,
-        xcb_key_lookup_chars_t   = 2,
-        xcb_key_lookup_key_sym_t = 3,
-        xcb_key_lookup_both_t    = 4
-} xcb_key_lookup_t;
+enum {
+	xcb_lookup_none_t   = 1,
+	xcb_lookup_chars_t  = 2,
+	xcb_lookup_key_sym_t = 3,
+	xcb_lookup_both_t   = 4
+} xcb_lookup_t;
 
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
 
-xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t  col);
+xcb_keysym_t      xcb_key_symbols_get_keysym    (xcb_key_symbols_t         *syms,
+					  xcb_keycode_t             keycode,
+					  int                    col);
 
 xcb_keycode_t     xcb_key_symbols_get_keycode   (xcb_key_symbols_t         *syms,
-                                          xcb_keysym_t              keysym);
+					  xcb_keysym_t              keysym);
 
-xcb_keysym_t xcb_key_press_lookup_keysym (xcb_key_symbols_t      *syms,
-                                          xcb_key_press_event_t  *event,
-                                          xcb_key_lookup_t       col);
+xcb_keysym_t      xcb_key_press_lookup_keysym   (xcb_key_symbols_t         *syms,
+					  xcb_key_press_event_t      *event,
+					  int                    col);
 
-xcb_keysym_t xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                                            xcb_key_release_event_t *event,
-                                            xcb_key_lookup_t        col);
+xcb_keysym_t      xcb_key_release_lookup_keysym (xcb_key_symbols_t         *syms,
+					  xcb_key_release_event_t    *event,
+					  int                    col);
 
 int            xcb_refresh_keyboard_mapping (xcb_key_symbols_t         *syms,
-                                          xcb_mapping_notify_event_t *event);
+					  xcb_mapping_notify_event_t *event);
 
 /* TODO:  need XLookupString equivalent */
 
@@ -62,4 +64,5 @@ int xcb_is_modifier_key      (xcb_keysym_t keysym);
 }
 #endif
 
+
 #endif /* __XCB_KEYSYMS_H__ */