|
|
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 <pcg@goof.com> |
|
|
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 |
67 | #if STOCK_KEYMAP |
44 | //////////////////////////////////////////////////////////////////////////////// |
68 | //////////////////////////////////////////////////////////////////////////////// |
45 | // default keycode translation map and keyevent handlers |
69 | // default keycode translation map and keyevent handlers |
46 | |
70 | |
47 | keysym_t keyboard_manager::stock_keymap[] = { |
71 | keysym_t keyboard_manager::stock_keymap[] = { |
48 | /* examples */ |
72 | /* examples */ |
49 | /* keysym, state, range, handler, str */ |
73 | /* keysym, state, range, type, str */ |
50 | //{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, |
74 | //{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"}, |
51 | //{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, |
75 | //{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, |
52 | //{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, |
76 | //{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, |
53 | //{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, |
77 | //{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, |
54 | //{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, |
78 | //{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, |
55 | //{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, |
79 | //{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, |
56 | //{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, |
80 | //{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"}, |
57 | //{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, |
81 | //{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"}, |
58 | //{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, |
82 | //{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"}, |
59 | //{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, |
83 | //{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"}, |
60 | //{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, |
84 | //{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"}, |
61 | //{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, |
85 | //{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"}, |
62 | //{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, |
86 | //{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"}, |
63 | //{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, |
87 | //{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"}, |
64 | //{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, |
88 | //{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"}, |
65 | //{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, |
89 | //{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"}, |
66 | //{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, |
90 | //{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, |
67 | //{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, |
91 | //{ '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>"}, |
92 | //{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, |
69 | }; |
93 | }; |
70 | #endif |
94 | #endif |
71 | |
95 | |
72 | static void |
96 | static void |
73 | output_string (rxvt_term *rt, const char *str) |
97 | output_string (rxvt_term *rt, const char *str) |
74 | { |
98 | { |
75 | if (strncmp (str, "command:", 8) == 0) |
99 | if (strncmp (str, "command:", 8) == 0) |
76 | rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); |
100 | rt->cmd_write (str + 8, strlen (str) - 8); |
|
|
101 | else if (strncmp (str, "perl:", 5) == 0) |
|
|
102 | HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); |
77 | else |
103 | else |
78 | rt->tt_write ((unsigned char *)str, strlen (str)); |
104 | rt->tt_write (str, strlen (str)); |
79 | } |
105 | } |
80 | |
106 | |
81 | static void |
107 | static void |
82 | output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen) |
108 | output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen) |
83 | { |
109 | { |
… | |
… | |
90 | *ch |= 0x80; |
116 | *ch |= 0x80; |
91 | } |
117 | } |
92 | else if (rt->meta_char == C0_ESC) /* escape prefix */ |
118 | else if (rt->meta_char == C0_ESC) /* escape prefix */ |
93 | #endif |
119 | #endif |
94 | { |
120 | { |
95 | const unsigned char ch = C0_ESC; |
121 | const char ch = C0_ESC; |
96 | rt->tt_write (&ch, 1); |
122 | rt->tt_write (&ch, 1); |
97 | } |
123 | } |
98 | } |
124 | } |
99 | |
125 | |
100 | rt->tt_write ((unsigned char *) buf, buflen); |
126 | rt->tt_write (buf, buflen); |
101 | } |
127 | } |
102 | |
128 | |
103 | static int |
129 | static int |
104 | format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) |
130 | format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) |
105 | { |
131 | { |
… | |
… | |
111 | *buf = 0; |
137 | *buf = 0; |
112 | } |
138 | } |
113 | |
139 | |
114 | return len; |
140 | return len; |
115 | } |
141 | } |
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 |
|
|
122 | static int |
|
|
123 | bitcount (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 | |
142 | |
134 | // return: priority_of_a - priority_of_b |
143 | // return: priority_of_a - priority_of_b |
135 | static int |
144 | static int |
136 | compare_priority (keysym_t *a, keysym_t *b) |
145 | compare_priority (keysym_t *a, keysym_t *b) |
137 | { |
146 | { |
138 | // (the more '1's in state; the less range): the greater priority |
147 | // (the more '1's in state; the less range): the greater priority |
139 | int ca = bitcount (a->state /* & OtherModMask */); |
148 | int ca = rxvt_popcount (a->state /* & OtherModMask */); |
140 | int cb = bitcount (b->state /* & OtherModMask */); |
149 | int cb = rxvt_popcount (b->state /* & OtherModMask */); |
141 | |
150 | |
142 | if (ca != cb) |
151 | if (ca != cb) |
143 | return ca - cb; |
152 | return ca - cb; |
144 | //else if (a->state != b->state) // this behavior is to be disscussed |
153 | //else if (a->state != b->state) // this behavior is to be discussed |
145 | // return b->state - a->state; |
154 | // return b->state - a->state; |
146 | else |
155 | else |
147 | return b->range - a->range; |
156 | return b->range - a->range; |
148 | } |
157 | } |
149 | |
158 | |
… | |
… | |
162 | void |
171 | void |
163 | keyboard_manager::clear () |
172 | keyboard_manager::clear () |
164 | { |
173 | { |
165 | keymap.clear (); |
174 | keymap.clear (); |
166 | hash [0] = 2; |
175 | 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) |
|
|
175 | { |
|
|
176 | delete user_keymap [i]; |
|
|
177 | user_keymap [i] = 0; |
|
|
178 | } |
|
|
179 | |
|
|
180 | user_keymap.clear (); |
|
|
181 | user_translations.clear (); |
|
|
182 | } |
176 | } |
183 | |
177 | |
184 | // a wrapper for register_keymap, |
178 | // a wrapper for register_keymap, |
185 | // so that outside codes don't have to know so much details. |
179 | // so that outside codes don't have to know so much details. |
186 | // |
180 | // |
… | |
… | |
189 | void |
183 | void |
190 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
184 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
191 | { |
185 | { |
192 | keysym_t *key = new keysym_t; |
186 | keysym_t *key = new keysym_t; |
193 | wchar_t *wc = rxvt_mbstowcs (trans); |
187 | wchar_t *wc = rxvt_mbstowcs (trans); |
194 | const char *translation = rxvt_wcstoutf8 (wc); |
188 | char *translation = rxvt_wcstoutf8 (wc); |
195 | free (wc); |
189 | free (wc); |
196 | |
190 | |
197 | if (key && translation) |
191 | if (key && translation) |
198 | { |
192 | { |
199 | key->keysym = keysym; |
193 | key->keysym = keysym; |
200 | key->state = state; |
194 | key->state = state; |
201 | key->range = 1; |
195 | key->range = 1; |
202 | key->str = translation; |
196 | key->str = translation; |
203 | key->type = keysym_t::NORMAL; |
197 | key->type = keysym_t::STRING; |
204 | |
198 | |
205 | if (strncmp (translation, "list", 4) == 0 && translation [4]) |
199 | if (strncmp (translation, "list", 4) == 0 && translation [4]) |
206 | { |
200 | { |
207 | char *middle = strchr (translation + 5, translation [4]); |
201 | char *middle = strchr (translation + 5, translation [4]); |
208 | char *suffix = strrchr (translation + 5, translation [4]); |
202 | char *suffix = strrchr (translation + 5, translation [4]); |
209 | |
203 | |
210 | if (suffix && middle && suffix > middle + 1) |
204 | if (suffix && middle && suffix > middle + 1) |
211 | { |
205 | { |
212 | key->type = keysym_t::LIST; |
206 | key->type = keysym_t::LIST; |
213 | key->range = suffix - middle - 1; |
207 | key->range = suffix - middle - 1; |
214 | |
208 | |
215 | strcpy (translation, translation + 4); |
209 | memmove (translation, translation + 4, strlen (translation + 4) + 1); |
216 | } |
210 | } |
217 | else |
211 | else |
218 | rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); |
212 | rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); |
219 | } |
213 | } |
220 | else if (strncmp (translation, "builtin:", 8) == 0) |
214 | else if (strncmp (translation, "builtin:", 8) == 0) |
221 | key->type = keysym_t::BUILTIN; |
215 | key->type = keysym_t::BUILTIN; |
222 | |
216 | |
223 | user_keymap.push_back (key); |
|
|
224 | user_translations.push_back (translation); |
|
|
225 | register_keymap (key); |
217 | register_keymap (key); |
226 | } |
218 | } |
227 | else |
219 | else |
228 | { |
220 | { |
229 | delete key; |
221 | delete key; |
… | |
… | |
288 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
280 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
289 | free (wc); |
281 | free (wc); |
290 | |
282 | |
291 | switch (key.type) |
283 | switch (key.type) |
292 | { |
284 | { |
293 | case keysym_t::NORMAL: |
285 | case keysym_t::STRING: |
294 | output_string (term, str); |
286 | output_string (term, str); |
295 | break; |
287 | break; |
296 | |
288 | |
297 | case keysym_t::RANGE: |
289 | case keysym_t::RANGE: |
298 | { |
290 | { |
… | |
… | |
369 | void |
361 | void |
370 | keyboard_manager::setup_hash () |
362 | keyboard_manager::setup_hash () |
371 | { |
363 | { |
372 | unsigned int i, index, hashkey; |
364 | unsigned int i, index, hashkey; |
373 | vector <keysym_t *> sorted_keymap; |
365 | vector <keysym_t *> sorted_keymap; |
374 | uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget |
366 | uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket |
375 | uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget |
367 | uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket |
376 | |
368 | |
377 | memset (hash_budget_size, 0, sizeof (hash_budget_size)); |
369 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
378 | memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); |
370 | memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter)); |
379 | |
371 | |
380 | // determine hash bucket size |
372 | // determine hash bucket size |
381 | for (i = 0; i < keymap.size (); ++i) |
373 | for (i = 0; i < keymap.size (); ++i) |
382 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) |
374 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
383 | { |
375 | { |
384 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
376 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
385 | ++hash_budget_size [hashkey]; |
377 | ++hash_bucket_size [hashkey]; |
386 | } |
378 | } |
387 | |
379 | |
388 | // now we know the size of each budget |
380 | // now we know the size of each bucket |
389 | // compute the index of each budget |
381 | // compute the index of each bucket |
390 | hash [0] = 0; |
382 | hash [0] = 0; |
391 | for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) |
383 | for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) |
392 | { |
384 | { |
393 | index += hash_budget_size [i - 1]; |
385 | index += hash_bucket_size [i - 1]; |
394 | hash [i] = index; |
386 | hash [i] = index; |
395 | } |
387 | } |
396 | |
388 | |
397 | // and allocate just enough space |
389 | // and allocate just enough space |
398 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); |
390 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); |
399 | |
391 | |
400 | // fill in sorted_keymap |
392 | // fill in sorted_keymap |
401 | // it is sorted in each budget |
393 | // it is sorted in each bucket |
402 | for (i = 0; i < keymap.size (); ++i) |
394 | for (i = 0; i < keymap.size (); ++i) |
403 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) |
395 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
404 | { |
396 | { |
405 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
397 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
406 | |
398 | |
407 | index = hash [hashkey] + hash_budget_counter [hashkey]; |
399 | index = hash [hashkey] + hash_bucket_counter [hashkey]; |
408 | |
400 | |
409 | while (index > hash [hashkey] |
401 | while (index > hash [hashkey] |
410 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
402 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
411 | { |
403 | { |
412 | sorted_keymap [index] = sorted_keymap [index - 1]; |
404 | sorted_keymap [index] = sorted_keymap [index - 1]; |
413 | --index; |
405 | --index; |
414 | } |
406 | } |
415 | |
407 | |
416 | sorted_keymap [index] = keymap [i]; |
408 | sorted_keymap [index] = keymap [i]; |
417 | ++hash_budget_counter [hashkey]; |
409 | ++hash_bucket_counter [hashkey]; |
418 | } |
410 | } |
419 | |
411 | |
420 | keymap.swap (sorted_keymap); |
412 | keymap.swap (sorted_keymap); |
421 | |
413 | |
422 | #if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) |
414 | #ifndef NDEBUG |
423 | // check for invariants |
415 | // check for invariants |
424 | for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) |
416 | for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) |
425 | { |
417 | { |
426 | index = hash[i]; |
418 | index = hash[i]; |
427 | for (int j = 0; j < hash_budget_size [i]; ++j) |
419 | for (int j = 0; j < hash_bucket_size [i]; ++j) |
428 | { |
420 | { |
429 | if (keymap [index + j]->range == 1) |
421 | if (keymap [index + j]->range == 1) |
430 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
422 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
431 | |
423 | |
432 | if (j) |
424 | if (j) |
… | |
… | |
443 | { |
435 | { |
444 | int index = find_keysym (a->keysym + j, a->state); |
436 | int index = find_keysym (a->keysym + j, a->state); |
445 | |
437 | |
446 | assert (index >= 0); |
438 | assert (index >= 0); |
447 | keysym_t *b = keymap [index]; |
439 | keysym_t *b = keymap [index]; |
448 | assert (i == (signed) index || // the normally expected result |
440 | assert (i == index // the normally expected result |
449 | (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 |
441 | || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) |
|
|
442 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
450 | } |
443 | } |
451 | } |
444 | } |
452 | #endif |
445 | #endif |
453 | } |
446 | } |
454 | |
447 | |
455 | int |
448 | int |
456 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
449 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
457 | { |
450 | { |
458 | int hashkey = keysym & KEYSYM_HASH_MASK; |
451 | int hashkey = keysym & KEYSYM_HASH_MASK; |
459 | unsigned int index = hash [hashkey]; |
452 | unsigned int index = hash [hashkey]; |
460 | unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 |
453 | unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1 |
461 | ? hash [hashkey + 1] |
454 | ? hash [hashkey + 1] |
462 | : keymap.size (); |
455 | : keymap.size (); |
463 | |
456 | |
464 | for (; index < end; ++index) |
457 | for (; index < end; ++index) |
465 | { |
458 | { |
466 | keysym_t *key = keymap [index]; |
459 | keysym_t *key = keymap [index]; |