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.12 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.35 by sf-exg, Mon Aug 23 15:58:43 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"
34
35/* an intro to the data structure:
36 *
37 * vector keymap[] is grouped.
38 *
39 * inside each group, elements are sorted by the criteria given by compare_priority().
40 * the lookup of keysym is done in two steps:
41 * 1) locate the group corresponds to the keysym;
42 * 2) do a linear search inside the group.
43 *
44 * array hash[] effectively defines a map from a keysym to a group in keymap[].
45 *
46 * each group has its address(the index of first group element in keymap[]),
47 * which is computed and stored in hash[].
48 * hash[] stores the addresses in the form of:
49 * index: 0 I1 I2 I3 In
50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
51 * where
52 * A1 = 0;
53 * Ai+1 = N1 + N2 + ... + Ni.
54 * it is computed from hash_bucket_size[]:
55 * index: 0 I1 I2 I3 In
56 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0
57 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
58 * or we can say
59 * hash_bucket_size[Ii] = Ni; hash_bucket_size[elsewhere] = 0,
60 * where
61 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym }
62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[];
64 * Ni(the size of group i) = hash_bucket_size[Ii].
65 */
10 66
11#if STOCK_KEYMAP 67#if STOCK_KEYMAP
12//////////////////////////////////////////////////////////////////////////////// 68////////////////////////////////////////////////////////////////////////////////
13// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
14 70
15keysym_t keyboard_manager::stock_keymap[] = { 71keysym_t keyboard_manager::stock_keymap[] = {
16 /* examples */ 72 /* examples */
17 /* keysym, state, range, handler, str */ 73 /* keysym, state, range, type, str */
18//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
19//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
20//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
21//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
22//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
23//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
24//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
25//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
26//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
27//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
28//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
29//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
30//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
31//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
32//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
33//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
34//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
35//{ '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>"},
36//{ '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>"},
37}; 93};
38#endif 94#endif
39 95
40static void 96static void
41output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
42{ 98{
43 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
44 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));
45 else 103 else
46 rt->tt_write ((unsigned char *)str, strlen (str)); 104 rt->tt_write (str, strlen (str));
47} 105}
48 106
49static void 107static void
50output_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)
51{ 109{
… …
58 *ch |= 0x80; 116 *ch |= 0x80;
59 } 117 }
60 else if (rt->meta_char == C0_ESC) /* escape prefix */ 118 else if (rt->meta_char == C0_ESC) /* escape prefix */
61#endif 119#endif
62 { 120 {
63 const unsigned char ch = C0_ESC; 121 const char ch = C0_ESC;
64 rt->tt_write (&ch, 1); 122 rt->tt_write (&ch, 1);
65 } 123 }
66 } 124 }
67 125
68 rt->tt_write ((unsigned char *) buf, buflen); 126 rt->tt_write (buf, buflen);
69} 127}
70 128
71static int 129static int
72format_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)
73{ 131{
… …
79 *buf = 0; 137 *buf = 0;
80 } 138 }
81 139
82 return len; 140 return len;
83} 141}
84
85////////////////////////////////////////////////////////////////////////////////
86// return: #bits of '1'
87#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
88# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
89#else
90static int
91bitcount (uint16_t n)
92{
93 int i;
94
95 for (i = 0; n; ++i, n &= n - 1)
96 ;
97
98 return i;
99}
100#endif
101 142
102// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
103static int 144static int
104compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
105{ 146{
106 // (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
107 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
108 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
109 150
110 if (ca != cb) 151 if (ca != cb)
111 return ca - cb; 152 return ca - cb;
112//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
113// return b->state - a->state; 154// return b->state - a->state;
114 else 155 else
115 return b->range - a->range; 156 return b->range - a->range;
116} 157}
117 158
… …
130void 171void
131keyboard_manager::clear () 172keyboard_manager::clear ()
132{ 173{
133 keymap.clear (); 174 keymap.clear ();
134 hash [0] = 2; 175 hash [0] = 2;
135
136 for (unsigned int i = 0; i < user_translations.size (); ++i)
137 {
138 free ((void *)user_translations [i]);
139 user_translations [i] = 0;
140 }
141
142 for (unsigned int i = 0; i < user_keymap.size (); ++i)
143 {
144 delete user_keymap [i];
145 user_keymap [i] = 0;
146 }
147
148 user_keymap.clear ();
149 user_translations.clear ();
150} 176}
151 177
152// a wrapper for register_keymap, 178// a wrapper for register_keymap,
153// so that outside codes don't have to know so much details. 179// so that outside codes don't have to know so much details.
154// 180//
… …
157void 183void
158keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 184keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
159{ 185{
160 keysym_t *key = new keysym_t; 186 keysym_t *key = new keysym_t;
161 wchar_t *wc = rxvt_mbstowcs (trans); 187 wchar_t *wc = rxvt_mbstowcs (trans);
162 const char *translation = rxvt_wcstoutf8 (wc); 188 char *translation = rxvt_wcstoutf8 (wc);
163 free (wc); 189 free (wc);
164 190
165 if (key && translation) 191 if (key && translation)
166 { 192 {
167 key->keysym = keysym; 193 key->keysym = keysym;
168 key->state = state; 194 key->state = state;
169 key->range = 1; 195 key->range = 1;
170 key->str = translation; 196 key->str = translation;
171 key->type = keysym_t::NORMAL; 197 key->type = keysym_t::STRING;
172 198
173 if (strncmp (translation, "list", 4) == 0 && translation [4]) 199 if (strncmp (translation, "list", 4) == 0 && translation [4])
174 { 200 {
175 char *middle = strchr (translation + 5, translation [4]); 201 char *middle = strchr (translation + 5, translation [4]);
176 char *suffix = strrchr (translation + 5, translation [4]); 202 char *suffix = strrchr (translation + 5, translation [4]);
177 203
178 if (suffix && middle && suffix > middle + 1) 204 if (suffix && middle && suffix > middle + 1)
179 { 205 {
180 key->type = keysym_t::LIST; 206 key->type = keysym_t::LIST;
181 key->range = suffix - middle - 1; 207 key->range = suffix - middle - 1;
182 208
183 strcpy (translation, translation + 4); 209 memmove (translation, translation + 4, strlen (translation + 4) + 1);
184 } 210 }
185 else 211 else
186 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 212 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
187 } 213 }
214 else if (strncmp (translation, "builtin:", 8) == 0)
215 key->type = keysym_t::BUILTIN;
188 216
189 user_keymap.push_back (key);
190 user_translations.push_back (translation);
191 register_keymap (key); 217 register_keymap (key);
192 } 218 }
193 else 219 else
194 { 220 {
195 delete key; 221 delete key;
… …
228bool 254bool
229keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 255keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
230{ 256{
231 assert (hash[0] == 0 && "register_done() need to be called"); 257 assert (hash[0] == 0 && "register_done() need to be called");
232 258
259 state &= OtherModMask; // mask out uninteresting modifiers
260
233 if (state & term->ModMetaMask) state |= MetaMask; 261 if (state & term->ModMetaMask) state |= MetaMask;
234 if (state & term->ModNumLockMask) state |= NumLockMask; 262 if (state & term->ModNumLockMask) state |= NumLockMask;
235 if (state & term->ModLevel3Mask) state |= Level3Mask; 263 if (state & term->ModLevel3Mask) state |= Level3Mask;
236 264
237 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 265 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
… …
241 269
242 if (index >= 0) 270 if (index >= 0)
243 { 271 {
244 const keysym_t &key = *keymap [index]; 272 const keysym_t &key = *keymap [index];
245 273
274 if (key.type != keysym_t::BUILTIN)
275 {
246 int keysym_offset = keysym - key.keysym; 276 int keysym_offset = keysym - key.keysym;
247 277
248 wchar_t *wc = rxvt_utf8towcs (key.str); 278 wchar_t *wc = rxvt_utf8towcs (key.str);
249 char *str = rxvt_wcstombs (wc); 279 char *str = rxvt_wcstombs (wc);
250 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 280 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
251 free (wc); 281 free (wc);
252 282
253 switch (key.type) 283 switch (key.type)
254 {
255 case keysym_t::NORMAL:
256 output_string (term, str);
257 break;
258
259 case keysym_t::RANGE:
260 { 284 {
285 case keysym_t::STRING:
286 output_string (term, str);
287 break;
288
289 case keysym_t::RANGE:
290 {
261 char buf[STRING_MAX]; 291 char buf[STRING_MAX];
262 292
263 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 293 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
294 output_string (term, buf);
295 }
296 break;
297
298 case keysym_t::RANGE_META8:
299 {
300 int len;
301 char buf[STRING_MAX];
302
303 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
304 if (len > 0)
305 output_string_meta8 (term, state, buf, len);
306 }
307 break;
308
309 case keysym_t::LIST:
310 {
311 char buf[STRING_MAX];
312
313 char *prefix, *middle, *suffix;
314
315 prefix = str;
316 middle = strchr (prefix + 1, *prefix);
317 suffix = strrchr (middle + 1, *prefix);
318
319 memcpy (buf, prefix + 1, middle - prefix - 1);
320 buf [middle - prefix - 1] = middle [keysym_offset + 1];
321 strcpy (buf + (middle - prefix), suffix + 1);
322
264 output_string (term, buf); 323 output_string (term, buf);
324 }
325 break;
265 } 326 }
266 break;
267 327
268 case keysym_t::RANGE_META8:
269 {
270 int len;
271 char buf[STRING_MAX];
272
273 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
274 if (len > 0)
275 output_string_meta8 (term, state, buf, len);
276 }
277 break;
278
279 case keysym_t::LIST:
280 {
281 char buf[STRING_MAX];
282
283 char *prefix, *middle, *suffix;
284
285 prefix = str;
286 middle = strchr (prefix + 1, *prefix);
287 suffix = strrchr (middle + 1, *prefix);
288
289 memcpy (buf, prefix + 1, middle - prefix - 1);
290 buf [middle - prefix - 1] = middle [keysym_offset + 1];
291 strcpy (buf + (middle - prefix), suffix + 1);
292
293 output_string (term, buf);
294 }
295 break;
296 }
297
298 free (str); 328 free (str);
299 329
300 return true; 330 return true;
331 }
301 } 332 }
302 else 333
303 return false; 334 return false;
304} 335}
305 336
306// purge duplicate keymap entries 337// purge duplicate keymap entries
307void keyboard_manager::purge_duplicate_keymap () 338void keyboard_manager::purge_duplicate_keymap ()
308{ 339{
… …
330void 361void
331keyboard_manager::setup_hash () 362keyboard_manager::setup_hash ()
332{ 363{
333 unsigned int i, index, hashkey; 364 unsigned int i, index, hashkey;
334 vector <keysym_t *> sorted_keymap; 365 vector <keysym_t *> sorted_keymap;
335 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 366 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
336 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 367 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
337 368
338 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 369 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
339 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 370 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
340 371
341 // determine hash bucket size 372 // determine hash bucket size
342 for (i = 0; i < keymap.size (); ++i) 373 for (i = 0; i < keymap.size (); ++i)
343 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 374 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
344 { 375 {
345 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 376 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
346 ++hash_budget_size [hashkey]; 377 ++hash_bucket_size [hashkey];
347 } 378 }
348 379
349 // now we know the size of each budget 380 // now we know the size of each bucket
350 // compute the index of each budget 381 // compute the index of each bucket
351 hash [0] = 0; 382 hash [0] = 0;
352 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 383 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
353 { 384 {
354 index += hash_budget_size [i - 1]; 385 index += hash_bucket_size [i - 1];
355 hash [i] = index; 386 hash [i] = index;
356 } 387 }
357 388
358 // and allocate just enough space 389 // and allocate just enough space
359 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 390 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
360 391
361 // fill in sorted_keymap 392 // fill in sorted_keymap
362 // it is sorted in each budget 393 // it is sorted in each bucket
363 for (i = 0; i < keymap.size (); ++i) 394 for (i = 0; i < keymap.size (); ++i)
364 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 395 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
365 { 396 {
366 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 397 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
367 398
368 index = hash [hashkey] + hash_budget_counter [hashkey]; 399 index = hash [hashkey] + hash_bucket_counter [hashkey];
369 400
370 while (index > hash [hashkey] 401 while (index > hash [hashkey]
371 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 402 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
372 { 403 {
373 sorted_keymap [index] = sorted_keymap [index - 1]; 404 sorted_keymap [index] = sorted_keymap [index - 1];
374 --index; 405 --index;
375 } 406 }
376 407
377 sorted_keymap [index] = keymap [i]; 408 sorted_keymap [index] = keymap [i];
378 ++hash_budget_counter [hashkey]; 409 ++hash_bucket_counter [hashkey];
379 } 410 }
380 411
381 keymap.swap (sorted_keymap); 412 keymap.swap (sorted_keymap);
382 413
383#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 414#ifndef NDEBUG
384 // check for invariants 415 // check for invariants
385 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 416 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
386 { 417 {
387 index = hash[i]; 418 index = hash[i];
388 for (int j = 0; j < hash_budget_size [i]; ++j) 419 for (int j = 0; j < hash_bucket_size [i]; ++j)
389 { 420 {
390 if (keymap [index + j]->range == 1) 421 if (keymap [index + j]->range == 1)
391 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 422 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
392 423
393 if (j) 424 if (j)
… …
404 { 435 {
405 int index = find_keysym (a->keysym + j, a->state); 436 int index = find_keysym (a->keysym + j, a->state);
406 437
407 assert (index >= 0); 438 assert (index >= 0);
408 keysym_t *b = keymap [index]; 439 keysym_t *b = keymap [index];
409 assert (i == (signed) index || // the normally expected result 440 assert (i == index // the normally expected result
410 (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 441 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
442 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
411 } 443 }
412 } 444 }
413#endif 445#endif
414} 446}
415 447
416int 448int
417keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 449keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
418{ 450{
419 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
420 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
421 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 453 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
422 ? hash [hashkey + 1] 454 ? hash [hashkey + 1]
423 : keymap.size (); 455 : keymap.size ();
424 456
425 for (; index < end; ++index) 457 for (; index < end; ++index)
426 { 458 {
427 keysym_t *key = keymap [index]; 459 keysym_t *key = keymap [index];

Diff Legend

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