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.8 by root, Mon Jan 17 00:07:26 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
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 */
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{
99 if (strncmp (str, "command:", 8) == 0)
100 rt->cmd_write (str + 8, strlen (str) - 8);
41 if (strncmp (str, "proto:", 6) == 0) 101 else if (strncmp (str, "perl:", 5) == 0)
42 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6); 102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
43 else 103 else
44 rt->tt_write ((unsigned char *)str, strlen (str)); 104 rt->tt_write (str, strlen (str));
45} 105}
46 106
47static void 107static void
48output_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)
49{ 109{
… …
56 *ch |= 0x80; 116 *ch |= 0x80;
57 } 117 }
58 else if (rt->meta_char == C0_ESC) /* escape prefix */ 118 else if (rt->meta_char == C0_ESC) /* escape prefix */
59#endif 119#endif
60 { 120 {
61 const unsigned char ch = C0_ESC; 121 const char ch = C0_ESC;
62 rt->tt_write (&ch, 1); 122 rt->tt_write (&ch, 1);
63 } 123 }
64 } 124 }
65 125
66 rt->tt_write ((unsigned char *) buf, buflen); 126 rt->tt_write (buf, buflen);
67} 127}
68 128
69static int 129static int
70format_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)
71{ 131{
… …
77 *buf = 0; 137 *buf = 0;
78 } 138 }
79 139
80 return len; 140 return len;
81} 141}
82
83////////////////////////////////////////////////////////////////////////////////
84// return: #bits of '1'
85#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
86# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
87#else
88static int
89bitcount (uint16_t n)
90{
91 int i;
92
93 for (i = 0; n; ++i, n &= n - 1)
94 ;
95
96 return i;
97}
98#endif
99 142
100// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
101static int 144static int
102compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
103{ 146{
104 // (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
105 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
106 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
107 150
108 if (ca != cb) 151 if (ca != cb)
109 return ca - cb; 152 return ca - cb;
110//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
111// return b->state - a->state; 154// return b->state - a->state;
112 else 155 else
113 return b->range - a->range; 156 return b->range - a->range;
114} 157}
115 158
… …
155void 198void
156keyboard_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)
157{ 200{
158 keysym_t *key = new keysym_t; 201 keysym_t *key = new keysym_t;
159 wchar_t *wc = rxvt_mbstowcs (trans); 202 wchar_t *wc = rxvt_mbstowcs (trans);
160 const char *translation = rxvt_wcstoutf8 (wc); 203 char *translation = rxvt_wcstoutf8 (wc);
161 free (wc); 204 free (wc);
162 205
163 if (key && translation) 206 if (key && translation)
164 { 207 {
165 key->keysym = keysym; 208 key->keysym = keysym;
166 key->state = state; 209 key->state = state;
167 key->range = 1; 210 key->range = 1;
168 key->str = translation; 211 key->str = translation;
169 key->type = keysym_t::NORMAL; 212 key->type = keysym_t::STRING;
170 213
171 if (strncmp (translation, "list", 4) == 0 && translation [4]) 214 if (strncmp (translation, "list", 4) == 0 && translation [4])
172 { 215 {
173 char *middle = strchr (translation + 5, translation [4]); 216 char *middle = strchr (translation + 5, translation [4]);
174 char *suffix = strrchr (translation + 5, translation [4]); 217 char *suffix = strrchr (translation + 5, translation [4]);
175 218
176 if (suffix && middle && suffix > middle + 1) 219 if (suffix && middle && suffix > middle + 1)
177 { 220 {
178 key->type = keysym_t::LIST; 221 key->type = keysym_t::LIST;
179 key->range = suffix - middle - 1; 222 key->range = suffix - middle - 1;
180 223
181 strcpy (translation, translation + 4); 224 memmove (translation, translation + 4, strlen (translation + 4) + 1);
182 } 225 }
183 else 226 else
184 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);
185 } 228 }
229 else if (strncmp (translation, "builtin:", 8) == 0)
230 key->type = keysym_t::BUILTIN;
186 231
187 user_keymap.push_back (key); 232 user_keymap.push_back (key);
188 user_translations.push_back (translation); 233 user_translations.push_back (translation);
189 register_keymap (key); 234 register_keymap (key);
190 } 235 }
… …
207} 252}
208 253
209void 254void
210keyboard_manager::register_done () 255keyboard_manager::register_done ()
211{ 256{
257#if STOCK_KEYMAP
212 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 258 int n = sizeof (stock_keymap) / sizeof (keysym_t);
213 259
260 //TODO: shield against repeated calls and empty keymap
214 if (keymap.back () != &stock_keymap[n - 1]) 261 //if (keymap.back () != &stock_keymap[n - 1])
215 for (i = 0; i < n; ++i) 262 for (int i = 0; i < n; ++i)
216 register_keymap (&stock_keymap[i]); 263 register_keymap (&stock_keymap[i]);
264#endif
217 265
218 purge_duplicate_keymap (); 266 purge_duplicate_keymap ();
219 267
220 setup_hash (); 268 setup_hash ();
221} 269}
222 270
223bool 271bool
224keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 272keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
225{ 273{
226 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
227 277
228 if (state & term->ModMetaMask) state |= MetaMask; 278 if (state & term->ModMetaMask) state |= MetaMask;
229 if (state & term->ModNumLockMask) state |= NumLockMask; 279 if (state & term->ModNumLockMask) state |= NumLockMask;
230 if (state & term->ModLevel3Mask) state |= Level3Mask; 280 if (state & term->ModLevel3Mask) state |= Level3Mask;
231 281
… …
236 286
237 if (index >= 0) 287 if (index >= 0)
238 { 288 {
239 const keysym_t &key = *keymap [index]; 289 const keysym_t &key = *keymap [index];
240 290
291 if (key.type != keysym_t::BUILTIN)
292 {
241 int keysym_offset = keysym - key.keysym; 293 int keysym_offset = keysym - key.keysym;
242 294
243 wchar_t *wc = rxvt_utf8towcs (key.str); 295 wchar_t *wc = rxvt_utf8towcs (key.str);
244
245 char *str = rxvt_wcstombs (wc); 296 char *str = rxvt_wcstombs (wc);
246 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 297 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
247 free (wc); 298 free (wc);
248 299
249 switch (key.type) 300 switch (key.type)
250 {
251 case keysym_t::NORMAL:
252 output_string (term, str);
253 break;
254
255 case keysym_t::RANGE:
256 { 301 {
302 case keysym_t::STRING:
303 output_string (term, str);
304 break;
305
306 case keysym_t::RANGE:
307 {
257 char buf[STRING_MAX]; 308 char buf[STRING_MAX];
258 309
259 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
260 output_string (term, buf); 340 output_string (term, buf);
341 }
342 break;
261 } 343 }
262 break;
263 344
264 case keysym_t::RANGE_META8:
265 {
266 int len;
267 char buf[STRING_MAX];
268
269 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
270 if (len > 0)
271 output_string_meta8 (term, state, buf, len);
272 }
273 break;
274
275 case keysym_t::LIST:
276 {
277 char buf[STRING_MAX];
278
279 char *prefix, *middle, *suffix;
280
281 prefix = str;
282 middle = strchr (prefix + 1, *prefix);
283 suffix = strrchr (middle + 1, *prefix);
284
285 memcpy (buf, prefix + 1, middle - prefix - 1);
286 buf [middle - prefix - 1] = middle [keysym_offset + 1];
287 strcpy (buf + (middle - prefix), suffix + 1);
288
289 output_string (term, buf);
290 }
291 break;
292 }
293
294 free (str); 345 free (str);
295 346
296 return true; 347 return true;
297 } 348 }
298 else
299 { 349 }
300 // fprintf(stderr,"[%x:%x]",state,keysym); 350
301 return false; 351 return false;
302 }
303} 352}
304 353
305// purge duplicate keymap entries 354// purge duplicate keymap entries
306void keyboard_manager::purge_duplicate_keymap () 355void keyboard_manager::purge_duplicate_keymap ()
307{ 356{
… …
317 if (i < keymap.size ()) 366 if (i < keymap.size ())
318 { 367 {
319 keymap[i] = keymap.back (); 368 keymap[i] = keymap.back ();
320 keymap.pop_back (); 369 keymap.pop_back ();
321 } 370 }
371
322 break; 372 break;
323 } 373 }
324 } 374 }
325 } 375 }
326} 376}
… …
328void 378void
329keyboard_manager::setup_hash () 379keyboard_manager::setup_hash ()
330{ 380{
331 unsigned int i, index, hashkey; 381 unsigned int i, index, hashkey;
332 vector <keysym_t *> sorted_keymap; 382 vector <keysym_t *> sorted_keymap;
333 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
334 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
335 385
336 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 386 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
337 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 387 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
338 388
339 // count keysyms for corresponding hash budgets 389 // determine hash bucket size
340 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_BUCKETS) - 1; j >= 0; --j)
341 { 392 {
342 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; 393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
343 ++hash_budget_size [hashkey]; 394 ++hash_bucket_size [hashkey];
344 } 395 }
345 396
346 // a keysym_t with range>1 is counted one more time for every keysym that 397 // now we know the size of each bucket
347 // lies in its range 398 // compute the index of each bucket
399 hash [0] = 0;
400 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
401 {
402 index += hash_bucket_size [i - 1];
403 hash [i] = index;
404 }
405
406 // and allocate just enough space
407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
408
409 // fill in sorted_keymap
410 // it is sorted in each bucket
348 for (i = 0; i < keymap.size (); ++i) 411 for (i = 0; i < keymap.size (); ++i)
349 {
350 if (keymap[i]->range > 1)
351 {
352 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
353 {
354 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
355 if (hash_budget_size [hashkey])
356 ++hash_budget_size [hashkey];
357 }
358 }
359 }
360
361 // now we know the size of each budget
362 // compute the index of each budget
363 hash [0] = 0;
364 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
365 {
366 index += hash_budget_size [i - 1];
367 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]);
368 }
369
370 // and allocate just enough space
371 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
372 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
373
374 // fill in sorted_keymap
375 // it is sorted in each budget
376 for (i = 0; i < keymap.size (); ++i)
377 {
378 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)
379 { 413 {
380 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
381 415
382 if (hash_budget_size [hashkey])
383 {
384 index = hash [hashkey] + hash_budget_counter [hashkey]; 416 index = hash [hashkey] + hash_bucket_counter [hashkey];
385 417
386 while (index > hash [hashkey] 418 while (index > hash [hashkey]
387 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
388 { 420 {
389 sorted_keymap [index] = sorted_keymap [index - 1]; 421 sorted_keymap [index] = sorted_keymap [index - 1];
390 --index; 422 --index;
391 } 423 }
392 424
393 sorted_keymap [index] = keymap [i]; 425 sorted_keymap [index] = keymap [i];
394 ++hash_budget_counter [hashkey]; 426 ++hash_bucket_counter [hashkey];
395 }
396 } 427 }
397 }
398 428
399 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
400 430
401#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 431#ifndef NDEBUG
402 // check for invariants 432 // check for invariants
403 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
404 { 434 {
405 index = hash[i]; 435 index = hash[i];
406 for (int j = 0; j < hash_budget_size [i]; ++j) 436 for (int j = 0; j < hash_bucket_size [i]; ++j)
407 { 437 {
408 if (keymap [index + j]->range == 1) 438 if (keymap [index + j]->range == 1)
409 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
410 440
411 if (j) 441 if (j)
… …
422 { 452 {
423 int index = find_keysym (a->keysym + j, a->state); 453 int index = find_keysym (a->keysym + j, a->state);
424 454
425 assert (index >= 0); 455 assert (index >= 0);
426 keysym_t *b = keymap [index]; 456 keysym_t *b = keymap [index];
427 assert (i == (signed) index || // the normally expected result 457 assert (i == index // the normally expected result
428 (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
429 } 460 }
430 } 461 }
431#endif 462#endif
432} 463}
433 464
434int 465int
435keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 466keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
436{ 467{
437 int hashkey = keysym & KEYSYM_HASH_MASK; 468 int hashkey = keysym & KEYSYM_HASH_MASK;
438 unsigned int index = hash [hashkey]; 469 unsigned int index = hash [hashkey];
470 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
471 ? hash [hashkey + 1]
472 : keymap.size ();
439 473
440 for (; index < keymap.size (); ++index) 474 for (; index < end; ++index)
441 { 475 {
442 keysym_t *key = keymap [index]; 476 keysym_t *key = keymap [index];
443 477
444 if (key->keysym <= keysym && key->keysym + key->range > keysym 478 if (key->keysym <= keysym && keysym < key->keysym + key->range
445 // match only the specified bits in state and ignore others 479 // match only the specified bits in state and ignore others
446 && (key->state & state) == key->state) 480 && (key->state & state) == key->state)
447 return index; 481 return index;
448 else if (key->keysym > keysym && key->range == 1)
449 return -1;
450 } 482 }
451 483
452 return -1; 484 return -1;
453} 485}
454 486

Diff Legend

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