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

Diff Legend

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