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

Diff Legend

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