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.3 by root, Sun Jan 16 18:48:04 2005 UTC vs.
Revision 1.40 by root, Thu Mar 24 17:34:28 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 b->range - a->range;
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 (); 103 clear ();
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_keymap,
155// so that outside codes don't have to know so much details. 122// so that outside codes don't have to know so much details.
156// 123//
157// the string 'trans' is copied to an internal managed buffer, 124// the string 'trans' is copied to an internal managed buffer,
158// so the caller can free memory of 'trans' at any time. 125// so the caller can free memory of 'trans' at any time.
159void 126void
160keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 127keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
161{ 128{
162 assert (trans);
163
164 keysym_t *key = new keysym_t; 129 keysym_t *key = new keysym_t;
165 wchar_t *wc = rxvt_mbstowcs (trans); 130 wchar_t *wc = rxvt_mbstowcs (trans);
166 const char *translation = rxvt_wcstoutf8 (wc); 131 char *translation = rxvt_wcstoutf8 (wc);
167 free (wc); 132 free (wc);
168 133
169 if (key && translation) 134 if (key && translation)
170 { 135 {
171 key->keysym = keysym; 136 key->keysym = keysym;
172 key->state = state; 137 key->state = state;
173 key->range = 1; 138 key->range = 1;
174 key->str = translation; 139 key->str = translation;
175 key->type = keysym_t::NORMAL; 140 key->type = keysym_t::STRING;
176 141
177 if (strncmp (translation, "list", 4) == 0 && translation [4]) 142 if (strncmp (translation, "list", 4) == 0 && translation [4])
178 { 143 {
179 char *middle = strchr (translation + 5, translation [4]); 144 char *middle = strchr (translation + 5, translation [4]);
180 char *suffix = strrchr (translation + 5, translation [4]); 145 char *suffix = strrchr (translation + 5, translation [4]);
181 146
182 if (suffix && middle && suffix > middle + 1) 147 if (suffix && middle && suffix > middle + 1)
183 { 148 {
184 key->type = keysym_t::LIST; 149 key->type = keysym_t::LIST;
185 key->range = suffix - middle - 1; 150 key->range = suffix - middle - 1;
186 151
187 strcpy (translation, translation + 4); 152 memmove (translation, translation + 4, strlen (translation + 4) + 1);
188 } 153 }
189 else 154 else
190 {
191 key->range = 1;
192 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 155 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
193 }
194 } 156 }
195 else 157 else if (strncmp (translation, "builtin:", 8) == 0)
158 key->type = keysym_t::BUILTIN;
196 159
197 user_keymap.push_back (key);
198 user_translations.push_back (translation);
199 register_keymap (key); 160 register_keymap (key);
200 } 161 }
201 else 162 else
202 { 163 {
203 delete key; 164 delete key;
… …
207} 168}
208 169
209void 170void
210keyboard_manager::register_keymap (keysym_t *key) 171keyboard_manager::register_keymap (keysym_t *key)
211{ 172{
212 assert (key);
213 assert (key->range >= 1);
214
215 if (keymap.size () == keymap.capacity ()) 173 if (keymap.size () == keymap.capacity ())
216 keymap.reserve (keymap.size () * 2); 174 keymap.reserve (keymap.size () * 2);
217 175
218 keymap.push_back (key); 176 keymap.push_back (key);
219 hash[0] = 3; 177 hash[0] = 3;
220} 178}
221 179
222void 180void
223keyboard_manager::register_done () 181keyboard_manager::register_done ()
224{ 182{
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 (); 183 setup_hash ();
234} 184}
235 185
236bool 186bool
237keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 187keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
238{ 188{
239 assert (hash[0] == 0 && "register_done() need to be called"); 189 assert (hash[0] == 0 && "register_done() need to be called");
240 190
241 if (state & term->ModMetaMask) 191 state &= OtherModMask; // mask out uninteresting modifiers
242 state |= MetaMask;
243 192
193 if (state & term->ModMetaMask) state |= MetaMask;
244 if (state & term->ModNumLockMask) 194 if (state & term->ModNumLockMask) state |= NumLockMask;
245 state |= NumLockMask; 195 if (state & term->ModLevel3Mask) state |= Level3Mask;
246 196
247 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 197 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
248 state |= AppKeypadMask; 198 state |= AppKeypadMask;
249 199
250 int index = find_keysym (keysym, state); 200 int index = find_keysym (keysym, state);
251 201
252 if (index >= 0) 202 if (index >= 0)
253 { 203 {
254 assert (term && keymap [index]);
255 const keysym_t &key = *keymap [index]; 204 const keysym_t &key = *keymap [index];
256 205
257 int keysym_offset = keysym - key.keysym; 206 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 { 207 {
266 case keysym_t::NORMAL: 208 int keysym_offset = keysym - key.keysym;
267 output_string (term, str);
268 break;
269 209
270 case keysym_t::RANGE: 210 wchar_t *wc = rxvt_utf8towcs (key.str);
211 char *str = rxvt_wcstombs (wc);
212 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
213 free (wc);
214
215 switch (key.type)
271 { 216 {
217 case keysym_t::STRING:
218 output_string (term, str);
219 break;
220
221 case keysym_t::LIST:
222 {
272 char buf[STRING_MAX]; 223 char buf[STRING_MAX];
273 224
274 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 225 char *prefix, *middle, *suffix;
226
227 prefix = str;
228 middle = strchr (prefix + 1, *prefix);
229 suffix = strrchr (middle + 1, *prefix);
230
231 memcpy (buf, prefix + 1, middle - prefix - 1);
232 buf [middle - prefix - 1] = middle [keysym_offset + 1];
233 strcpy (buf + (middle - prefix), suffix + 1);
234
275 output_string (term, buf); 235 output_string (term, buf);
236 }
237 break;
276 } 238 }
277 break;
278 239
279 case keysym_t::RANGE_META8: 240 free (str);
280 {
281 int len;
282 char buf[STRING_MAX];
283 241
284 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); 242 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 } 243 }
308
309 free (str);
310
311 return true;
312 }
313 else
314 { 244 }
315 // fprintf(stderr,"[%x:%x]",state,keysym); 245
316 return false; 246 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} 247}
342 248
343void 249void
344keyboard_manager::setup_hash () 250keyboard_manager::setup_hash ()
345{ 251{
346 unsigned int i, index, hashkey; 252 unsigned int i, index, hashkey;
347 vector <keysym_t *> sorted_keymap; 253 vector <keysym_t *> sorted_keymap;
348 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 254 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 255
351 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 256 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
352 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
353 257
354 // count keysyms for corresponding hash budgets 258 // determine hash bucket size
355 for (i = 0; i < keymap.size (); ++i) 259 for (i = 0; i < keymap.size (); ++i)
260 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
356 { 261 {
357 assert (keymap[i]);
358 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 262 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
359 ++hash_budget_size[hashkey]; 263 ++hash_bucket_size [hashkey];
360 } 264 }
361 265
362 // keysym A with range>1 is counted one more time for 266 // now we know the size of each bucket
363 // every keysym B lies in its range 267 // compute the index of each bucket
268 hash [0] = 0;
269 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
270 {
271 index += hash_bucket_size [i - 1];
272 hash [i] = index;
273 }
274
275 // and allocate just enough space
276 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
277
278 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
279
280 // fill in sorted_keymap
281 // it is sorted in each bucket
364 for (i = 0; i < keymap.size (); ++i) 282 for (i = 0; i < keymap.size (); ++i)
283 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
365 { 284 {
366 if (keymap[i]->range > 1) 285 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
286
287 index = hash [hashkey] + hash_bucket_size [hashkey];
288
289 while (index > hash [hashkey]
290 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
291 {
292 sorted_keymap [index] = sorted_keymap [index - 1];
293 --index;
294 }
295
296 sorted_keymap [index] = keymap [i];
297 ++hash_bucket_size [hashkey];
298 }
299
300 keymap.swap (sorted_keymap);
301
302#ifndef NDEBUG
303 // check for invariants
304 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
305 {
306 index = hash[i];
307 for (int j = 0; j < hash_bucket_size [i]; ++j)
367 { 308 {
368 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
369 {
370 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK);
371 if (hash_budget_size[hashkey])
372 ++hash_budget_size[hashkey];
373 }
374 }
375 }
376
377 // now we know the size of each budget
378 // compute the index of each budget
379 hash[0] = 0;
380 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
381 {
382 index += hash_budget_size[i - 1];
383 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]);
384 }
385
386 // and allocate just enough space
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 {
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) 309 if (keymap [index + j]->range == 1)
425 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 310 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
426 311
427 if (j) 312 if (j)
428 assert (compare_priority (keymap[index + j - 1], 313 assert (compare_priority (keymap [index + j - 1],
429 keymap[index + j]) >= 0); 314 keymap [index + j]) >= 0);
430 } 315 }
431 } 316 }
432 317
433 // this should be able to detect most possible bugs 318 // this should be able to detect most possible bugs
434 for (i = 0; i < sorted_keymap.size (); ++i) 319 for (i = 0; i < sorted_keymap.size (); ++i)
435 { 320 {
436 keysym_t *a = sorted_keymap[i]; 321 keysym_t *a = sorted_keymap[i];
437 for (int j = 0; j < a->range; ++j) 322 for (int j = 0; j < a->range; ++j)
438 { 323 {
439 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 324 int index = find_keysym (a->keysym + j, a->state);
325
440 assert (index >= 0); 326 assert (index >= 0);
441 keysym_t *b = keymap[index]; 327 keysym_t *b = keymap [index];
442 assert (i == (signed) index || // the normally expected result 328 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 329 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
330 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
444 } 331 }
445 } 332 }
446#endif 333#endif
447} 334}
448 335
449int 336int
450keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 337keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
451{ 338{
452 int hashkey = keysym & KEYSYM_HASH_MASK; 339 int hashkey = keysym & KEYSYM_HASH_MASK;
453 unsigned int index = hash [hashkey]; 340 unsigned int index = hash [hashkey];
341 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
342 ? hash [hashkey + 1]
343 : keymap.size ();
454 344
455 for (; index < keymap.size (); ++index) 345 for (; index < end; ++index)
456 { 346 {
457 keysym_t *key = keymap[index]; 347 keysym_t *key = keymap [index];
458 assert (key);
459 348
460 if (key->keysym <= keysym && key->keysym + key->range > keysym 349 if (key->keysym <= keysym && keysym < key->keysym + key->range
461 // match only the specified bits in state and ignore others 350 // match only the specified bits in state and ignore others
462 && (key->state & OtherModMask) == (key->state & state)) 351 && (key->state & state) == key->state)
463 return index; 352 return index;
464 else if (key->keysym > keysym && key->range == 1)
465 return -1;
466 } 353 }
467 354
468 return -1; 355 return -1;
469} 356}
470 357

Diff Legend

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