ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/keyboard.C
(Generate patch)

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.2 by root, Sun Jan 16 18:05:37 2005 UTC vs.
Revision 1.16 by root, Fri Apr 22 02:09:39 2005 UTC

1#include "../config.h" 1#include "../config.h"
2#include "rxvt.h" 2#include "rxvt.h"
3
4#ifdef KEYSYM_RESOURCE
5
6#include <cstring>
7
3#include "keyboard.h" 8#include "keyboard.h"
4#include "command.h" 9#include "command.h"
5#include <string.h>
6#include <X11/X.h>
7 10
8#ifdef KEYSYM_RESOURCE 11/* an intro to the data structure:
12 *
13 * vector keymap[] is grouped.
14 *
15 * inside each group, elements are sorted by the criteria given by compare_priority().
16 * the lookup of keysym is done in two steps:
17 * 1) locate the group corresponds to the keysym;
18 * 2) do a linear search inside the group.
19 *
20 * array hash[] effectively defines a map from a keysym to a group in keymap[].
21 *
22 * each group has its address(the index of first group element in keymap[]),
23 * which is computed and stored in hash[].
24 * hash[] stores the addresses in the form of:
25 * index: 0 I1 I2 I3 In
26 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
27 * where
28 * A1 = 0;
29 * Ai+1 = N1 + N2 + ... + Ni.
30 * it is computed from hash_budget_size[]:
31 * index: 0 I1 I2 I3 In
32 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0
33 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[])
34 * or we can say
35 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0,
36 * where
37 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym }
38 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
39 * n(the number of groups) = the number of non-zero member of hash_budget_size[];
40 * Ni(the size of group i) = hash_budget_size[Ii].
41 */
9 42
43#if STOCK_KEYMAP
10//////////////////////////////////////////////////////////////////////////////// 44////////////////////////////////////////////////////////////////////////////////
11// default keycode translation map and keyevent handlers 45// default keycode translation map and keyevent handlers
12 46
13keysym_t keyboard_manager::stock_keymap[] = { 47keysym_t keyboard_manager::stock_keymap[] = {
14 /* examples */ 48 /* examples */
15 /* keysym, state, range, handler, str */ 49 /* keysym, state, range, handler, str */
16//{XK_ISO_Left_Tab, 0, 1, NORMAL, "\033[Z"}, 50//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"},
17//{ 'a', 0, 26, RANGE_META8, "a" "%c"}, 51//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
18//{ 'a', ControlMask, 26, RANGE_META8, "" "%c"}, 52//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
19//{ XK_Left, 0, 4, LIST, "DACBZ" "\033[Z"}, 53//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
20//{ XK_Left, ShiftMask, 4, LIST, "dacbZ" "\033[Z"}, 54//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
21//{ XK_Left, ControlMask, 4, LIST, "dacbZ" "\033OZ"}, 55//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
22//{ XK_Tab, ControlMask, 1, NORMAL, "\033<C-Tab>"}, 56//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"},
23//{ XK_apostrophe, ControlMask, 1, NORMAL, "\033<C-'>"}, 57//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"},
24//{ XK_slash, ControlMask, 1, NORMAL, "\033<C-/>"}, 58//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"},
25//{ XK_semicolon, ControlMask, 1, NORMAL, "\033<C-;>"}, 59//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"},
26//{ XK_grave, ControlMask, 1, NORMAL, "\033<C-`>"}, 60//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"},
27//{ XK_comma, ControlMask, 1, NORMAL, "\033<C-\054>"}, 61//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"},
28//{ XK_Return, ControlMask, 1, NORMAL, "\033<C-Return>"}, 62//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"},
29//{ XK_Return, ShiftMask, 1, NORMAL, "\033<S-Return>"}, 63//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"},
30//{ ' ', ShiftMask, 1, NORMAL, "\033<S-Space>"}, 64//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"},
31//{ '.', ControlMask, 1, NORMAL, "\033<C-.>"}, 65//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"},
32//{ '0', ControlMask, 10, RANGE, "0" "\033<C-%c>"}, 66//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
33//{ '0', MetaMask|ControlMask, 10, RANGE, "0" "\033<M-C-%c>"}, 67//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
34//{ 'a', MetaMask|ControlMask, 26, RANGE, "a" "\033<M-C-%c>"}, 68//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
35}; 69};
70#endif
36 71
37static void 72static void
38output_string (rxvt_term *rt, const char *str) 73output_string (rxvt_term *rt, const char *str)
39{ 74{
40 assert (rt && str);
41
42 if (strncmp (str, "proto:", 6) == 0) 75 if (strncmp (str, "command:", 8) == 0)
43 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6); 76 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8);
44 else 77 else
45 rt->tt_write ((unsigned char *)str, strlen (str)); 78 rt->tt_write ((unsigned char *)str, strlen (str));
46} 79}
47 80
48static void 81static void
… …
57 *ch |= 0x80; 90 *ch |= 0x80;
58 } 91 }
59 else if (rt->meta_char == C0_ESC) /* escape prefix */ 92 else if (rt->meta_char == C0_ESC) /* escape prefix */
60#endif 93#endif
61 { 94 {
62 const unsigned char 95 const unsigned char ch = C0_ESC;
63 ch = C0_ESC;
64 rt->tt_write (&ch, 1); 96 rt->tt_write (&ch, 1);
65 } 97 }
66 } 98 }
67 99
68 rt->tt_write ((unsigned char *) buf, buflen); 100 rt->tt_write ((unsigned char *) buf, buflen);
69} 101}
70 102
71static int 103static int
72format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) 104format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
73{ 105{
74 int len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]); 106 size_t len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]);
75 107
76 if (len >= bufsize) 108 if (len >= (size_t)bufsize)
77 {
78 fprintf (stderr, "buffer overflowed!\n");
79 buf[bufsize - 1] = '\0';
80 } 109 {
81 else if (len < 0) 110 rxvt_warn ("format_keyrange_string: formatting failed, ignoring key.\n");
82 { 111 *buf = 0;
83 perror ("keyrange_translator()");
84 } 112 }
85 113
86 return len; 114 return len;
87} 115}
88 116
89//////////////////////////////////////////////////////////////////////////////// 117////////////////////////////////////////////////////////////////////////////////
90// return: #bits of '1' 118// return: #bits of '1'
119#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
120# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
121#else
91static int 122static int
92bitcount (unsigned int n) 123bitcount (uint16_t n)
93{ 124{
94 int i; 125 int i;
95 126
96 for (i = 0; n; ++i, n &= (n - 1)) 127 for (i = 0; n; ++i, n &= n - 1)
97 ; 128 ;
98 129
99 return i; 130 return i;
100} 131}
132#endif
101 133
102// return: priority_of_a - priority_of_b 134// return: priority_of_a - priority_of_b
103static int 135static int
104compare_priority (keysym_t *a, keysym_t *b) 136compare_priority (keysym_t *a, keysym_t *b)
105{ 137{
106 assert (a && b);
107
108 // (the more '1's in state; the less range): the greater priority 138 // (the more '1's in state; the less range): the greater priority
109 int ca = bitcount (a->state /* & OtherModMask */); 139 int ca = bitcount (a->state /* & OtherModMask */);
110 int cb = bitcount (b->state /* & OtherModMask */); 140 int cb = bitcount (b->state /* & OtherModMask */);
111 141
112 if (ca != cb) 142 if (ca != cb)
… …
119 149
120//////////////////////////////////////////////////////////////////////////////// 150////////////////////////////////////////////////////////////////////////////////
121keyboard_manager::keyboard_manager () 151keyboard_manager::keyboard_manager ()
122{ 152{
123 keymap.reserve (256); 153 keymap.reserve (256);
124 hash[0] = 1; // hash[0] != 0 indicates uninitialized data 154 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
125} 155}
126 156
127keyboard_manager::~keyboard_manager () 157keyboard_manager::~keyboard_manager ()
128{ 158{
129 clear (); 159 clear ();
… …
157// the string 'trans' is copied to an internal managed buffer, 187// the string 'trans' is copied to an internal managed buffer,
158// so the caller can free memory of 'trans' at any time. 188// so the caller can free memory of 'trans' at any time.
159void 189void
160keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 190keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
161{ 191{
162 assert (trans);
163
164 keysym_t *key = new keysym_t; 192 keysym_t *key = new keysym_t;
165 wchar_t *wc = rxvt_mbstowcs (trans); 193 wchar_t *wc = rxvt_mbstowcs (trans);
166 const char *translation = rxvt_wcstoutf8 (wc); 194 const char *translation = rxvt_wcstoutf8 (wc);
167 free (wc); 195 free (wc);
168 196
… …
185 key->range = suffix - middle - 1; 213 key->range = suffix - middle - 1;
186 214
187 strcpy (translation, translation + 4); 215 strcpy (translation, translation + 4);
188 } 216 }
189 else 217 else
190 {
191 key->range = 1;
192 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 218 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
193 } 219 }
194 } 220 else if (strncmp (translation, "builtin:", 8) == 0)
195 else 221 key->type = keysym_t::BUILTIN;
196 222
197 user_keymap.push_back (key); 223 user_keymap.push_back (key);
198 user_translations.push_back (translation); 224 user_translations.push_back (translation);
199 register_keymap (key); 225 register_keymap (key);
200 } 226 }
… …
207} 233}
208 234
209void 235void
210keyboard_manager::register_keymap (keysym_t *key) 236keyboard_manager::register_keymap (keysym_t *key)
211{ 237{
212 assert (key);
213 assert (key->range >= 1);
214
215 if (keymap.size () == keymap.capacity ()) 238 if (keymap.size () == keymap.capacity ())
216 keymap.reserve (keymap.size () * 2); 239 keymap.reserve (keymap.size () * 2);
217 240
218 keymap.push_back (key); 241 keymap.push_back (key);
219 hash[0] = 3; 242 hash[0] = 3;
220} 243}
221 244
222void 245void
223keyboard_manager::register_done () 246keyboard_manager::register_done ()
224{ 247{
248#if STOCK_KEYMAP
225 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 249 int n = sizeof (stock_keymap) / sizeof (keysym_t);
226 250
251 //TODO: shield against repeated calls and empty keymap
227 if (keymap.back () != &stock_keymap[n - 1]) 252 //if (keymap.back () != &stock_keymap[n - 1])
228 for (i = 0; i < n; ++i) 253 for (int i = 0; i < n; ++i)
229 register_keymap (&stock_keymap[i]); 254 register_keymap (&stock_keymap[i]);
255#endif
230 256
231 purge_duplicate_keymap (); 257 purge_duplicate_keymap ();
232
233#if TO_BE_DONE_INSIDE_dispatch
234 for (i = 0; i < keymap.size (); ++i)
235 {
236 keysym_t *key = keymap[i];
237
238 assert (bitcount (term_->ModMetaMask) == 1 && "call me after ModMetaMask was set!");
239
240 if (key->state & MetaMask)
241 {
242 //key->state &= ~MetaMask;
243 key->state |= term_->ModMetaMask;
244 }
245
246 assert (bitcount (term_->ModNumLockMask) == 1 && "call me after ModNumLockMask was set!");
247
248 if (key->state & NumLockMask)
249 {
250 //key->state &= ~NumLockMask;
251 key->state |= term_->ModNumLockMask;
252 }
253 }
254#endif
255 258
256 setup_hash (); 259 setup_hash ();
257} 260}
258 261
259bool 262bool
260keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 263keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
261{ 264{
262 assert (hash[0] == 0 && "register_done() need to be called"); 265 assert (hash[0] == 0 && "register_done() need to be called");
263 266
267 state &= OtherModMask; // mask out uninteresting modifiers
268
269 if (state & term->ModMetaMask) state |= MetaMask;
270 if (state & term->ModNumLockMask) state |= NumLockMask;
271 if (state & term->ModLevel3Mask) state |= Level3Mask;
272
273 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
274 state |= AppKeypadMask;
275
264 int index = find_keysym (keysym, state); 276 int index = find_keysym (keysym, state);
265 277
266 if (index >= 0) 278 if (index >= 0)
267 { 279 {
268 assert (term && keymap [index]);
269 const keysym_t &key = *keymap [index]; 280 const keysym_t &key = *keymap [index];
270 281
282 if (key.type != keysym_t::BUILTIN)
283 {
271 int keysym_offset = keysym - key.keysym; 284 int keysym_offset = keysym - key.keysym;
272 285
273 wchar_t *wc = rxvt_utf8towcs (key.str); 286 wchar_t *wc = rxvt_utf8towcs (key.str);
274 char *str = rxvt_wcstombs (wc); 287 char *str = rxvt_wcstombs (wc);
275 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 288 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
276 free (wc); 289 free (wc);
277 290
278 switch (key.type) 291 switch (key.type)
279 {
280 case keysym_t::NORMAL:
281 output_string (term, str);
282 break;
283
284 case keysym_t::RANGE:
285 { 292 {
293 case keysym_t::NORMAL:
294 output_string (term, str);
295 break;
296
297 case keysym_t::RANGE:
298 {
286 char buf[STRING_MAX]; 299 char buf[STRING_MAX];
287 300
288 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 301 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
302 output_string (term, buf);
303 }
304 break;
305
306 case keysym_t::RANGE_META8:
307 {
308 int len;
309 char buf[STRING_MAX];
310
311 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
312 if (len > 0)
313 output_string_meta8 (term, state, buf, len);
314 }
315 break;
316
317 case keysym_t::LIST:
318 {
319 char buf[STRING_MAX];
320
321 char *prefix, *middle, *suffix;
322
323 prefix = str;
324 middle = strchr (prefix + 1, *prefix);
325 suffix = strrchr (middle + 1, *prefix);
326
327 memcpy (buf, prefix + 1, middle - prefix - 1);
328 buf [middle - prefix - 1] = middle [keysym_offset + 1];
329 strcpy (buf + (middle - prefix), suffix + 1);
330
289 output_string (term, buf); 331 output_string (term, buf);
332 }
333 break;
290 } 334 }
291 break;
292 335
293 case keysym_t::RANGE_META8:
294 {
295 int len;
296 char buf[STRING_MAX];
297
298 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
299 if (len > 0)
300 output_string_meta8 (term, state, buf, len);
301 }
302 break;
303
304 case keysym_t::LIST:
305 {
306 char buf[STRING_MAX];
307
308 char *prefix, *middle, *suffix;
309
310 prefix = str;
311 middle = strchr (prefix + 1, *prefix);
312 suffix = strrchr (middle + 1, *prefix);
313
314 memcpy (buf, prefix + 1, middle - prefix - 1);
315 buf [middle - prefix - 1] = middle [keysym_offset + 1];
316 strcpy (buf + (middle - prefix), suffix + 1);
317
318 output_string (term, buf);
319 }
320 break;
321 }
322
323 free (str); 336 free (str);
324 337
325 return true; 338 return true;
326 } 339 }
327 else
328 { 340 }
329 // fprintf(stderr,"[%x:%x]",state,keysym); 341
330 return false; 342 return false;
331 }
332} 343}
333 344
334// purge duplicate keymap entries 345// purge duplicate keymap entries
335void keyboard_manager::purge_duplicate_keymap () 346void keyboard_manager::purge_duplicate_keymap ()
336{ 347{
337 for (unsigned int i = 0; i < keymap.size (); ++i) 348 for (unsigned int i = 0; i < keymap.size (); ++i)
338 { 349 {
339 for (unsigned int j = 0; j < i; ++j) 350 for (unsigned int j = 0; j < i; ++j)
340 { 351 {
341 if (keymap[i] == keymap[j]) 352 if (keymap [i] == keymap [j])
342 { 353 {
343 while (keymap[i] == keymap.back ()) 354 while (keymap [i] == keymap.back ())
344 keymap.pop_back (); 355 keymap.pop_back ();
345 356
346 if (i < keymap.size ()) 357 if (i < keymap.size ())
347 { 358 {
348 keymap[i] = keymap.back (); 359 keymap[i] = keymap.back ();
349 keymap.pop_back (); 360 keymap.pop_back ();
350 } 361 }
362
351 break; 363 break;
352 } 364 }
353 } 365 }
354 } 366 }
355} 367}
… …
363 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 375 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
364 376
365 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 377 memset (hash_budget_size, 0, sizeof (hash_budget_size));
366 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 378 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
367 379
368 // count keysyms for corresponding hash budgets 380 // determine hash bucket size
369 for (i = 0; i < keymap.size (); ++i) 381 for (i = 0; i < keymap.size (); ++i)
382 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
370 { 383 {
371 assert (keymap[i]);
372 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 384 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
373 ++hash_budget_size[hashkey]; 385 ++hash_budget_size [hashkey];
374 }
375
376 // keysym A with range>1 is counted one more time for
377 // every keysym B lies in its range
378 for (i = 0; i < keymap.size (); ++i)
379 {
380 if (keymap[i]->range > 1)
381 {
382 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
383 {
384 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK);
385 if (hash_budget_size[hashkey])
386 ++hash_budget_size[hashkey];
387 }
388 } 386 }
389 }
390 387
391 // now we know the size of each budget 388 // now we know the size of each budget
392 // compute the index of each budget 389 // compute the index of each budget
393 hash[0] = 0; 390 hash [0] = 0;
394 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 391 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
395 { 392 {
396 index += hash_budget_size[i - 1]; 393 index += hash_budget_size [i - 1];
397 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]); 394 hash [i] = index;
398 } 395 }
399 396
400 // and allocate just enough space 397 // and allocate just enough space
401 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
402 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size[i - 1], 0); 398 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
403 399
404 // fill in sorted_keymap 400 // fill in sorted_keymap
405 // it is sorted in each budget 401 // it is sorted in each budget
406 for (i = 0; i < keymap.size (); ++i) 402 for (i = 0; i < keymap.size (); ++i)
407 {
408 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 403 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
409 { 404 {
410 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 405 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
411 406
412 if (hash_budget_size[hashkey])
413 {
414 index = hash[hashkey] + hash_budget_counter[hashkey]; 407 index = hash [hashkey] + hash_budget_counter [hashkey];
415 408
416 while (index > hash[hashkey] 409 while (index > hash [hashkey]
417 && compare_priority (keymap[i], sorted_keymap[index - 1]) > 0) 410 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
418 { 411 {
419 sorted_keymap[index] = sorted_keymap[index - 1]; 412 sorted_keymap [index] = sorted_keymap [index - 1];
420 --index; 413 --index;
421 } 414 }
422 415
423 sorted_keymap[index] = keymap[i]; 416 sorted_keymap [index] = keymap [i];
424 ++hash_budget_counter[hashkey]; 417 ++hash_budget_counter [hashkey];
425 }
426 } 418 }
427 }
428 419
429 keymap.swap (sorted_keymap); 420 keymap.swap (sorted_keymap);
430 421
431#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 422#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
432 // check for invariants 423 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 424 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
434 { 425 {
435 index = hash[i]; 426 index = hash[i];
436 for (int j = 0; j < hash_budget_size[i]; ++j) 427 for (int j = 0; j < hash_budget_size [i]; ++j)
437 { 428 {
438 if (keymap[index + j]->range == 1) 429 if (keymap [index + j]->range == 1)
439 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 430 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 431
441 if (j) 432 if (j)
442 assert (compare_priority (keymap[index + j - 1], 433 assert (compare_priority (keymap [index + j - 1],
443 keymap[index + j]) >= 0); 434 keymap [index + j]) >= 0);
444 } 435 }
445 } 436 }
446 437
447 // this should be able to detect most possible bugs 438 // this should be able to detect most possible bugs
448 for (i = 0; i < sorted_keymap.size (); ++i) 439 for (i = 0; i < sorted_keymap.size (); ++i)
449 { 440 {
450 keysym_t *a = sorted_keymap[i]; 441 keysym_t *a = sorted_keymap[i];
451 for (int j = 0; j < a->range; ++j) 442 for (int j = 0; j < a->range; ++j)
452 { 443 {
453 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 444 int index = find_keysym (a->keysym + j, a->state);
445
454 assert (index >= 0); 446 assert (index >= 0);
455 keysym_t *b = keymap[index]; 447 keysym_t *b = keymap [index];
456 assert (i == (signed) index || // the normally expected result 448 assert (i == (signed) index || // the normally expected result
457 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same 449 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same or a closer match
458 } 450 }
459 } 451 }
460#endif 452#endif
461} 453}
462 454
463int 455int
464keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 456keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
465{ 457{
466 int hashkey = keysym & KEYSYM_HASH_MASK; 458 int hashkey = keysym & KEYSYM_HASH_MASK;
467 unsigned int index = hash [hashkey]; 459 unsigned int index = hash [hashkey];
460 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
461 ? hash [hashkey + 1]
462 : keymap.size ();
468 463
469 for (; index < keymap.size (); ++index) 464 for (; index < end; ++index)
470 { 465 {
471 keysym_t *key = keymap[index]; 466 keysym_t *key = keymap [index];
472 assert (key);
473 467
474 if (key->keysym <= keysym && key->keysym + key->range > keysym 468 if (key->keysym <= keysym && keysym < key->keysym + key->range
475 // match only the specified bits in state and ignore others 469 // match only the specified bits in state and ignore others
476 && (key->state & OtherModMask) == (key->state & state)) 470 && (key->state & state) == key->state)
477 return index; 471 return index;
478 else if (key->keysym > keysym && key->range == 1)
479 return -1;
480 } 472 }
481 473
482 return -1; 474 return -1;
483} 475}
484 476

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines