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.2 by root, Sun Jan 16 18:05:37 2005 UTC vs.
Revision 1.50 by sf-exg, Wed Nov 30 20:01:41 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 *term, const char *str)
39{ 69{
40 assert (rt && str); 70 if (strncmp (str, "command:", 8) == 0)
41 71 term->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((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
44 else 74 else
45 rt->tt_write ((unsigned char *)str, strlen (str)); 75 term->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 = ecb_popcount32 (a->state /* & OtherModMask */);
110 int cb = bitcount (b->state /* & OtherModMask */); 84 int cb = ecb_popcount32 (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{
123 keymap.reserve (256); 97 keymap.reserve (256);
124 hash[0] = 1; // hash[0] != 0 indicates uninitialized data 98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
125} 99}
126 100
127keyboard_manager::~keyboard_manager () 101keyboard_manager::~keyboard_manager ()
128{ 102{
129 clear ();
130}
131
132void
133keyboard_manager::clear ()
134{
135 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) 103 for (unsigned int i = 0; i < keymap.size (); ++i)
145 { 104 {
105 free (keymap [i]->str);
146 delete user_keymap [i]; 106 delete keymap [i];
147 user_keymap [i] = 0;
148 } 107 }
149
150 user_keymap.clear ();
151 user_translations.clear ();
152} 108}
153 109
154// a wrapper for register_keymap, 110// a wrapper for register_translation that converts the input string
155// so that outside codes don't have to know so much details. 111// 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 112void
160keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 113keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
161{ 114{
162 assert (trans); 115 wchar_t *wc = rxvt_mbstowcs (trans);
116 char *translation = rxvt_wcstoutf8 (wc);
117 free (wc);
163 118
119 if (strncmp (translation, "list", 4) == 0 && translation [4]
120 && strlen (translation) < STRING_MAX)
121 {
122 char *prefix = translation + 4;
123 char *middle = strchr (prefix + 1, translation [4]);
124 char *suffix = strrchr (prefix + 1, translation [4]);
125
126 if (suffix && middle && suffix > middle + 1)
127 {
128 int range = suffix - middle - 1;
129 int prefix_len = middle - prefix - 1;
130 char buf[STRING_MAX];
131
132 memcpy (buf, prefix + 1, prefix_len);
133 strcpy (buf + prefix_len + 1, suffix + 1);
134
135 for (int i = 0; i < range; i++)
136 {
137 buf [prefix_len] = middle [i + 1];
138 register_translation (keysym + i, state, strdup (buf));
139 }
140
141 free (translation);
142 return;
143 }
144 else
145 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
146 }
147
148 register_translation (keysym, state, translation);
149}
150
151void
152keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
153{
164 keysym_t *key = new keysym_t; 154 keysym_t *key = new keysym_t;
165 wchar_t *wc = rxvt_mbstowcs (trans);
166 const char *translation = rxvt_wcstoutf8 (wc);
167 free (wc);
168 155
169 if (key && translation) 156 if (key && translation)
170 { 157 {
171 key->keysym = keysym; 158 key->keysym = keysym;
172 key->state = state; 159 key->state = state;
173 key->range = 1;
174 key->str = translation; 160 key->str = translation;
175 key->type = keysym_t::NORMAL; 161 key->type = keysym_t::STRING;
176 162
177 if (strncmp (translation, "list", 4) == 0 && translation [4]) 163 if (strncmp (translation, "builtin:", 8) == 0)
164 key->type = keysym_t::BUILTIN;
165
166 if (keymap.size () == keymap.capacity ())
167 keymap.reserve (keymap.size () * 2);
168
169 keymap.push_back (key);
170 hash[0] = 3;
171 }
172 else
173 {
174 delete key;
175 free (translation);
176 rxvt_fatal ("memory allocation failure. aborting.\n");
177 }
178}
179
180bool
181keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
182{
183 assert (("register_done() need to be called", hash[0] == 0));
184
185 state &= OtherModMask; // mask out uninteresting modifiers
186
187 if (state & term->ModMetaMask) state |= MetaMask;
188 if (state & term->ModNumLockMask) state |= NumLockMask;
189 if (state & term->ModLevel3Mask) state |= Level3Mask;
190
191 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
192 state |= AppKeypadMask;
193
194 int index = find_keysym (keysym, state);
195
196 if (index >= 0)
197 {
198 keysym_t *key = keymap [index];
199
200 if (key->type != keysym_t::BUILTIN)
178 { 201 {
179 char *middle = strchr (translation + 5, translation [4]); 202 wchar_t *wc = rxvt_utf8towcs (key->str);
180 char *suffix = strrchr (translation + 5, translation [4]); 203 char *str = rxvt_wcstombs (wc);
181 204 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
182 if (suffix && middle && suffix > middle + 1) 205 free (wc);
183 {
184 key->type = keysym_t::LIST;
185 key->range = suffix - middle - 1;
186 206
187 strcpy (translation, translation + 4); 207 output_string (term, str);
188 } 208
189 else 209 free (str);
190 { 210
191 key->range = 1; 211 return true;
192 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
193 }
194 } 212 }
195 else
196
197 user_keymap.push_back (key);
198 user_translations.push_back (translation);
199 register_keymap (key);
200 }
201 else
202 { 213 }
203 delete key;
204 free ((void *)translation);
205 rxvt_fatal ("out of memory, aborting.\n");
206 }
207}
208 214
209void 215 return false;
210keyboard_manager::register_keymap (keysym_t *key)
211{
212 assert (key);
213 assert (key->range >= 1);
214
215 if (keymap.size () == keymap.capacity ())
216 keymap.reserve (keymap.size () * 2);
217
218 keymap.push_back (key);
219 hash[0] = 3;
220} 216}
221 217
222void 218void
223keyboard_manager::register_done () 219keyboard_manager::register_done ()
224{ 220{
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#if TO_BE_DONE_INSIDE_dispatch
234 for (i = 0; i < keymap.size (); ++i)
235 {
236 keysym_t *key = keymap[i];
237
238 assert (bitcount (term_->ModMetaMask) == 1 && "call me after ModMetaMask was set!");
239
240 if (key->state & MetaMask)
241 {
242 //key->state &= ~MetaMask;
243 key->state |= term_->ModMetaMask;
244 }
245
246 assert (bitcount (term_->ModNumLockMask) == 1 && "call me after ModNumLockMask was set!");
247
248 if (key->state & NumLockMask)
249 {
250 //key->state &= ~NumLockMask;
251 key->state |= term_->ModNumLockMask;
252 }
253 }
254#endif
255
256 setup_hash ();
257}
258
259bool
260keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
261{
262 assert (hash[0] == 0 && "register_done() need to be called");
263
264 int index = find_keysym (keysym, state);
265
266 if (index >= 0)
267 {
268 assert (term && keymap [index]);
269 const keysym_t &key = *keymap [index];
270
271 int keysym_offset = keysym - key.keysym;
272
273 wchar_t *wc = rxvt_utf8towcs (key.str);
274 char *str = rxvt_wcstombs (wc);
275 // TODO: do translations, unescaping etc, here (allow \u escape etc.)
276 free (wc);
277
278 switch (key.type)
279 {
280 case keysym_t::NORMAL:
281 output_string (term, str);
282 break;
283
284 case keysym_t::RANGE:
285 {
286 char buf[STRING_MAX];
287
288 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
289 output_string (term, buf);
290 }
291 break;
292
293 case keysym_t::RANGE_META8:
294 {
295 int len;
296 char buf[STRING_MAX];
297
298 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
299 if (len > 0)
300 output_string_meta8 (term, state, buf, len);
301 }
302 break;
303
304 case keysym_t::LIST:
305 {
306 char buf[STRING_MAX];
307
308 char *prefix, *middle, *suffix;
309
310 prefix = str;
311 middle = strchr (prefix + 1, *prefix);
312 suffix = strrchr (middle + 1, *prefix);
313
314 memcpy (buf, prefix + 1, middle - prefix - 1);
315 buf [middle - prefix - 1] = middle [keysym_offset + 1];
316 strcpy (buf + (middle - prefix), suffix + 1);
317
318 output_string (term, buf);
319 }
320 break;
321 }
322
323 free (str);
324
325 return true;
326 }
327 else
328 {
329 // fprintf(stderr,"[%x:%x]",state,keysym);
330 return false;
331 }
332}
333
334// purge duplicate keymap entries
335void keyboard_manager::purge_duplicate_keymap ()
336{
337 for (unsigned int i = 0; i < keymap.size (); ++i)
338 {
339 for (unsigned int j = 0; j < i; ++j)
340 {
341 if (keymap[i] == keymap[j])
342 {
343 while (keymap[i] == keymap.back ())
344 keymap.pop_back ();
345
346 if (i < keymap.size ())
347 {
348 keymap[i] = keymap.back ();
349 keymap.pop_back ();
350 }
351 break;
352 }
353 }
354 }
355}
356
357void
358keyboard_manager::setup_hash ()
359{
360 unsigned int i, index, hashkey; 221 unsigned int i, index, hashkey;
361 vector <keysym_t *> sorted_keymap; 222 vector <keysym_t *> sorted_keymap;
362 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 223 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
363 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
364 224
365 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 225 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
366 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
367 226
368 // count keysyms for corresponding hash budgets 227 // determine hash bucket size
369 for (i = 0; i < keymap.size (); ++i) 228 for (i = 0; i < keymap.size (); ++i)
370 { 229 {
371 assert (keymap[i]);
372 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 230 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
373 ++hash_budget_size[hashkey]; 231 ++hash_bucket_size [hashkey];
232 }
233
234 // now we know the size of each bucket
235 // compute the index of each bucket
236 hash [0] = 0;
237 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
374 } 238 {
239 index += hash_bucket_size [i - 1];
240 hash [i] = index;
241 }
375 242
376 // keysym A with range>1 is counted one more time for 243 // and allocate just enough space
377 // every keysym B lies in its range 244 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
245
246 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
247
248 // fill in sorted_keymap
249 // it is sorted in each bucket
378 for (i = 0; i < keymap.size (); ++i) 250 for (i = 0; i < keymap.size (); ++i)
379 { 251 {
380 if (keymap[i]->range > 1) 252 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
253
254 index = hash [hashkey] + hash_bucket_size [hashkey];
255
256 while (index > hash [hashkey]
257 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
381 { 258 {
382 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j) 259 sorted_keymap [index] = sorted_keymap [index - 1];
383 { 260 --index;
384 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK);
385 if (hash_budget_size[hashkey])
386 ++hash_budget_size[hashkey];
387 }
388 } 261 }
389 }
390 262
391 // now we know the size of each budget 263 sorted_keymap [index] = keymap [i];
392 // compute the index of each budget 264 ++hash_bucket_size [hashkey];
393 hash[0] = 0; 265 }
266
267 keymap.swap (sorted_keymap);
268
269#ifndef NDEBUG
270 // check for invariants
394 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 271 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
395 {
396 index += hash_budget_size[i - 1];
397 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]);
398 } 272 {
399 273 index = hash[i];
400 // and allocate just enough space 274 for (int j = 0; j < hash_bucket_size [i]; ++j)
401 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
402 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size[i - 1], 0);
403
404 // fill in sorted_keymap
405 // it is sorted in each budget
406 for (i = 0; i < keymap.size (); ++i)
407 {
408 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
409 { 275 {
410 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK);
411
412 if (hash_budget_size[hashkey])
413 {
414 index = hash[hashkey] + hash_budget_counter[hashkey];
415
416 while (index > hash[hashkey]
417 && compare_priority (keymap[i], sorted_keymap[index - 1]) > 0)
418 {
419 sorted_keymap[index] = sorted_keymap[index - 1];
420 --index;
421 }
422
423 sorted_keymap[index] = keymap[i];
424 ++hash_budget_counter[hashkey];
425 }
426 }
427 }
428
429 keymap.swap (sorted_keymap);
430
431#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
432 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
434 {
435 index = hash[i];
436 for (int j = 0; j < hash_budget_size[i]; ++j)
437 {
438 if (keymap[index + j]->range == 1)
439 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 276 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 277
441 if (j) 278 if (j)
442 assert (compare_priority (keymap[index + j - 1], 279 assert (compare_priority (keymap [index + j - 1],
443 keymap[index + j]) >= 0); 280 keymap [index + j]) >= 0);
444 } 281 }
445 } 282 }
446 283
447 // this should be able to detect most possible bugs 284 // this should be able to detect most possible bugs
448 for (i = 0; i < sorted_keymap.size (); ++i) 285 for (i = 0; i < sorted_keymap.size (); ++i)
449 { 286 {
450 keysym_t *a = sorted_keymap[i]; 287 keysym_t *a = sorted_keymap[i];
451 for (int j = 0; j < a->range; ++j)
452 {
453 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 288 int index = find_keysym (a->keysym, a->state);
289
454 assert (index >= 0); 290 assert (index >= 0);
455 keysym_t *b = keymap[index]; 291 keysym_t *b = keymap [index];
456 assert (i == (signed) index || // the normally expected result 292 assert (i == index // the normally expected result
457 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same 293 || a->keysym == b->keysym
458 } 294 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
459 } 295 }
460#endif 296#endif
461} 297}
462 298
463int 299int
464keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 300keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
465{ 301{
466 int hashkey = keysym & KEYSYM_HASH_MASK; 302 int hashkey = keysym & KEYSYM_HASH_MASK;
467 unsigned int index = hash [hashkey]; 303 unsigned int index = hash [hashkey];
304 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
305 ? hash [hashkey + 1]
306 : keymap.size ();
468 307
469 for (; index < keymap.size (); ++index) 308 for (; index < end; ++index)
470 { 309 {
471 keysym_t *key = keymap[index]; 310 keysym_t *key = keymap [index];
472 assert (key);
473 311
474 if (key->keysym <= keysym && key->keysym + key->range > keysym 312 if (key->keysym == keysym
475 // match only the specified bits in state and ignore others 313 // match only the specified bits in state and ignore others
476 && (key->state & OtherModMask) == (key->state & state)) 314 && (key->state & state) == key->state)
477 return index; 315 return index;
478 else if (key->keysym > keysym && key->range == 1)
479 return -1;
480 } 316 }
481 317
482 return -1; 318 return -1;
483} 319}
484 320

Diff Legend

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