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

Diff Legend

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