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.10 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.35 by sf-exg, Mon Aug 23 15:58:43 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, keysym_t::NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
18//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
19//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
20//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
21//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
22//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
23//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
24//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
25//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
26//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
27//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
28//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
29//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
30//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
31//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
32//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
33//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
34//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 91//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
35//{ 'a', MetaMask|ControlMask, 26, keysym_t::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 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
42 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); 100 rt->cmd_write (str + 8, strlen (str) - 8);
101 else if (strncmp (str, "perl:", 5) == 0)
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
… …
128void 171void
129keyboard_manager::clear () 172keyboard_manager::clear ()
130{ 173{
131 keymap.clear (); 174 keymap.clear ();
132 hash [0] = 2; 175 hash [0] = 2;
133
134 for (unsigned int i = 0; i < user_translations.size (); ++i)
135 {
136 free ((void *)user_translations [i]);
137 user_translations [i] = 0;
138 }
139
140 for (unsigned int i = 0; i < user_keymap.size (); ++i)
141 {
142 delete user_keymap [i];
143 user_keymap [i] = 0;
144 }
145
146 user_keymap.clear ();
147 user_translations.clear ();
148} 176}
149 177
150// a wrapper for register_keymap, 178// a wrapper for register_keymap,
151// so that outside codes don't have to know so much details. 179// so that outside codes don't have to know so much details.
152// 180//
… …
155void 183void
156keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 184keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
157{ 185{
158 keysym_t *key = new keysym_t; 186 keysym_t *key = new keysym_t;
159 wchar_t *wc = rxvt_mbstowcs (trans); 187 wchar_t *wc = rxvt_mbstowcs (trans);
160 const char *translation = rxvt_wcstoutf8 (wc); 188 char *translation = rxvt_wcstoutf8 (wc);
161 free (wc); 189 free (wc);
162 190
163 if (key && translation) 191 if (key && translation)
164 { 192 {
165 key->keysym = keysym; 193 key->keysym = keysym;
166 key->state = state; 194 key->state = state;
167 key->range = 1; 195 key->range = 1;
168 key->str = translation; 196 key->str = translation;
169 key->type = keysym_t::NORMAL; 197 key->type = keysym_t::STRING;
170 198
171 if (strncmp (translation, "list", 4) == 0 && translation [4]) 199 if (strncmp (translation, "list", 4) == 0 && translation [4])
172 { 200 {
173 char *middle = strchr (translation + 5, translation [4]); 201 char *middle = strchr (translation + 5, translation [4]);
174 char *suffix = strrchr (translation + 5, translation [4]); 202 char *suffix = strrchr (translation + 5, translation [4]);
175 203
176 if (suffix && middle && suffix > middle + 1) 204 if (suffix && middle && suffix > middle + 1)
177 { 205 {
178 key->type = keysym_t::LIST; 206 key->type = keysym_t::LIST;
179 key->range = suffix - middle - 1; 207 key->range = suffix - middle - 1;
180 208
181 strcpy (translation, translation + 4); 209 memmove (translation, translation + 4, strlen (translation + 4) + 1);
182 } 210 }
183 else 211 else
184 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 212 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
185 } 213 }
214 else if (strncmp (translation, "builtin:", 8) == 0)
215 key->type = keysym_t::BUILTIN;
186 216
187 user_keymap.push_back (key);
188 user_translations.push_back (translation);
189 register_keymap (key); 217 register_keymap (key);
190 } 218 }
191 else 219 else
192 { 220 {
193 delete key; 221 delete key;
… …
207} 235}
208 236
209void 237void
210keyboard_manager::register_done () 238keyboard_manager::register_done ()
211{ 239{
240#if STOCK_KEYMAP
212 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 241 int n = sizeof (stock_keymap) / sizeof (keysym_t);
213 242
243 //TODO: shield against repeated calls and empty keymap
214 if (keymap.back () != &stock_keymap[n - 1]) 244 //if (keymap.back () != &stock_keymap[n - 1])
215 for (i = 0; i < n; ++i) 245 for (int i = 0; i < n; ++i)
216 register_keymap (&stock_keymap[i]); 246 register_keymap (&stock_keymap[i]);
247#endif
217 248
218 purge_duplicate_keymap (); 249 purge_duplicate_keymap ();
219 250
220 setup_hash (); 251 setup_hash ();
221} 252}
222 253
223bool 254bool
224keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 255keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
225{ 256{
226 assert (hash[0] == 0 && "register_done() need to be called"); 257 assert (hash[0] == 0 && "register_done() need to be called");
258
259 state &= OtherModMask; // mask out uninteresting modifiers
227 260
228 if (state & term->ModMetaMask) state |= MetaMask; 261 if (state & term->ModMetaMask) state |= MetaMask;
229 if (state & term->ModNumLockMask) state |= NumLockMask; 262 if (state & term->ModNumLockMask) state |= NumLockMask;
230 if (state & term->ModLevel3Mask) state |= Level3Mask; 263 if (state & term->ModLevel3Mask) state |= Level3Mask;
231 264
… …
236 269
237 if (index >= 0) 270 if (index >= 0)
238 { 271 {
239 const keysym_t &key = *keymap [index]; 272 const keysym_t &key = *keymap [index];
240 273
274 if (key.type != keysym_t::BUILTIN)
275 {
241 int keysym_offset = keysym - key.keysym; 276 int keysym_offset = keysym - key.keysym;
242 277
243 wchar_t *wc = rxvt_utf8towcs (key.str); 278 wchar_t *wc = rxvt_utf8towcs (key.str);
244
245 char *str = rxvt_wcstombs (wc); 279 char *str = rxvt_wcstombs (wc);
246 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 280 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
247 free (wc); 281 free (wc);
248 282
249 switch (key.type) 283 switch (key.type)
250 {
251 case keysym_t::NORMAL:
252 output_string (term, str);
253 break;
254
255 case keysym_t::RANGE:
256 { 284 {
285 case keysym_t::STRING:
286 output_string (term, str);
287 break;
288
289 case keysym_t::RANGE:
290 {
257 char buf[STRING_MAX]; 291 char buf[STRING_MAX];
258 292
259 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 293 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
294 output_string (term, buf);
295 }
296 break;
297
298 case keysym_t::RANGE_META8:
299 {
300 int len;
301 char buf[STRING_MAX];
302
303 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
304 if (len > 0)
305 output_string_meta8 (term, state, buf, len);
306 }
307 break;
308
309 case keysym_t::LIST:
310 {
311 char buf[STRING_MAX];
312
313 char *prefix, *middle, *suffix;
314
315 prefix = str;
316 middle = strchr (prefix + 1, *prefix);
317 suffix = strrchr (middle + 1, *prefix);
318
319 memcpy (buf, prefix + 1, middle - prefix - 1);
320 buf [middle - prefix - 1] = middle [keysym_offset + 1];
321 strcpy (buf + (middle - prefix), suffix + 1);
322
260 output_string (term, buf); 323 output_string (term, buf);
324 }
325 break;
261 } 326 }
262 break;
263 327
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); 328 free (str);
295 329
296 return true; 330 return true;
297 } 331 }
298 else
299 { 332 }
300 // fprintf(stderr,"[%x:%x]",state,keysym); 333
301 return false; 334 return false;
302 }
303} 335}
304 336
305// purge duplicate keymap entries 337// purge duplicate keymap entries
306void keyboard_manager::purge_duplicate_keymap () 338void keyboard_manager::purge_duplicate_keymap ()
307{ 339{
… …
317 if (i < keymap.size ()) 349 if (i < keymap.size ())
318 { 350 {
319 keymap[i] = keymap.back (); 351 keymap[i] = keymap.back ();
320 keymap.pop_back (); 352 keymap.pop_back ();
321 } 353 }
354
322 break; 355 break;
323 } 356 }
324 } 357 }
325 } 358 }
326} 359}
… …
328void 361void
329keyboard_manager::setup_hash () 362keyboard_manager::setup_hash ()
330{ 363{
331 unsigned int i, index, hashkey; 364 unsigned int i, index, hashkey;
332 vector <keysym_t *> sorted_keymap; 365 vector <keysym_t *> sorted_keymap;
333 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 366 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 367 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
335 368
336 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 369 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
337 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 370 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
338 371
339 // count keysyms for corresponding hash budgets 372 // determine hash bucket size
340 for (i = 0; i < keymap.size (); ++i) 373 for (i = 0; i < keymap.size (); ++i)
374 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
341 { 375 {
342 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; 376 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
343 ++hash_budget_size [hashkey]; 377 ++hash_bucket_size [hashkey];
344 } 378 }
345 379
346 // a keysym_t with range>1 is counted one more time for every keysym that 380 // now we know the size of each bucket
347 // lies in its range 381 // compute the index of each bucket
382 hash [0] = 0;
383 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
384 {
385 index += hash_bucket_size [i - 1];
386 hash [i] = index;
387 }
388
389 // and allocate just enough space
390 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
391
392 // fill in sorted_keymap
393 // it is sorted in each bucket
348 for (i = 0; i < keymap.size (); ++i) 394 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.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
372
373 // fill in sorted_keymap
374 // it is sorted in each budget
375 for (i = 0; i < keymap.size (); ++i)
376 {
377 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 395 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
378 { 396 {
379 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 397 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
380 398
381 if (hash_budget_size [hashkey])
382 {
383 index = hash [hashkey] + hash_budget_counter [hashkey]; 399 index = hash [hashkey] + hash_bucket_counter [hashkey];
384 400
385 while (index > hash [hashkey] 401 while (index > hash [hashkey]
386 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 402 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
387 { 403 {
388 sorted_keymap [index] = sorted_keymap [index - 1]; 404 sorted_keymap [index] = sorted_keymap [index - 1];
389 --index; 405 --index;
390 } 406 }
391 407
392 sorted_keymap [index] = keymap [i]; 408 sorted_keymap [index] = keymap [i];
393 ++hash_budget_counter [hashkey]; 409 ++hash_bucket_counter [hashkey];
394 }
395 } 410 }
396 }
397 411
398 keymap.swap (sorted_keymap); 412 keymap.swap (sorted_keymap);
399 413
400#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 414#ifndef NDEBUG
401 // check for invariants 415 // check for invariants
402 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 416 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
403 { 417 {
404 index = hash[i]; 418 index = hash[i];
405 for (int j = 0; j < hash_budget_size [i]; ++j) 419 for (int j = 0; j < hash_bucket_size [i]; ++j)
406 { 420 {
407 if (keymap [index + j]->range == 1) 421 if (keymap [index + j]->range == 1)
408 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 422 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
409 423
410 if (j) 424 if (j)
… …
421 { 435 {
422 int index = find_keysym (a->keysym + j, a->state); 436 int index = find_keysym (a->keysym + j, a->state);
423 437
424 assert (index >= 0); 438 assert (index >= 0);
425 keysym_t *b = keymap [index]; 439 keysym_t *b = keymap [index];
426 assert (i == (signed) index || // the normally expected result 440 assert (i == index // the normally expected result
427 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same or a closer match 441 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
442 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
428 } 443 }
429 } 444 }
430#endif 445#endif
431} 446}
432 447
433int 448int
434keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 449keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
435{ 450{
436 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
437 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
453 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
454 ? hash [hashkey + 1]
455 : keymap.size ();
438 456
439 for (; index < keymap.size (); ++index) 457 for (; index < end; ++index)
440 { 458 {
441 keysym_t *key = keymap [index]; 459 keysym_t *key = keymap [index];
442 460
443 if (key->keysym <= keysym && key->keysym + key->range > keysym 461 if (key->keysym <= keysym && keysym < key->keysym + key->range
444 // match only the specified bits in state and ignore others 462 // match only the specified bits in state and ignore others
445 && (key->state & state) == key->state) 463 && (key->state & state) == key->state)
446 return index; 464 return index;
447 else if ((key->keysym & KEYSYM_HASH_MASK) > hashkey && key->range == 1)
448 return -1;
449 } 465 }
450 466
451 return -1; 467 return -1;
452} 468}
453 469

Diff Legend

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