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.27 by ayin, Sun Jul 29 09:37:01 2007 UTC vs.
Revision 1.48 by sf-exg, Sun Nov 27 12:12:33 2011 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 * 8 *
9 * This program is free software; you can redistribute it and/or modify 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 10 * 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 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
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 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, handler, 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 67static void
97output_string (rxvt_term *rt, const char *str) 68output_string (rxvt_term *term, const char *str)
98{ 69{
99 if (strncmp (str, "command:", 8) == 0) 70 if (strncmp (str, "command:", 8) == 0)
100 rt->cmd_write (str + 8, strlen (str) - 8); 71 term->cmdbuf_append (str + 8, strlen (str) - 8);
101 else if (strncmp (str, "perl:", 5) == 0) 72 else if (strncmp (str, "perl:", 5) == 0)
102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); 73 HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
103 else 74 else
104 rt->tt_write (str, strlen (str)); 75 term->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} 76}
142 77
143// return: priority_of_a - priority_of_b 78// return: priority_of_a - priority_of_b
144static int 79static int
145compare_priority (keysym_t *a, keysym_t *b) 80compare_priority (keysym_t *a, keysym_t *b)
146{ 81{
147 // (the more '1's in state; the less range): the greater priority 82 // (the more '1's in state; the less range): the greater priority
148 int ca = popcount (a->state /* & OtherModMask */); 83 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
149 int cb = popcount (b->state /* & OtherModMask */); 84 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
150 85
151 if (ca != cb) 86 if (ca != cb)
152 return ca - cb; 87 return ca - cb;
153//else if (a->state != b->state) // this behavior is to be disscussed 88//else if (a->state != b->state) // this behavior is to be discussed
154// return b->state - a->state; 89// return b->state - a->state;
155 else 90 else
156 return b->range - a->range; 91 return 0;
157} 92}
158 93
159//////////////////////////////////////////////////////////////////////////////// 94////////////////////////////////////////////////////////////////////////////////
160keyboard_manager::keyboard_manager () 95keyboard_manager::keyboard_manager ()
161{ 96{
… …
163 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
164} 99}
165 100
166keyboard_manager::~keyboard_manager () 101keyboard_manager::~keyboard_manager ()
167{ 102{
168 clear (); 103 hash [0] = 2;
169}
170 104
171void 105 for (unsigned int i = 0; i < keymap.size (); ++i)
172keyboard_manager::clear () 106 {
173{ 107 free (keymap [i]->str);
108 delete keymap [i];
109 keymap [i] = 0;
110 }
111
174 keymap.clear (); 112 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)
184 {
185 delete user_keymap [i];
186 user_keymap [i] = 0;
187 }
188
189 user_keymap.clear ();
190 user_translations.clear ();
191} 113}
192 114
193// a wrapper for register_keymap, 115// a wrapper for register_translation that converts the input string
194// so that outside codes don't have to know so much details. 116// to utf-8 and expands 'list' syntax.
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 117void
199keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 118keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
200{ 119{
201 keysym_t *key = new keysym_t;
202 wchar_t *wc = rxvt_mbstowcs (trans); 120 wchar_t *wc = rxvt_mbstowcs (trans);
203 char *translation = rxvt_wcstoutf8 (wc); 121 char *translation = rxvt_wcstoutf8 (wc);
204 free (wc); 122 free (wc);
205 123
124 if (strncmp (translation, "list", 4) == 0 && translation [4]
125 && strlen (translation) < STRING_MAX)
126 {
127 char *prefix = translation + 4;
128 char *middle = strchr (prefix + 1, translation [4]);
129 char *suffix = strrchr (prefix + 1, translation [4]);
130
131 if (suffix && middle && suffix > middle + 1)
132 {
133 int range = suffix - middle - 1;
134 int prefix_len = middle - prefix - 1;
135 char buf[STRING_MAX];
136
137 memcpy (buf, prefix + 1, prefix_len);
138 strcpy (buf + prefix_len + 1, suffix + 1);
139
140 for (int i = 0; i < range; i++)
141 {
142 buf [prefix_len] = middle [i + 1];
143 register_translation (keysym + i, state, strdup (buf));
144 }
145
146 free (translation);
147 return;
148 }
149 else
150 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
151 }
152
153 register_translation (keysym, state, translation);
154}
155
156void
157keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
158{
159 keysym_t *key = new keysym_t;
160
206 if (key && translation) 161 if (key && translation)
207 { 162 {
208 key->keysym = keysym; 163 key->keysym = keysym;
209 key->state = state; 164 key->state = state;
210 key->range = 1;
211 key->str = translation; 165 key->str = translation;
212 key->type = keysym_t::STRING; 166 key->type = keysym_t::STRING;
213 167
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) 168 if (strncmp (translation, "builtin:", 8) == 0)
230 key->type = keysym_t::BUILTIN; 169 key->type = keysym_t::BUILTIN;
231 170
171 if (keymap.size () == keymap.capacity ())
172 keymap.reserve (keymap.size () * 2);
173
232 user_keymap.push_back (key); 174 keymap.push_back (key);
233 user_translations.push_back (translation); 175 hash[0] = 3;
234 register_keymap (key);
235 } 176 }
236 else 177 else
237 { 178 {
238 delete key; 179 delete key;
239 free ((void *)translation); 180 free (translation);
240 rxvt_fatal ("out of memory, aborting.\n"); 181 rxvt_fatal ("memory allocation failure. aborting.\n");
241 } 182 }
242}
243
244void
245keyboard_manager::register_keymap (keysym_t *key)
246{
247 if (keymap.size () == keymap.capacity ())
248 keymap.reserve (keymap.size () * 2);
249
250 keymap.push_back (key);
251 hash[0] = 3;
252}
253
254void
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} 183}
270 184
271bool 185bool
272keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 186keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
273{ 187{
274 assert (hash[0] == 0 && "register_done() need to be called"); 188 assert (("register_done() need to be called", hash[0] == 0));
275 189
276 state &= OtherModMask; // mask out uninteresting modifiers 190 state &= OtherModMask; // mask out uninteresting modifiers
277 191
278 if (state & term->ModMetaMask) state |= MetaMask; 192 if (state & term->ModMetaMask) state |= MetaMask;
279 if (state & term->ModNumLockMask) state |= NumLockMask; 193 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
288 { 202 {
289 const keysym_t &key = *keymap [index]; 203 const keysym_t &key = *keymap [index];
290 204
291 if (key.type != keysym_t::BUILTIN) 205 if (key.type != keysym_t::BUILTIN)
292 { 206 {
293 int keysym_offset = keysym - key.keysym;
294
295 wchar_t *wc = rxvt_utf8towcs (key.str); 207 wchar_t *wc = rxvt_utf8towcs (key.str);
296 char *str = rxvt_wcstombs (wc); 208 char *str = rxvt_wcstombs (wc);
297 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 209 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
298 free (wc); 210 free (wc);
299 211
300 switch (key.type)
301 {
302 case keysym_t::STRING:
303 output_string (term, str); 212 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 213
345 free (str); 214 free (str);
346 215
347 return true; 216 return true;
348 } 217 }
349 } 218 }
350 219
351 return false; 220 return false;
352} 221}
353 222
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 223void
379keyboard_manager::setup_hash () 224keyboard_manager::register_done ()
380{ 225{
381 unsigned int i, index, hashkey; 226 unsigned int i, index, hashkey;
382 vector <keysym_t *> sorted_keymap; 227 vector <keysym_t *> sorted_keymap;
383 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 228 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 229
386 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 230 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
387 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
388 231
389 // determine hash bucket size 232 // determine hash bucket size
390 for (i = 0; i < keymap.size (); ++i) 233 for (i = 0; i < keymap.size (); ++i)
391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
392 { 234 {
393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 235 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
394 ++hash_budget_size [hashkey]; 236 ++hash_bucket_size [hashkey];
395 } 237 }
396 238
397 // now we know the size of each budget 239 // now we know the size of each bucket
398 // compute the index of each budget 240 // compute the index of each bucket
399 hash [0] = 0; 241 hash [0] = 0;
400 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 242 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
401 { 243 {
402 index += hash_budget_size [i - 1]; 244 index += hash_bucket_size [i - 1];
403 hash [i] = index; 245 hash [i] = index;
404 } 246 }
405 247
406 // and allocate just enough space 248 // and allocate just enough space
407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 249 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
250
251 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
408 252
409 // fill in sorted_keymap 253 // fill in sorted_keymap
410 // it is sorted in each budget 254 // it is sorted in each bucket
411 for (i = 0; i < keymap.size (); ++i) 255 for (i = 0; i < keymap.size (); ++i)
412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
413 { 256 {
414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 257 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
415 258
416 index = hash [hashkey] + hash_budget_counter [hashkey]; 259 index = hash [hashkey] + hash_bucket_size [hashkey];
417 260
418 while (index > hash [hashkey] 261 while (index > hash [hashkey]
419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 262 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
420 { 263 {
421 sorted_keymap [index] = sorted_keymap [index - 1]; 264 sorted_keymap [index] = sorted_keymap [index - 1];
422 --index; 265 --index;
423 } 266 }
424 267
425 sorted_keymap [index] = keymap [i]; 268 sorted_keymap [index] = keymap [i];
426 ++hash_budget_counter [hashkey]; 269 ++hash_bucket_size [hashkey];
427 } 270 }
428 271
429 keymap.swap (sorted_keymap); 272 keymap.swap (sorted_keymap);
430 273
431#ifdef DEBUG_STRICT 274#ifndef NDEBUG
432 // check for invariants 275 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 276 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
434 { 277 {
435 index = hash[i]; 278 index = hash[i];
436 for (int j = 0; j < hash_budget_size [i]; ++j) 279 for (int j = 0; j < hash_bucket_size [i]; ++j)
437 { 280 {
438 if (keymap [index + j]->range == 1)
439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 281 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 282
441 if (j) 283 if (j)
442 assert (compare_priority (keymap [index + j - 1], 284 assert (compare_priority (keymap [index + j - 1],
443 keymap [index + j]) >= 0); 285 keymap [index + j]) >= 0);
444 } 286 }
… …
446 288
447 // this should be able to detect most possible bugs 289 // this should be able to detect most possible bugs
448 for (i = 0; i < sorted_keymap.size (); ++i) 290 for (i = 0; i < sorted_keymap.size (); ++i)
449 { 291 {
450 keysym_t *a = sorted_keymap[i]; 292 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); 293 int index = find_keysym (a->keysym, a->state);
454 294
455 assert (index >= 0); 295 assert (index >= 0);
456 keysym_t *b = keymap [index]; 296 keysym_t *b = keymap [index];
457 assert (i == (signed) index || // the normally expected result 297 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 298 || a->keysym == b->keysym
459 } 299 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
460 } 300 }
461#endif 301#endif
462} 302}
463 303
464int 304int
465keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 305keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
466{ 306{
467 int hashkey = keysym & KEYSYM_HASH_MASK; 307 int hashkey = keysym & KEYSYM_HASH_MASK;
468 unsigned int index = hash [hashkey]; 308 unsigned int index = hash [hashkey];
469 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 309 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
470 ? hash [hashkey + 1] 310 ? hash [hashkey + 1]
471 : keymap.size (); 311 : keymap.size ();
472 312
473 for (; index < end; ++index) 313 for (; index < end; ++index)
474 { 314 {
475 keysym_t *key = keymap [index]; 315 keysym_t *key = keymap [index];
476 316
477 if (key->keysym <= keysym && keysym < key->keysym + key->range 317 if (key->keysym == keysym
478 // match only the specified bits in state and ignore others 318 // match only the specified bits in state and ignore others
479 && (key->state & state) == key->state) 319 && (key->state & state) == key->state)
480 return index; 320 return index;
481 } 321 }
482 322

Diff Legend

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