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.7 by root, Sun Jan 16 23:55:42 2005 UTC vs.
Revision 1.32 by root, Sat Dec 26 10:24:04 2009 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
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_budget_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 compution of hash[])
58 * or we can say
59 * hash_budget_size[Ii] = Ni; hash_budget_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_budget_size[];
64 * Ni(the size of group i) = hash_budget_size[Ii].
65 */
66
67#if STOCK_KEYMAP
11//////////////////////////////////////////////////////////////////////////////// 68////////////////////////////////////////////////////////////////////////////////
12// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
13 70
14keysym_t keyboard_manager::stock_keymap[] = { 71keysym_t keyboard_manager::stock_keymap[] = {
15 /* examples */ 72 /* examples */
16 /* keysym, state, range, handler, str */ 73 /* keysym, state, range, type, str */
17//{XK_ISO_Left_Tab, 0, 1, NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
18//{ 'a', 0, 26, RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
19//{ 'a', ControlMask, 26, RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
20//{ XK_Left, 0, 4, LIST, "DACBZ" "\033[Z"}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
21//{ XK_Left, ShiftMask, 4, LIST, "dacbZ" "\033[Z"}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
22//{ XK_Left, ControlMask, 4, LIST, "dacbZ" "\033OZ"}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
23//{ XK_Tab, ControlMask, 1, NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
24//{ XK_apostrophe, ControlMask, 1, NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
25//{ XK_slash, ControlMask, 1, NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
26//{ XK_semicolon, ControlMask, 1, NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
27//{ XK_grave, ControlMask, 1, NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
28//{ XK_comma, ControlMask, 1, NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
29//{ XK_Return, ControlMask, 1, NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
30//{ XK_Return, ShiftMask, 1, NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
31//{ ' ', ShiftMask, 1, NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
32//{ '.', ControlMask, 1, NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
33//{ '0', ControlMask, 10, RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
34//{ '0', MetaMask|ControlMask, 10, RANGE, "0" "\033<M-C-%c>"}, 91//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
35//{ 'a', MetaMask|ControlMask, 26, RANGE, "a" "\033<M-C-%c>"}, 92//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
36}; 93};
94#endif
37 95
38static void 96static void
39output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
40{ 98{
41 assert (rt && str); 99 if (strncmp (str, "command:", 8) == 0)
42 100 rt->cmd_write (str + 8, strlen (str) - 8);
43 if (strncmp (str, "proto:", 6) == 0) 101 else if (strncmp (str, "perl:", 5) == 0)
44 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6); 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 assert (a && b);
107
108 // (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
109 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
110 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
111 150
112 if (ca != cb) 151 if (ca != cb)
113 return ca - cb; 152 return ca - cb;
114//else if (a->state != b->state) // this behavior is to be disscussed 153//else if (a->state != b->state) // this behavior is to be disscussed
115// return b->state - a->state; 154// return b->state - a->state;
… …
157// the string 'trans' is copied to an internal managed buffer, 196// the string 'trans' is copied to an internal managed buffer,
158// so the caller can free memory of 'trans' at any time. 197// so the caller can free memory of 'trans' at any time.
159void 198void
160keyboard_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)
161{ 200{
162 assert (trans);
163
164 keysym_t *key = new keysym_t; 201 keysym_t *key = new keysym_t;
165 wchar_t *wc = rxvt_mbstowcs (trans); 202 wchar_t *wc = rxvt_mbstowcs (trans);
166printf ("CONV <%s> %x %x %x %x\n", trans, (int)wc[0], (int)wc[1], (int)wc[2], (int)wc[3]);
167 const char *translation = rxvt_wcstoutf8 (wc); 203 char *translation = rxvt_wcstoutf8 (wc);
168 free (wc); 204 free (wc);
169 205
170 if (key && translation) 206 if (key && translation)
171 { 207 {
172 key->keysym = keysym; 208 key->keysym = keysym;
173 key->state = state; 209 key->state = state;
174 key->range = 1; 210 key->range = 1;
175 key->str = translation; 211 key->str = translation;
176 key->type = keysym_t::NORMAL; 212 key->type = keysym_t::STRING;
177 213
178 if (strncmp (translation, "list", 4) == 0 && translation [4]) 214 if (strncmp (translation, "list", 4) == 0 && translation [4])
179 { 215 {
180 char *middle = strchr (translation + 5, translation [4]); 216 char *middle = strchr (translation + 5, translation [4]);
181 char *suffix = strrchr (translation + 5, translation [4]); 217 char *suffix = strrchr (translation + 5, translation [4]);
182 218
183 if (suffix && middle && suffix > middle + 1) 219 if (suffix && middle && suffix > middle + 1)
184 { 220 {
185 key->type = keysym_t::LIST; 221 key->type = keysym_t::LIST;
186 key->range = suffix - middle - 1; 222 key->range = suffix - middle - 1;
187 223
188 strcpy (translation, translation + 4); 224 memmove (translation, translation + 4, strlen (translation + 4) + 1);
189 } 225 }
190 else 226 else
191 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);
192 } 228 }
229 else if (strncmp (translation, "builtin:", 8) == 0)
230 key->type = keysym_t::BUILTIN;
193 231
194 user_keymap.push_back (key); 232 user_keymap.push_back (key);
195 user_translations.push_back (translation); 233 user_translations.push_back (translation);
196 register_keymap (key); 234 register_keymap (key);
197 } 235 }
… …
204} 242}
205 243
206void 244void
207keyboard_manager::register_keymap (keysym_t *key) 245keyboard_manager::register_keymap (keysym_t *key)
208{ 246{
209 assert (key);
210 assert (key->range >= 1);
211
212 if (keymap.size () == keymap.capacity ()) 247 if (keymap.size () == keymap.capacity ())
213 keymap.reserve (keymap.size () * 2); 248 keymap.reserve (keymap.size () * 2);
214 249
215 keymap.push_back (key); 250 keymap.push_back (key);
216 hash[0] = 3; 251 hash[0] = 3;
217} 252}
218 253
219void 254void
220keyboard_manager::register_done () 255keyboard_manager::register_done ()
221{ 256{
257#if STOCK_KEYMAP
222 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 258 int n = sizeof (stock_keymap) / sizeof (keysym_t);
223 259
260 //TODO: shield against repeated calls and empty keymap
224 if (keymap.back () != &stock_keymap[n - 1]) 261 //if (keymap.back () != &stock_keymap[n - 1])
225 for (i = 0; i < n; ++i) 262 for (int i = 0; i < n; ++i)
226 register_keymap (&stock_keymap[i]); 263 register_keymap (&stock_keymap[i]);
264#endif
227 265
228 purge_duplicate_keymap (); 266 purge_duplicate_keymap ();
229 267
230 setup_hash (); 268 setup_hash ();
231} 269}
232 270
233bool 271bool
234keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 272keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
235{ 273{
236 assert (hash[0] == 0 && "register_done() need to be called"); 274 assert (hash[0] == 0 && "register_done() need to be called");
275
276 state &= OtherModMask; // mask out uninteresting modifiers
237 277
238 if (state & term->ModMetaMask) state |= MetaMask; 278 if (state & term->ModMetaMask) state |= MetaMask;
239 if (state & term->ModNumLockMask) state |= NumLockMask; 279 if (state & term->ModNumLockMask) state |= NumLockMask;
240 if (state & term->ModLevel3Mask) state |= Level3Mask; 280 if (state & term->ModLevel3Mask) state |= Level3Mask;
241 281
… …
246 286
247 if (index >= 0) 287 if (index >= 0)
248 { 288 {
249 const keysym_t &key = *keymap [index]; 289 const keysym_t &key = *keymap [index];
250 290
291 if (key.type != keysym_t::BUILTIN)
292 {
251 int keysym_offset = keysym - key.keysym; 293 int keysym_offset = keysym - key.keysym;
252 294
253 wchar_t *wc = rxvt_utf8towcs (key.str); 295 wchar_t *wc = rxvt_utf8towcs (key.str);
254
255 char *str = rxvt_wcstombs (wc); 296 char *str = rxvt_wcstombs (wc);
256 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 297 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
257 free (wc); 298 free (wc);
258 299
259 switch (key.type) 300 switch (key.type)
260 {
261 case keysym_t::NORMAL:
262 output_string (term, str);
263 break;
264
265 case keysym_t::RANGE:
266 { 301 {
302 case keysym_t::STRING:
303 output_string (term, str);
304 break;
305
306 case keysym_t::RANGE:
307 {
267 char buf[STRING_MAX]; 308 char buf[STRING_MAX];
268 309
269 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
270 output_string (term, buf); 340 output_string (term, buf);
341 }
342 break;
271 } 343 }
272 break;
273 344
274 case keysym_t::RANGE_META8:
275 {
276 int len;
277 char buf[STRING_MAX];
278
279 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
280 if (len > 0)
281 output_string_meta8 (term, state, buf, len);
282 }
283 break;
284
285 case keysym_t::LIST:
286 {
287 char buf[STRING_MAX];
288
289 char *prefix, *middle, *suffix;
290
291 prefix = str;
292 middle = strchr (prefix + 1, *prefix);
293 suffix = strrchr (middle + 1, *prefix);
294
295 memcpy (buf, prefix + 1, middle - prefix - 1);
296 buf [middle - prefix - 1] = middle [keysym_offset + 1];
297 strcpy (buf + (middle - prefix), suffix + 1);
298
299 output_string (term, buf);
300 }
301 break;
302 }
303
304 free (str); 345 free (str);
305 346
306 return true; 347 return true;
307 } 348 }
308 else
309 { 349 }
310 // fprintf(stderr,"[%x:%x]",state,keysym); 350
311 return false; 351 return false;
312 }
313} 352}
314 353
315// purge duplicate keymap entries 354// purge duplicate keymap entries
316void keyboard_manager::purge_duplicate_keymap () 355void keyboard_manager::purge_duplicate_keymap ()
317{ 356{
… …
327 if (i < keymap.size ()) 366 if (i < keymap.size ())
328 { 367 {
329 keymap[i] = keymap.back (); 368 keymap[i] = keymap.back ();
330 keymap.pop_back (); 369 keymap.pop_back ();
331 } 370 }
371
332 break; 372 break;
333 } 373 }
334 } 374 }
335 } 375 }
336} 376}
… …
344 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 384 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
345 385
346 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 386 memset (hash_budget_size, 0, sizeof (hash_budget_size));
347 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 387 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
348 388
349 // count keysyms for corresponding hash budgets 389 // determine hash bucket size
350 for (i = 0; i < keymap.size (); ++i) 390 for (i = 0; i < keymap.size (); ++i)
391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
351 { 392 {
352 assert (keymap [i]);
353 hashkey = (keymap [i]->keysym & KEYSYM_HASH_MASK); 393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
354 ++hash_budget_size [hashkey]; 394 ++hash_budget_size [hashkey];
355 }
356
357 // keysym A with range>1 is counted one more time for
358 // every keysym B lies in its range
359 for (i = 0; i < keymap.size (); ++i)
360 {
361 if (keymap[i]->range > 1)
362 {
363 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
364 {
365 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
366 if (hash_budget_size [hashkey])
367 ++hash_budget_size [hashkey];
368 }
369 } 395 }
370 }
371 396
372 // now we know the size of each budget 397 // now we know the size of each budget
373 // compute the index of each budget 398 // compute the index of each budget
374 hash [0] = 0; 399 hash [0] = 0;
375 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 400 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
376 { 401 {
377 index += hash_budget_size [i - 1]; 402 index += hash_budget_size [i - 1];
378 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); 403 hash [i] = index;
379 } 404 }
380 405
381 // and allocate just enough space 406 // and allocate just enough space
382 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
383 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
384 408
385 // fill in sorted_keymap 409 // fill in sorted_keymap
386 // it is sorted in each budget 410 // it is sorted in each budget
387 for (i = 0; i < keymap.size (); ++i) 411 for (i = 0; i < keymap.size (); ++i)
388 {
389 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
390 { 413 {
391 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
392 415
393 if (hash_budget_size [hashkey])
394 {
395 index = hash [hashkey] + hash_budget_counter [hashkey]; 416 index = hash [hashkey] + hash_budget_counter [hashkey];
396 417
397 while (index > hash [hashkey] 418 while (index > hash [hashkey]
398 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
399 { 420 {
400 sorted_keymap [index] = sorted_keymap [index - 1]; 421 sorted_keymap [index] = sorted_keymap [index - 1];
401 --index; 422 --index;
402 } 423 }
403 424
404 sorted_keymap [index] = keymap [i]; 425 sorted_keymap [index] = keymap [i];
405 ++hash_budget_counter [hashkey]; 426 ++hash_budget_counter [hashkey];
406 }
407 } 427 }
408 }
409 428
410 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
411 430
412#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 431#ifndef NDEBUG
413 // check for invariants 432 // check for invariants
414 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
415 { 434 {
416 index = hash[i]; 435 index = hash[i];
417 for (int j = 0; j < hash_budget_size [i]; ++j) 436 for (int j = 0; j < hash_budget_size [i]; ++j)
… …
433 { 452 {
434 int index = find_keysym (a->keysym + j, a->state); 453 int index = find_keysym (a->keysym + j, a->state);
435 454
436 assert (index >= 0); 455 assert (index >= 0);
437 keysym_t *b = keymap [index]; 456 keysym_t *b = keymap [index];
438 assert (i == (signed) index || // the normally expected result 457 assert (i == index // the normally expected result
439 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same 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
440 } 460 }
441 } 461 }
442#endif 462#endif
443} 463}
444 464
445int 465int
446keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 466keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
447{ 467{
448 int hashkey = keysym & KEYSYM_HASH_MASK; 468 int hashkey = keysym & KEYSYM_HASH_MASK;
449 unsigned int index = hash [hashkey]; 469 unsigned int index = hash [hashkey];
470 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
471 ? hash [hashkey + 1]
472 : keymap.size ();
450 473
451 for (; index < keymap.size (); ++index) 474 for (; index < end; ++index)
452 { 475 {
453 keysym_t *key = keymap [index]; 476 keysym_t *key = keymap [index];
454 assert (key);
455 477
456 if (key->keysym <= keysym && key->keysym + key->range > keysym 478 if (key->keysym <= keysym && keysym < key->keysym + key->range
457 // match only the specified bits in state and ignore others 479 // match only the specified bits in state and ignore others
458 && (key->state & state) == key->state) 480 && (key->state & state) == key->state)
459 return index; 481 return index;
460 else if (key->keysym > keysym && key->range == 1)
461 return -1;
462 } 482 }
463 483
464 return -1; 484 return -1;
465} 485}
466 486

Diff Legend

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