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.13 by root, Thu Feb 24 13:01:01 2005 UTC vs.
Revision 1.36 by sf-exg, Mon Aug 23 16:06:44 2010 UTC

1/*----------------------------------------------------------------------*
2 * File: keyboard.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/
23
1#include "../config.h" 24#include "../config.h"
2#include "rxvt.h" 25#include "rxvt.h"
3 26
4#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
5 28
6#include <cstring> 29#include <cstring>
7 30
31#include "rxvtperl.h"
8#include "keyboard.h" 32#include "keyboard.h"
9#include "command.h" 33#include "command.h"
10 34
11/* an intro to the data structure: 35/* an intro to the data structure:
12 * 36 *
… …
25 * index: 0 I1 I2 I3 In 49 * index: 0 I1 I2 I3 In
26 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An 50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
27 * where 51 * where
28 * A1 = 0; 52 * A1 = 0;
29 * Ai+1 = N1 + N2 + ... + Ni. 53 * Ai+1 = N1 + N2 + ... + Ni.
30 * it is computed from hash_budget_size[]: 54 * it is computed from hash_bucket_size[]:
31 * index: 0 I1 I2 I3 In 55 * index: 0 I1 I2 I3 In
32 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0 56 * 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[]) 57 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
34 * or we can say 58 * or we can say
35 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0, 59 * hash_bucket_size[Ii] = Ni; hash_bucket_size[elsewhere] = 0,
36 * where 60 * where
37 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym } 61 * 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 62 * 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[]; 63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[];
40 * Ni(the size of group i) = hash_budget_size[Ii]. 64 * Ni(the size of group i) = hash_bucket_size[Ii].
41 */ 65 */
42 66
43#if STOCK_KEYMAP 67#if STOCK_KEYMAP
44//////////////////////////////////////////////////////////////////////////////// 68////////////////////////////////////////////////////////////////////////////////
45// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
46 70
47keysym_t keyboard_manager::stock_keymap[] = { 71keysym_t keyboard_manager::stock_keymap[] = {
48 /* examples */ 72 /* examples */
49 /* keysym, state, range, handler, str */ 73 /* keysym, state, range, type, str */
50//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
51//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
52//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
53//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
54//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
55//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
56//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
57//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
58//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
59//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
60//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
61//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
62//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
63//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
64//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
65//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
66//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
67//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 91//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
68//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, 92//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
69}; 93};
70#endif 94#endif
71 95
72static void 96static void
73output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
74{ 98{
75 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
76 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); 100 rt->cmd_write (str + 8, strlen (str) - 8);
101 else if (strncmp (str, "perl:", 5) == 0)
102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
77 else 103 else
78 rt->tt_write ((unsigned char *)str, strlen (str)); 104 rt->tt_write (str, strlen (str));
79} 105}
80 106
81static void 107static void
82output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen) 108output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen)
83{ 109{
… …
90 *ch |= 0x80; 116 *ch |= 0x80;
91 } 117 }
92 else if (rt->meta_char == C0_ESC) /* escape prefix */ 118 else if (rt->meta_char == C0_ESC) /* escape prefix */
93#endif 119#endif
94 { 120 {
95 const unsigned char ch = C0_ESC; 121 const char ch = C0_ESC;
96 rt->tt_write (&ch, 1); 122 rt->tt_write (&ch, 1);
97 } 123 }
98 } 124 }
99 125
100 rt->tt_write ((unsigned char *) buf, buflen); 126 rt->tt_write (buf, buflen);
101} 127}
102 128
103static int 129static int
104format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) 130format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
105{ 131{
… …
111 *buf = 0; 137 *buf = 0;
112 } 138 }
113 139
114 return len; 140 return len;
115} 141}
116
117////////////////////////////////////////////////////////////////////////////////
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
122static int
123bitcount (uint16_t n)
124{
125 int i;
126
127 for (i = 0; n; ++i, n &= n - 1)
128 ;
129
130 return i;
131}
132#endif
133 142
134// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
135static int 144static int
136compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
137{ 146{
138 // (the more '1's in state; the less range): the greater priority 147 // (the more '1's in state; the less range): the greater priority
139 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
140 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
141 150
142 if (ca != cb) 151 if (ca != cb)
143 return ca - cb; 152 return ca - cb;
144//else if (a->state != b->state) // this behavior is to be disscussed 153//else if (a->state != b->state) // this behavior is to be discussed
145// return b->state - a->state; 154// return b->state - a->state;
146 else 155 else
147 return b->range - a->range; 156 return b->range - a->range;
148} 157}
149 158
… …
189void 198void
190keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 199keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
191{ 200{
192 keysym_t *key = new keysym_t; 201 keysym_t *key = new keysym_t;
193 wchar_t *wc = rxvt_mbstowcs (trans); 202 wchar_t *wc = rxvt_mbstowcs (trans);
194 const char *translation = rxvt_wcstoutf8 (wc); 203 char *translation = rxvt_wcstoutf8 (wc);
195 free (wc); 204 free (wc);
196 205
197 if (key && translation) 206 if (key && translation)
198 { 207 {
199 key->keysym = keysym; 208 key->keysym = keysym;
200 key->state = state; 209 key->state = state;
201 key->range = 1; 210 key->range = 1;
202 key->str = translation; 211 key->str = translation;
203 key->type = keysym_t::NORMAL; 212 key->type = keysym_t::STRING;
204 213
205 if (strncmp (translation, "list", 4) == 0 && translation [4]) 214 if (strncmp (translation, "list", 4) == 0 && translation [4])
206 { 215 {
207 char *middle = strchr (translation + 5, translation [4]); 216 char *middle = strchr (translation + 5, translation [4]);
208 char *suffix = strrchr (translation + 5, translation [4]); 217 char *suffix = strrchr (translation + 5, translation [4]);
209 218
210 if (suffix && middle && suffix > middle + 1) 219 if (suffix && middle && suffix > middle + 1)
211 { 220 {
212 key->type = keysym_t::LIST; 221 key->type = keysym_t::LIST;
213 key->range = suffix - middle - 1; 222 key->range = suffix - middle - 1;
214 223
215 strcpy (translation, translation + 4); 224 memmove (translation, translation + 4, strlen (translation + 4) + 1);
216 } 225 }
217 else 226 else
218 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 227 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
219 } 228 }
229 else if (strncmp (translation, "builtin:", 8) == 0)
230 key->type = keysym_t::BUILTIN;
220 231
221 user_keymap.push_back (key); 232 user_keymap.push_back (key);
222 user_translations.push_back (translation); 233 user_translations.push_back (translation);
223 register_keymap (key); 234 register_keymap (key);
224 } 235 }
… …
260bool 271bool
261keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 272keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
262{ 273{
263 assert (hash[0] == 0 && "register_done() need to be called"); 274 assert (hash[0] == 0 && "register_done() need to be called");
264 275
276 state &= OtherModMask; // mask out uninteresting modifiers
277
265 if (state & term->ModMetaMask) state |= MetaMask; 278 if (state & term->ModMetaMask) state |= MetaMask;
266 if (state & term->ModNumLockMask) state |= NumLockMask; 279 if (state & term->ModNumLockMask) state |= NumLockMask;
267 if (state & term->ModLevel3Mask) state |= Level3Mask; 280 if (state & term->ModLevel3Mask) state |= Level3Mask;
268 281
269 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 282 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
… …
273 286
274 if (index >= 0) 287 if (index >= 0)
275 { 288 {
276 const keysym_t &key = *keymap [index]; 289 const keysym_t &key = *keymap [index];
277 290
291 if (key.type != keysym_t::BUILTIN)
292 {
278 int keysym_offset = keysym - key.keysym; 293 int keysym_offset = keysym - key.keysym;
279 294
280 wchar_t *wc = rxvt_utf8towcs (key.str); 295 wchar_t *wc = rxvt_utf8towcs (key.str);
281 char *str = rxvt_wcstombs (wc); 296 char *str = rxvt_wcstombs (wc);
282 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 297 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
283 free (wc); 298 free (wc);
284 299
285 switch (key.type) 300 switch (key.type)
286 {
287 case keysym_t::NORMAL:
288 output_string (term, str);
289 break;
290
291 case keysym_t::RANGE:
292 { 301 {
302 case keysym_t::STRING:
303 output_string (term, str);
304 break;
305
306 case keysym_t::RANGE:
307 {
293 char buf[STRING_MAX]; 308 char buf[STRING_MAX];
294 309
295 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 310 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
311 output_string (term, buf);
312 }
313 break;
314
315 case keysym_t::RANGE_META8:
316 {
317 int len;
318 char buf[STRING_MAX];
319
320 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
321 if (len > 0)
322 output_string_meta8 (term, state, buf, len);
323 }
324 break;
325
326 case keysym_t::LIST:
327 {
328 char buf[STRING_MAX];
329
330 char *prefix, *middle, *suffix;
331
332 prefix = str;
333 middle = strchr (prefix + 1, *prefix);
334 suffix = strrchr (middle + 1, *prefix);
335
336 memcpy (buf, prefix + 1, middle - prefix - 1);
337 buf [middle - prefix - 1] = middle [keysym_offset + 1];
338 strcpy (buf + (middle - prefix), suffix + 1);
339
296 output_string (term, buf); 340 output_string (term, buf);
341 }
342 break;
297 } 343 }
298 break;
299 344
300 case keysym_t::RANGE_META8:
301 {
302 int len;
303 char buf[STRING_MAX];
304
305 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
306 if (len > 0)
307 output_string_meta8 (term, state, buf, len);
308 }
309 break;
310
311 case keysym_t::LIST:
312 {
313 char buf[STRING_MAX];
314
315 char *prefix, *middle, *suffix;
316
317 prefix = str;
318 middle = strchr (prefix + 1, *prefix);
319 suffix = strrchr (middle + 1, *prefix);
320
321 memcpy (buf, prefix + 1, middle - prefix - 1);
322 buf [middle - prefix - 1] = middle [keysym_offset + 1];
323 strcpy (buf + (middle - prefix), suffix + 1);
324
325 output_string (term, buf);
326 }
327 break;
328 }
329
330 free (str); 345 free (str);
331 346
332 return true; 347 return true;
348 }
333 } 349 }
334 else 350
335 return false; 351 return false;
336} 352}
337 353
338// purge duplicate keymap entries 354// purge duplicate keymap entries
339void keyboard_manager::purge_duplicate_keymap () 355void keyboard_manager::purge_duplicate_keymap ()
340{ 356{
… …
362void 378void
363keyboard_manager::setup_hash () 379keyboard_manager::setup_hash ()
364{ 380{
365 unsigned int i, index, hashkey; 381 unsigned int i, index, hashkey;
366 vector <keysym_t *> sorted_keymap; 382 vector <keysym_t *> sorted_keymap;
367 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 383 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
368 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 384 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
369 385
370 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 386 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
371 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 387 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
372 388
373 // determine hash bucket size 389 // determine hash bucket size
374 for (i = 0; i < keymap.size (); ++i) 390 for (i = 0; i < keymap.size (); ++i)
375 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
376 { 392 {
377 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
378 ++hash_budget_size [hashkey]; 394 ++hash_bucket_size [hashkey];
379 } 395 }
380 396
381 // now we know the size of each budget 397 // now we know the size of each bucket
382 // compute the index of each budget 398 // compute the index of each bucket
383 hash [0] = 0; 399 hash [0] = 0;
384 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 400 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
385 { 401 {
386 index += hash_budget_size [i - 1]; 402 index += hash_bucket_size [i - 1];
387 hash [i] = index; 403 hash [i] = index;
388 } 404 }
389 405
390 // and allocate just enough space 406 // and allocate just enough space
391 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
392 408
393 // fill in sorted_keymap 409 // fill in sorted_keymap
394 // it is sorted in each budget 410 // it is sorted in each bucket
395 for (i = 0; i < keymap.size (); ++i) 411 for (i = 0; i < keymap.size (); ++i)
396 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
397 { 413 {
398 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
399 415
400 index = hash [hashkey] + hash_budget_counter [hashkey]; 416 index = hash [hashkey] + hash_bucket_counter [hashkey];
401 417
402 while (index > hash [hashkey] 418 while (index > hash [hashkey]
403 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
404 { 420 {
405 sorted_keymap [index] = sorted_keymap [index - 1]; 421 sorted_keymap [index] = sorted_keymap [index - 1];
406 --index; 422 --index;
407 } 423 }
408 424
409 sorted_keymap [index] = keymap [i]; 425 sorted_keymap [index] = keymap [i];
410 ++hash_budget_counter [hashkey]; 426 ++hash_bucket_counter [hashkey];
411 } 427 }
412 428
413 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
414 430
415#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 431#ifndef NDEBUG
416 // check for invariants 432 // check for invariants
417 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
418 { 434 {
419 index = hash[i]; 435 index = hash[i];
420 for (int j = 0; j < hash_budget_size [i]; ++j) 436 for (int j = 0; j < hash_bucket_size [i]; ++j)
421 { 437 {
422 if (keymap [index + j]->range == 1) 438 if (keymap [index + j]->range == 1)
423 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
424 440
425 if (j) 441 if (j)
… …
436 { 452 {
437 int index = find_keysym (a->keysym + j, a->state); 453 int index = find_keysym (a->keysym + j, a->state);
438 454
439 assert (index >= 0); 455 assert (index >= 0);
440 keysym_t *b = keymap [index]; 456 keysym_t *b = keymap [index];
441 assert (i == (signed) index || // the normally expected result 457 assert (i == index // the normally expected result
442 (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 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
459 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
443 } 460 }
444 } 461 }
445#endif 462#endif
446} 463}
447 464
448int 465int
449keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 466keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
450{ 467{
451 int hashkey = keysym & KEYSYM_HASH_MASK; 468 int hashkey = keysym & KEYSYM_HASH_MASK;
452 unsigned int index = hash [hashkey]; 469 unsigned int index = hash [hashkey];
453 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 470 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
454 ? hash [hashkey + 1] 471 ? hash [hashkey + 1]
455 : keymap.size (); 472 : keymap.size ();
456 473
457 for (; index < end; ++index) 474 for (; index < end; ++index)
458 { 475 {
459 keysym_t *key = keymap [index]; 476 keysym_t *key = keymap [index];

Diff Legend

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