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

Diff Legend

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