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.17 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.73 by sf-exg, Tue Oct 13 08:10:43 2015 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 3 of the License, or
13 * (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details.
19 *
20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *----------------------------------------------------------------------*/
24
1#include "../config.h" 25#include "../config.h"
2#include "rxvt.h" 26#include "rxvt.h"
3 27
4#ifdef KEYSYM_RESOURCE 28#ifdef KEYSYM_RESOURCE
5 29
6#include <cstring> 30#include <string.h>
7 31
32#include "rxvtperl.h"
8#include "keyboard.h" 33#include "keyboard.h"
9#include "command.h"
10 34
11/* an intro to the data structure: 35/* an intro to the data structure:
12 * 36 *
13 * vector keymap[] is grouped. 37 * vector keymap[] is grouped.
14 * 38 *
… …
25 * index: 0 I1 I2 I3 In 49 * index: 0 I1 I2 I3 In
26 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An 50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
27 * where 51 * where
28 * A1 = 0; 52 * A1 = 0;
29 * Ai+1 = N1 + N2 + ... + Ni. 53 * Ai+1 = N1 + N2 + ... + Ni.
30 * it is computed from hash_budget_size[]: 54 * it is computed from hash_bucket_size[]:
31 * index: 0 I1 I2 I3 In 55 * index: 0 I1 I2 I3 In
32 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0 56 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0
33 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[]) 57 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
34 * or we can say 58 * or we can say
35 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0, 59 * hash_bucket_size[Ii] = Ni; hash_bucket_size[elsewhere] = 0,
36 * where 60 * where
37 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym } 61 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym }
38 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK 62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
39 * n(the number of groups) = the number of non-zero member of hash_budget_size[]; 63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[];
40 * Ni(the size of group i) = hash_budget_size[Ii]. 64 * Ni(the size of group i) = hash_bucket_size[Ii].
41 */ 65 */
42
43#if STOCK_KEYMAP
44////////////////////////////////////////////////////////////////////////////////
45// default keycode translation map and keyevent handlers
46
47keysym_t keyboard_manager::stock_keymap[] = {
48 /* examples */
49 /* keysym, state, range, handler, str */
50//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"},
51//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
52//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
53//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
54//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
55//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
56//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"},
57//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"},
58//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"},
59//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"},
60//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"},
61//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"},
62//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"},
63//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"},
64//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"},
65//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"},
66//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
67//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
68//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
69};
70#endif
71
72static void
73output_string (rxvt_term *rt, const char *str)
74{
75 if (strncmp (str, "command:", 8) == 0)
76 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8);
77 else
78 rt->tt_write ((unsigned char *)str, strlen (str));
79}
80
81static void
82output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen)
83{
84 if (state & rt->ModMetaMask)
85 {
86#ifdef META8_OPTION
87 if (rt->meta_char == 0x80) /* set 8-bit on */
88 {
89 for (char *ch = buf; ch < buf + buflen; ch++)
90 *ch |= 0x80;
91 }
92 else if (rt->meta_char == C0_ESC) /* escape prefix */
93#endif
94 {
95 const unsigned char ch = C0_ESC;
96 rt->tt_write (&ch, 1);
97 }
98 }
99
100 rt->tt_write ((unsigned char *) buf, buflen);
101}
102
103static int
104format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
105{
106 size_t len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]);
107
108 if (len >= (size_t)bufsize)
109 {
110 rxvt_warn ("format_keyrange_string: formatting failed, ignoring key.\n");
111 *buf = 0;
112 }
113
114 return len;
115}
116
117////////////////////////////////////////////////////////////////////////////////
118// return: #bits of '1'
119#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
120# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
121#else
122static int
123bitcount (uint16_t n)
124{
125 int i;
126
127 for (i = 0; n; ++i, n &= n - 1)
128 ;
129
130 return i;
131}
132#endif
133 66
134// return: priority_of_a - priority_of_b 67// return: priority_of_a - priority_of_b
135static int 68static int
136compare_priority (keysym_t *a, keysym_t *b) 69compare_priority (keysym_t *a, keysym_t *b)
137{ 70{
138 // (the more '1's in state; the less range): the greater priority 71 // (the more '1's in state; the less range): the greater priority
139 int ca = bitcount (a->state /* & OtherModMask */); 72 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
140 int cb = bitcount (b->state /* & OtherModMask */); 73 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
141 74
142 if (ca != cb)
143 return ca - cb; 75 return ca - cb;
144//else if (a->state != b->state) // this behavior is to be disscussed
145// return b->state - a->state;
146 else
147 return b->range - a->range;
148} 76}
149 77
150//////////////////////////////////////////////////////////////////////////////// 78////////////////////////////////////////////////////////////////////////////////
151keyboard_manager::keyboard_manager () 79keyboard_manager::keyboard_manager ()
152{ 80{
… …
154 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 82 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
155} 83}
156 84
157keyboard_manager::~keyboard_manager () 85keyboard_manager::~keyboard_manager ()
158{ 86{
159 clear (); 87 for (unsigned int i = 0; i < keymap.size (); ++i)
88 {
89 free (keymap [i]->str);
90 delete keymap [i];
91 }
160} 92}
161 93
162void 94void
163keyboard_manager::clear () 95keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
164{ 96{
165 keymap.clear ();
166 hash [0] = 2;
167
168 for (unsigned int i = 0; i < user_translations.size (); ++i)
169 {
170 free ((void *)user_translations [i]);
171 user_translations [i] = 0;
172 }
173
174 for (unsigned int i = 0; i < user_keymap.size (); ++i) 97 for (unsigned int i = 0; i < keymap.size (); ++i)
98 if (keymap [i]->keysym == keysym
99 && keymap [i]->state == state)
175 { 100 {
101 free (keymap [i]->str);
176 delete user_keymap [i]; 102 delete keymap [i];
177 user_keymap [i] = 0; 103
104 if (i < keymap.size () - 1)
105 keymap [i] = keymap [keymap.size () - 1];
106 keymap.pop_back ();
107
108 break;
178 } 109 }
179
180 user_keymap.clear ();
181 user_translations.clear ();
182} 110}
183 111
184// a wrapper for register_keymap,
185// so that outside codes don't have to know so much details.
186//
187// the string 'trans' is copied to an internal managed buffer,
188// so the caller can free memory of 'trans' at any time.
189void 112void
190keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 113keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
191{ 114{
115 char *action = rxvt_wcstoutf8 (ws);
116
192 keysym_t *key = new keysym_t; 117 keysym_t *key = new keysym_t;
193 wchar_t *wc = rxvt_mbstowcs (trans);
194 const char *translation = rxvt_wcstoutf8 (wc);
195 free (wc);
196 118
197 if (key && translation)
198 {
199 key->keysym = keysym; 119 key->keysym = keysym;
200 key->state = state; 120 key->state = state;
201 key->range = 1;
202 key->str = translation; 121 key->str = action;
203 key->type = keysym_t::NORMAL; 122 key->type = keysym_t::STRING;
204 123
205 if (strncmp (translation, "list", 4) == 0 && translation [4])
206 {
207 char *middle = strchr (translation + 5, translation [4]);
208 char *suffix = strrchr (translation + 5, translation [4]);
209
210 if (suffix && middle && suffix > middle + 1)
211 {
212 key->type = keysym_t::LIST;
213 key->range = suffix - middle - 1;
214
215 strcpy (translation, translation + 4);
216 }
217 else
218 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
219 }
220 else if (strncmp (translation, "builtin:", 8) == 0) 124 if (strncmp (action, "builtin:", 8) == 0)
221 key->type = keysym_t::BUILTIN; 125 key->type = keysym_t::BUILTIN;
126 else if (strncmp (action, "builtin-string:", 15) == 0)
127 key->type = keysym_t::BUILTIN_STRING;
222 128
223 user_keymap.push_back (key); 129 unregister_action (keysym, state);
224 user_translations.push_back (translation);
225 register_keymap (key);
226 }
227 else
228 {
229 delete key;
230 free ((void *)translation);
231 rxvt_fatal ("out of memory, aborting.\n");
232 }
233}
234 130
235void
236keyboard_manager::register_keymap (keysym_t *key)
237{
238 if (keymap.size () == keymap.capacity ()) 131 if (keymap.size () == keymap.capacity ())
239 keymap.reserve (keymap.size () * 2); 132 keymap.reserve (keymap.size () * 2);
240 133
241 keymap.push_back (key); 134 keymap.push_back (key);
242 hash[0] = 3; 135 hash[0] = 3;
243} 136}
244 137
245void 138keysym_t *
246keyboard_manager::register_done ()
247{
248#if STOCK_KEYMAP
249 int n = sizeof (stock_keymap) / sizeof (keysym_t);
250
251 //TODO: shield against repeated calls and empty keymap
252 //if (keymap.back () != &stock_keymap[n - 1])
253 for (int i = 0; i < n; ++i)
254 register_keymap (&stock_keymap[i]);
255#endif
256
257 purge_duplicate_keymap ();
258
259 setup_hash ();
260}
261
262bool
263keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 139keyboard_manager::lookup_keysym (rxvt_term *term, KeySym keysym, unsigned int state)
264{ 140{
265 assert (hash[0] == 0 && "register_done() need to be called"); 141 assert (("register_done() need to be called", hash[0] == 0));
266 142
267 state &= OtherModMask; // mask out uninteresting modifiers 143 state &= OtherModMask; // mask out uninteresting modifiers
268 144
269 if (state & term->ModMetaMask) state |= MetaMask; 145 if (state & term->ModMetaMask) state |= MetaMask;
270 if (state & term->ModNumLockMask) state |= NumLockMask; 146 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
273 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 149 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
274 state |= AppKeypadMask; 150 state |= AppKeypadMask;
275 151
276 int index = find_keysym (keysym, state); 152 int index = find_keysym (keysym, state);
277 153
278 if (index >= 0) 154 return index >= 0 ? keymap [index] : 0;
279 { 155}
280 const keysym_t &key = *keymap [index];
281 156
157bool
158keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
159{
160 keysym_t *key = lookup_keysym (term, keysym, state);
161
162 if (key)
163 {
282 if (key.type != keysym_t::BUILTIN) 164 if (key->type == keysym_t::BUILTIN_STRING)
283 { 165 {
284 int keysym_offset = keysym - key.keysym; 166 term->tt_write_user_input (kbuf, len);
285
286 wchar_t *wc = rxvt_utf8towcs (key.str);
287 char *str = rxvt_wcstombs (wc);
288 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
289 free (wc);
290
291 switch (key.type)
292 {
293 case keysym_t::NORMAL:
294 output_string (term, str);
295 break;
296
297 case keysym_t::RANGE:
298 {
299 char buf[STRING_MAX];
300
301 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
302 output_string (term, buf);
303 }
304 break;
305
306 case keysym_t::RANGE_META8:
307 {
308 int len;
309 char buf[STRING_MAX];
310
311 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
312 if (len > 0)
313 output_string_meta8 (term, state, buf, len);
314 }
315 break;
316
317 case keysym_t::LIST:
318 {
319 char buf[STRING_MAX];
320
321 char *prefix, *middle, *suffix;
322
323 prefix = str;
324 middle = strchr (prefix + 1, *prefix);
325 suffix = strrchr (middle + 1, *prefix);
326
327 memcpy (buf, prefix + 1, middle - prefix - 1);
328 buf [middle - prefix - 1] = middle [keysym_offset + 1];
329 strcpy (buf + (middle - prefix), suffix + 1);
330
331 output_string (term, buf);
332 }
333 break;
334 }
335
336 free (str);
337
338 return true; 167 return true;
339 } 168 }
169 else if (key->type != keysym_t::BUILTIN)
170 {
171 wchar_t *ws = rxvt_utf8towcs (key->str);
172 char *str = rxvt_wcstombs (ws);
173 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
174 free (ws);
175
176 if (char *colon = strchr (str, ':'))
177 {
178 if (strncmp (str, "command:", 8) == 0)
179 term->cmdbuf_append (str + 8, strlen (str) - 8);
180 else if (strncmp (str, "string:", 7) == 0)
181 term->tt_write_user_input (colon + 1, strlen (colon + 1));
182 else if (strncmp (str, "perl:", 5) == 0)
183 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
184 else
185 HOOK_INVOKE ((term, HOOK_ACTION, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_INT, 0, DT_STR_LEN, kbuf, len, DT_END));
186 }
187 else
188 term->tt_write_user_input (str, strlen (str));
189
190 free (str);
191
192 return true;
193 }
340 } 194 }
341 195
342 return false; 196 return false;
343} 197}
344 198
345// purge duplicate keymap entries
346void keyboard_manager::purge_duplicate_keymap ()
347{
348 for (unsigned int i = 0; i < keymap.size (); ++i)
349 {
350 for (unsigned int j = 0; j < i; ++j)
351 {
352 if (keymap [i] == keymap [j])
353 {
354 while (keymap [i] == keymap.back ())
355 keymap.pop_back ();
356
357 if (i < keymap.size ())
358 {
359 keymap[i] = keymap.back ();
360 keymap.pop_back ();
361 }
362
363 break;
364 }
365 }
366 }
367}
368
369void 199void
370keyboard_manager::setup_hash () 200keyboard_manager::register_done ()
371{ 201{
372 unsigned int i, index, hashkey; 202 unsigned int i, index, hashkey;
373 vector <keysym_t *> sorted_keymap;
374 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 203 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
375 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
376 204
377 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 205 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
378 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
379 206
380 // determine hash bucket size 207 // determine hash bucket size
381 for (i = 0; i < keymap.size (); ++i) 208 for (i = 0; i < keymap.size (); ++i)
382 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
383 { 209 {
384 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 210 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
385 ++hash_budget_size [hashkey]; 211 ++hash_bucket_size [hashkey];
386 } 212 }
387 213
388 // now we know the size of each budget 214 // now we know the size of each bucket
389 // compute the index of each budget 215 // compute the index of each bucket
390 hash [0] = 0;
391 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 216 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
392 { 217 {
393 index += hash_budget_size [i - 1];
394 hash [i] = index; 218 hash [i] = index;
219 index += hash_bucket_size [i];
395 } 220 }
396 221
397 // and allocate just enough space 222 // and allocate just enough space
398 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 223 simplevec <keysym_t *> sorted_keymap (index, 0);
224
225 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
399 226
400 // fill in sorted_keymap 227 // fill in sorted_keymap
401 // it is sorted in each budget 228 // it is sorted in each bucket
402 for (i = 0; i < keymap.size (); ++i) 229 for (i = 0; i < keymap.size (); ++i)
403 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
404 { 230 {
405 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 231 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
406 232
407 index = hash [hashkey] + hash_budget_counter [hashkey]; 233 index = hash [hashkey] + hash_bucket_size [hashkey];
408 234
409 while (index > hash [hashkey] 235 while (index > hash [hashkey]
410 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 236 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
411 { 237 {
412 sorted_keymap [index] = sorted_keymap [index - 1]; 238 sorted_keymap [index] = sorted_keymap [index - 1];
413 --index; 239 --index;
414 } 240 }
415 241
416 sorted_keymap [index] = keymap [i]; 242 sorted_keymap [index] = keymap [i];
417 ++hash_budget_counter [hashkey]; 243 ++hash_bucket_size [hashkey];
418 } 244 }
419 245
420 keymap.swap (sorted_keymap); 246 keymap.swap (sorted_keymap);
421 247
422#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 248#ifndef NDEBUG
423 // check for invariants 249 // check for invariants
424 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 250 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
425 { 251 {
426 index = hash[i]; 252 index = hash[i];
427 for (int j = 0; j < hash_budget_size [i]; ++j) 253 for (int j = 0; j < hash_bucket_size [i]; ++j)
428 { 254 {
429 if (keymap [index + j]->range == 1)
430 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 255 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
431 256
432 if (j) 257 if (j)
433 assert (compare_priority (keymap [index + j - 1], 258 assert (compare_priority (keymap [index + j - 1],
434 keymap [index + j]) >= 0); 259 keymap [index + j]) >= 0);
435 } 260 }
… …
437 262
438 // this should be able to detect most possible bugs 263 // this should be able to detect most possible bugs
439 for (i = 0; i < sorted_keymap.size (); ++i) 264 for (i = 0; i < sorted_keymap.size (); ++i)
440 { 265 {
441 keysym_t *a = sorted_keymap[i]; 266 keysym_t *a = sorted_keymap[i];
442 for (int j = 0; j < a->range; ++j)
443 {
444 int index = find_keysym (a->keysym + j, a->state); 267 int index = find_keysym (a->keysym, a->state);
445 268
446 assert (index >= 0); 269 assert (index >= 0);
447 keysym_t *b = keymap [index]; 270 keysym_t *b = keymap [index];
448 assert (i == (signed) index || // the normally expected result 271 assert (i == index // the normally expected result
449 (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 272 || a->keysym == b->keysym
450 } 273 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
451 } 274 }
452#endif 275#endif
453} 276}
454 277
455int 278int
456keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 279keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
457{ 280{
458 int hashkey = keysym & KEYSYM_HASH_MASK; 281 int hashkey = keysym & KEYSYM_HASH_MASK;
459 unsigned int index = hash [hashkey]; 282 unsigned int index = hash [hashkey];
460 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 283 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
461 ? hash [hashkey + 1] 284 ? hash [hashkey + 1]
462 : keymap.size (); 285 : keymap.size ();
463 286
464 for (; index < end; ++index) 287 for (; index < end; ++index)
465 { 288 {
466 keysym_t *key = keymap [index]; 289 keysym_t *key = keymap [index];
467 290
468 if (key->keysym <= keysym && keysym < key->keysym + key->range 291 if (key->keysym == keysym
469 // match only the specified bits in state and ignore others 292 // match only the specified bits in state and ignore others
470 && (key->state & state) == key->state) 293 && (key->state & state) == key->state)
471 return index; 294 return index;
472 } 295 }
473 296

Diff Legend

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