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.31 by root, Fri Sep 4 15:40:12 2009 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, type, 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
63 ch = C0_ESC; 121 const char ch = C0_ESC;
64 rt->tt_write (&ch, 1); 122 rt->tt_write (&ch, 1);
65 } 123 }
66 } 124 }
67 125
68 rt->tt_write ((unsigned char *) buf, buflen); 126 rt->tt_write (buf, buflen);
69} 127}
70 128
71static int 129static int
72format_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)
73{ 131{
74 int len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]); 132 size_t len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]);
75 133
76 if (len >= bufsize) 134 if (len >= (size_t)bufsize)
77 {
78 fprintf (stderr, "buffer overflowed!\n");
79 buf[bufsize - 1] = '\0';
80 } 135 {
81 else if (len < 0) 136 rxvt_warn ("format_keyrange_string: formatting failed, ignoring key.\n");
82 { 137 *buf = 0;
83 perror ("keyrange_translator()");
84 } 138 }
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 = rxvt_popcount (a->state /* & OtherModMask */);
110 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_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;
… …
119 158
120//////////////////////////////////////////////////////////////////////////////// 159////////////////////////////////////////////////////////////////////////////////
121keyboard_manager::keyboard_manager () 160keyboard_manager::keyboard_manager ()
122{ 161{
123 keymap.reserve (256); 162 keymap.reserve (256);
124 hash[0] = 1; // hash[0] != 0 indicates uninitialized data 163 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
125} 164}
126 165
127keyboard_manager::~keyboard_manager () 166keyboard_manager::~keyboard_manager ()
128{ 167{
129 clear (); 168 clear ();
… …
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
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 267
256 setup_hash (); 268 setup_hash ();
257} 269}
258 270
259bool 271bool
260keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 272keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
261{ 273{
262 assert (hash[0] == 0 && "register_done() need to be called"); 274 assert (hash[0] == 0 && "register_done() need to be called");
263 275
276 state &= OtherModMask; // mask out uninteresting modifiers
277
278 if (state & term->ModMetaMask) state |= MetaMask;
279 if (state & term->ModNumLockMask) state |= NumLockMask;
280 if (state & term->ModLevel3Mask) state |= Level3Mask;
281
282 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
283 state |= AppKeypadMask;
284
264 int index = find_keysym (keysym, state); 285 int index = find_keysym (keysym, state);
265 286
266 if (index >= 0) 287 if (index >= 0)
267 { 288 {
268 assert (term && keymap [index]);
269 const keysym_t &key = *keymap [index]; 289 const keysym_t &key = *keymap [index];
270 290
291 if (key.type != keysym_t::BUILTIN)
292 {
271 int keysym_offset = keysym - key.keysym; 293 int keysym_offset = keysym - key.keysym;
272 294
273 wchar_t *wc = rxvt_utf8towcs (key.str); 295 wchar_t *wc = rxvt_utf8towcs (key.str);
274 char *str = rxvt_wcstombs (wc); 296 char *str = rxvt_wcstombs (wc);
275 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 297 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
276 free (wc); 298 free (wc);
277 299
278 switch (key.type) 300 switch (key.type)
279 {
280 case keysym_t::NORMAL:
281 output_string (term, str);
282 break;
283
284 case keysym_t::RANGE:
285 { 301 {
302 case keysym_t::STRING:
303 output_string (term, str);
304 break;
305
306 case keysym_t::RANGE:
307 {
286 char buf[STRING_MAX]; 308 char buf[STRING_MAX];
287 309
288 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
289 output_string (term, buf); 340 output_string (term, buf);
341 }
342 break;
290 } 343 }
291 break;
292 344
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); 345 free (str);
324 346
325 return true; 347 return true;
326 } 348 }
327 else
328 { 349 }
329 // fprintf(stderr,"[%x:%x]",state,keysym); 350
330 return false; 351 return false;
331 }
332} 352}
333 353
334// purge duplicate keymap entries 354// purge duplicate keymap entries
335void keyboard_manager::purge_duplicate_keymap () 355void keyboard_manager::purge_duplicate_keymap ()
336{ 356{
337 for (unsigned int i = 0; i < keymap.size (); ++i) 357 for (unsigned int i = 0; i < keymap.size (); ++i)
338 { 358 {
339 for (unsigned int j = 0; j < i; ++j) 359 for (unsigned int j = 0; j < i; ++j)
340 { 360 {
341 if (keymap[i] == keymap[j]) 361 if (keymap [i] == keymap [j])
342 { 362 {
343 while (keymap[i] == keymap.back ()) 363 while (keymap [i] == keymap.back ())
344 keymap.pop_back (); 364 keymap.pop_back ();
345 365
346 if (i < keymap.size ()) 366 if (i < keymap.size ())
347 { 367 {
348 keymap[i] = keymap.back (); 368 keymap[i] = keymap.back ();
349 keymap.pop_back (); 369 keymap.pop_back ();
350 } 370 }
371
351 break; 372 break;
352 } 373 }
353 } 374 }
354 } 375 }
355} 376}
… …
363 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
364 385
365 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 386 memset (hash_budget_size, 0, sizeof (hash_budget_size));
366 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 387 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
367 388
368 // count keysyms for corresponding hash budgets 389 // determine hash bucket size
369 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)
370 { 392 {
371 assert (keymap[i]);
372 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
373 ++hash_budget_size[hashkey]; 394 ++hash_budget_size [hashkey];
374 }
375
376 // keysym A with range>1 is counted one more time for
377 // every keysym B lies in its range
378 for (i = 0; i < keymap.size (); ++i)
379 {
380 if (keymap[i]->range > 1)
381 {
382 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
383 {
384 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK);
385 if (hash_budget_size[hashkey])
386 ++hash_budget_size[hashkey];
387 }
388 } 395 }
389 }
390 396
391 // now we know the size of each budget 397 // now we know the size of each budget
392 // compute the index of each budget 398 // compute the index of each budget
393 hash[0] = 0; 399 hash [0] = 0;
394 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 400 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
395 { 401 {
396 index += hash_budget_size[i - 1]; 402 index += hash_budget_size [i - 1];
397 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]); 403 hash [i] = index;
398 } 404 }
399 405
400 // and allocate just enough space 406 // and allocate just enough space
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); 407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
403 408
404 // fill in sorted_keymap 409 // fill in sorted_keymap
405 // it is sorted in each budget 410 // it is sorted in each budget
406 for (i = 0; i < keymap.size (); ++i) 411 for (i = 0; i < keymap.size (); ++i)
407 {
408 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)
409 { 413 {
410 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
411 415
412 if (hash_budget_size[hashkey])
413 {
414 index = hash[hashkey] + hash_budget_counter[hashkey]; 416 index = hash [hashkey] + hash_budget_counter [hashkey];
415 417
416 while (index > hash[hashkey] 418 while (index > hash [hashkey]
417 && compare_priority (keymap[i], sorted_keymap[index - 1]) > 0) 419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
418 { 420 {
419 sorted_keymap[index] = sorted_keymap[index - 1]; 421 sorted_keymap [index] = sorted_keymap [index - 1];
420 --index; 422 --index;
421 } 423 }
422 424
423 sorted_keymap[index] = keymap[i]; 425 sorted_keymap [index] = keymap [i];
424 ++hash_budget_counter[hashkey]; 426 ++hash_budget_counter [hashkey];
425 }
426 } 427 }
427 }
428 428
429 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
430 430
431#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 431#ifdef DEBUG_STRICT
432 // check for invariants 432 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
434 { 434 {
435 index = hash[i]; 435 index = hash[i];
436 for (int j = 0; j < hash_budget_size[i]; ++j) 436 for (int j = 0; j < hash_budget_size [i]; ++j)
437 { 437 {
438 if (keymap[index + j]->range == 1) 438 if (keymap [index + j]->range == 1)
439 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 440
441 if (j) 441 if (j)
442 assert (compare_priority (keymap[index + j - 1], 442 assert (compare_priority (keymap [index + j - 1],
443 keymap[index + j]) >= 0); 443 keymap [index + j]) >= 0);
444 } 444 }
445 } 445 }
446 446
447 // this should be able to detect most possible bugs 447 // this should be able to detect most possible bugs
448 for (i = 0; i < sorted_keymap.size (); ++i) 448 for (i = 0; i < sorted_keymap.size (); ++i)
449 { 449 {
450 keysym_t *a = sorted_keymap[i]; 450 keysym_t *a = sorted_keymap[i];
451 for (int j = 0; j < a->range; ++j) 451 for (int j = 0; j < a->range; ++j)
452 { 452 {
453 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 453 int index = find_keysym (a->keysym + j, a->state);
454
454 assert (index >= 0); 455 assert (index >= 0);
455 keysym_t *b = keymap[index]; 456 keysym_t *b = keymap [index];
456 assert (i == (signed) index || // the normally expected result 457 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 458 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
459 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
458 } 460 }
459 } 461 }
460#endif 462#endif
461} 463}
462 464
463int 465int
464keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 466keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
465{ 467{
466 int hashkey = keysym & KEYSYM_HASH_MASK; 468 int hashkey = keysym & KEYSYM_HASH_MASK;
467 unsigned int index = hash [hashkey]; 469 unsigned int index = hash [hashkey];
470 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
471 ? hash [hashkey + 1]
472 : keymap.size ();
468 473
469 for (; index < keymap.size (); ++index) 474 for (; index < end; ++index)
470 { 475 {
471 keysym_t *key = keymap[index]; 476 keysym_t *key = keymap [index];
472 assert (key);
473 477
474 if (key->keysym <= keysym && key->keysym + key->range > keysym 478 if (key->keysym <= keysym && keysym < key->keysym + key->range
475 // match only the specified bits in state and ignore others 479 // match only the specified bits in state and ignore others
476 && (key->state & OtherModMask) == (key->state & state)) 480 && (key->state & state) == key->state)
477 return index; 481 return index;
478 else if (key->keysym > keysym && key->range == 1)
479 return -1;
480 } 482 }
481 483
482 return -1; 484 return -1;
483} 485}
484 486

Diff Legend

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