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

Diff Legend

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