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.29 by ayin, Thu Jan 10 00:46:12 2008 UTC vs.
Revision 1.73 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

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

Diff Legend

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