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

Diff Legend

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