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

Diff Legend

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