Commit cfd978b89dba8233434cf561378a71173de7e43c
2012-08-02T00:40:22
keyseq: use our own keysyms Instead of <X11/keysym.h> Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247
diff --git a/test/keyseq.c b/test/keyseq.c
index 3ca64a2..d7b7178 100644
--- a/test/keyseq.c
+++ b/test/keyseq.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <linux/input.h>
-#include <X11/keysym.h>
#include "xkbcommon/xkbcommon.h"
#include "test.h"
@@ -53,7 +52,7 @@ enum {
* + A sequence of keysyms that should result from this keypress.
*
* The vararg format is:
- * <KEY_*> <DOWN | UP | BOTH> <XK_* (zero or more)> <NEXT | FINISH>
+ * <KEY_*> <DOWN | UP | BOTH> <XKB_KEY_* (zero or more)> <NEXT | FINISH>
*
* See below for examples.
*/
@@ -143,135 +142,135 @@ main(void)
assert(keymap);
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_E, BOTH, XK_e, NEXT,
- KEY_L, BOTH, XK_l, NEXT,
- KEY_L, BOTH, XK_l, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_E, BOTH, XKB_KEY_e, NEXT,
+ KEY_L, BOTH, XKB_KEY_l, NEXT,
+ KEY_L, BOTH, XKB_KEY_l, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_LEFTSHIFT, UP, XK_Shift_L, NEXT,
- KEY_L, BOTH, XK_l, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_LEFTSHIFT, UP, XKB_KEY_Shift_L, NEXT,
+ KEY_L, BOTH, XKB_KEY_l, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
/* Base modifier cleared on key release... */
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_O, BOTH, XK_O, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_O, BOTH, XKB_KEY_O, FINISH));
/* ... But only by the keycode that set it. */
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_RIGHTSHIFT, UP, XK_Shift_R, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_O, BOTH, XK_O, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_RIGHTSHIFT, UP, XKB_KEY_Shift_R, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_O, BOTH, XKB_KEY_O, FINISH));
/*
* A base modifier should only be cleared when no other key affecting
* the modifier is down.
*/
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_RIGHTSHIFT, DOWN, XK_Shift_R, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_RIGHTSHIFT, UP, XK_Shift_R, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_LEFTSHIFT, UP, XK_Shift_L, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_RIGHTSHIFT, DOWN, XKB_KEY_Shift_R, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_RIGHTSHIFT, UP, XKB_KEY_Shift_R, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_LEFTSHIFT, UP, XKB_KEY_Shift_L, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
/* Group switching / locking. */
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_E, BOTH, XK_e, NEXT,
- KEY_COMPOSE, BOTH, XK_ISO_Next_Group, NEXT,
- KEY_K, BOTH, XK_hebrew_lamed, NEXT,
- KEY_F, BOTH, XK_hebrew_kaph, NEXT,
- KEY_COMPOSE, BOTH, XK_ISO_Next_Group, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_E, BOTH, XKB_KEY_e, NEXT,
+ KEY_COMPOSE, BOTH, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_K, BOTH, XKB_KEY_hebrew_lamed, NEXT,
+ KEY_F, BOTH, XKB_KEY_hebrew_kaph, NEXT,
+ KEY_COMPOSE, BOTH, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
assert(test_key_seq(keymap,
- KEY_LEFTSHIFT, DOWN, XK_Shift_L, NEXT,
- KEY_LEFTALT, DOWN, XK_ISO_Next_Group, NEXT,
- KEY_LEFTALT, UP, XK_ISO_Next_Group, NEXT,
- KEY_LEFTSHIFT, UP, XK_Shift_L, FINISH));
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
+ KEY_LEFTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_LEFTALT, UP, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_LEFTSHIFT, UP, XKB_KEY_Shift_L, FINISH));
assert(test_key_seq(keymap,
- KEY_LEFTALT, DOWN, XK_Alt_L, NEXT,
- KEY_LEFTSHIFT, DOWN, XK_ISO_Next_Group, NEXT,
- KEY_LEFTSHIFT, UP, XK_ISO_Next_Group, NEXT,
- KEY_LEFTALT, UP, XK_Alt_L, FINISH));
+ KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT,
+ KEY_LEFTSHIFT, DOWN, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_LEFTSHIFT, UP, XKB_KEY_ISO_Next_Group, NEXT,
+ KEY_LEFTALT, UP, XKB_KEY_Alt_L, FINISH));
/* Locked modifiers. */
assert(test_key_seq(keymap,
- KEY_CAPSLOCK, BOTH, XK_Caps_Lock, NEXT,
- KEY_H, BOTH, XK_H, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_O, BOTH, XK_O, FINISH));
+ KEY_CAPSLOCK, BOTH, XKB_KEY_Caps_Lock, NEXT,
+ KEY_H, BOTH, XKB_KEY_H, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_O, BOTH, XKB_KEY_O, FINISH));
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_E, BOTH, XK_e, NEXT,
- KEY_CAPSLOCK, BOTH, XK_Caps_Lock, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_CAPSLOCK, BOTH, XK_Caps_Lock, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_E, BOTH, XKB_KEY_e, NEXT,
+ KEY_CAPSLOCK, BOTH, XKB_KEY_Caps_Lock, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_CAPSLOCK, BOTH, XKB_KEY_Caps_Lock, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_CAPSLOCK, DOWN, XK_Caps_Lock, NEXT,
- KEY_E, BOTH, XK_E, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_L, BOTH, XK_L, NEXT,
- KEY_CAPSLOCK, UP, XK_Caps_Lock, NEXT,
- KEY_O, BOTH, XK_O, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_CAPSLOCK, DOWN, XKB_KEY_Caps_Lock, NEXT,
+ KEY_E, BOTH, XKB_KEY_E, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_L, BOTH, XKB_KEY_L, NEXT,
+ KEY_CAPSLOCK, UP, XKB_KEY_Caps_Lock, NEXT,
+ KEY_O, BOTH, XKB_KEY_O, FINISH));
assert(test_key_seq(keymap,
- KEY_H, BOTH, XK_h, NEXT,
- KEY_E, BOTH, XK_e, NEXT,
- KEY_CAPSLOCK, UP, XK_Caps_Lock, NEXT,
- KEY_L, BOTH, XK_l, NEXT,
- KEY_L, BOTH, XK_l, NEXT,
- KEY_O, BOTH, XK_o, FINISH));
+ KEY_H, BOTH, XKB_KEY_h, NEXT,
+ KEY_E, BOTH, XKB_KEY_e, NEXT,
+ KEY_CAPSLOCK, UP, XKB_KEY_Caps_Lock, NEXT,
+ KEY_L, BOTH, XKB_KEY_l, NEXT,
+ KEY_L, BOTH, XKB_KEY_l, NEXT,
+ KEY_O, BOTH, XKB_KEY_o, FINISH));
/*
* A key release affecting a locked modifier should clear it
* regardless of the key press.
*/
/* assert(test_key_seq(keymap, */
- /* KEY_H, BOTH, XK_h, NEXT, */
- /* KEY_CAPSLOCK, DOWN, XK_Caps_Lock, NEXT, */
- /* KEY_E, BOTH, XK_E, NEXT, */
- /* KEY_L, BOTH, XK_L, NEXT, */
- /* KEY_CAPSLOCK, UP, XK_Caps_Lock, NEXT, */
- /* KEY_L, BOTH, XK_L, NEXT, */
- /* KEY_CAPSLOCK, UP, XK_Caps_Lock, NEXT, */
- /* KEY_O, BOTH, XK_o, FINISH)); */
+ /* KEY_H, BOTH, XKB_KEY_h, NEXT, */
+ /* KEY_CAPSLOCK, DOWN, XKB_KEY_Caps_Lock, NEXT, */
+ /* KEY_E, BOTH, XKB_KEY_E, NEXT, */
+ /* KEY_L, BOTH, XKB_KEY_L, NEXT, */
+ /* KEY_CAPSLOCK, UP, XKB_KEY_Caps_Lock, NEXT, */
+ /* KEY_L, BOTH, XKB_KEY_L, NEXT, */
+ /* KEY_CAPSLOCK, UP, XKB_KEY_Caps_Lock, NEXT, */
+ /* KEY_O, BOTH, XKB_KEY_o, FINISH)); */
/* Simple Num Lock sanity check. */
assert(test_key_seq(keymap,
- KEY_KP1, BOTH, XK_KP_End, NEXT,
- KEY_NUMLOCK, BOTH, XK_Num_Lock, NEXT,
- KEY_KP1, BOTH, XK_KP_1, NEXT,
- KEY_KP2, BOTH, XK_KP_2, NEXT,
- KEY_NUMLOCK, BOTH, XK_Num_Lock, NEXT,
- KEY_KP2, BOTH, XK_KP_Down, FINISH));
+ KEY_KP1, BOTH, XKB_KEY_KP_End, NEXT,
+ KEY_NUMLOCK, BOTH, XKB_KEY_Num_Lock, NEXT,
+ KEY_KP1, BOTH, XKB_KEY_KP_1, NEXT,
+ KEY_KP2, BOTH, XKB_KEY_KP_2, NEXT,
+ KEY_NUMLOCK, BOTH, XKB_KEY_Num_Lock, NEXT,
+ KEY_KP2, BOTH, XKB_KEY_KP_Down, FINISH));
xkb_map_unref(keymap);
xkb_context_unref(ctx);