… | |
… | |
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. |
… | |
… | |
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_bucket_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_bucket_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 | |
|
|
71 | keysym_t keyboard_manager::stock_keymap[] = { |
|
|
72 | /* examples */ |
|
|
73 | /* keysym, state, range, type, 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 | |
|
|
96 | static void |
67 | static void |
97 | output_string (rxvt_term *rt, const char *str) |
68 | output_string (rxvt_term *rt, 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 | rt->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((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); |
103 | else |
74 | else |
104 | rt->tt_write (str, strlen (str)); |
75 | rt->tt_write (str, strlen (str)); |
105 | } |
76 | } |
106 | |
77 | |
107 | static void |
|
|
108 | output_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 | |
|
|
129 | static int |
|
|
130 | format_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 | } |
|
|
142 | |
|
|
143 | // return: priority_of_a - priority_of_b |
78 | // return: priority_of_a - priority_of_b |
144 | static int |
79 | static int |
145 | compare_priority (keysym_t *a, keysym_t *b) |
80 | compare_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 = rxvt_popcount (a->state /* & OtherModMask */); |
83 | int ca = ecb_popcount32 (a->state /* & OtherModMask */); |
149 | int cb = rxvt_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 discussed |
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 | //////////////////////////////////////////////////////////////////////////////// |
160 | keyboard_manager::keyboard_manager () |
95 | keyboard_manager::keyboard_manager () |
161 | { |
96 | { |
… | |
… | |
169 | } |
104 | } |
170 | |
105 | |
171 | void |
106 | void |
172 | keyboard_manager::clear () |
107 | keyboard_manager::clear () |
173 | { |
108 | { |
|
|
109 | hash [0] = 2; |
|
|
110 | |
|
|
111 | for (unsigned int i = 0; i < keymap.size (); ++i) |
|
|
112 | { |
|
|
113 | free ((void *)keymap [i]->str); |
|
|
114 | delete keymap [i]; |
|
|
115 | keymap [i] = 0; |
|
|
116 | } |
|
|
117 | |
174 | keymap.clear (); |
118 | 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 | } |
119 | } |
192 | |
120 | |
193 | // a wrapper for register_keymap, |
121 | // a wrapper for register_translation that converts the input string |
194 | // so that outside codes don't have to know so much details. |
122 | // 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. |
|
|
198 | void |
123 | void |
199 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
124 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
200 | { |
125 | { |
201 | keysym_t *key = new keysym_t; |
|
|
202 | wchar_t *wc = rxvt_mbstowcs (trans); |
126 | wchar_t *wc = rxvt_mbstowcs (trans); |
203 | char *translation = rxvt_wcstoutf8 (wc); |
127 | char *translation = rxvt_wcstoutf8 (wc); |
204 | free (wc); |
128 | free (wc); |
205 | |
129 | |
|
|
130 | if (strncmp (translation, "list", 4) == 0 && translation [4] |
|
|
131 | && strlen (translation) < STRING_MAX) |
|
|
132 | { |
|
|
133 | char *prefix = translation + 4; |
|
|
134 | char *middle = strchr (prefix + 1, translation [4]); |
|
|
135 | char *suffix = strrchr (prefix + 1, translation [4]); |
|
|
136 | |
|
|
137 | if (suffix && middle && suffix > middle + 1) |
|
|
138 | { |
|
|
139 | int range = suffix - middle - 1; |
|
|
140 | int prefix_len = middle - prefix - 1; |
|
|
141 | char buf[STRING_MAX]; |
|
|
142 | |
|
|
143 | memcpy (buf, prefix + 1, prefix_len); |
|
|
144 | strcpy (buf + prefix_len + 1, suffix + 1); |
|
|
145 | |
|
|
146 | for (int i = 0; i < range; i++) |
|
|
147 | { |
|
|
148 | buf [prefix_len] = middle [i + 1]; |
|
|
149 | register_translation (keysym + i, state, strdup (buf)); |
|
|
150 | } |
|
|
151 | |
|
|
152 | free (translation); |
|
|
153 | return; |
|
|
154 | } |
|
|
155 | else |
|
|
156 | rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation); |
|
|
157 | } |
|
|
158 | |
|
|
159 | register_translation (keysym, state, translation); |
|
|
160 | } |
|
|
161 | |
|
|
162 | void |
|
|
163 | keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) |
|
|
164 | { |
|
|
165 | keysym_t *key = new keysym_t; |
|
|
166 | |
206 | if (key && translation) |
167 | if (key && translation) |
207 | { |
168 | { |
208 | key->keysym = keysym; |
169 | key->keysym = keysym; |
209 | key->state = state; |
170 | key->state = state; |
210 | key->range = 1; |
|
|
211 | key->str = translation; |
171 | key->str = translation; |
212 | key->type = keysym_t::STRING; |
172 | key->type = keysym_t::STRING; |
213 | |
173 | |
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) |
174 | if (strncmp (translation, "builtin:", 8) == 0) |
230 | key->type = keysym_t::BUILTIN; |
175 | key->type = keysym_t::BUILTIN; |
231 | |
176 | |
232 | user_keymap.push_back (key); |
|
|
233 | user_translations.push_back (translation); |
|
|
234 | register_keymap (key); |
177 | register_keymap (key); |
235 | } |
178 | } |
236 | else |
179 | else |
237 | { |
180 | { |
238 | delete key; |
181 | delete key; |
… | |
… | |
252 | } |
195 | } |
253 | |
196 | |
254 | void |
197 | void |
255 | keyboard_manager::register_done () |
198 | keyboard_manager::register_done () |
256 | { |
199 | { |
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 (); |
200 | setup_hash (); |
269 | } |
201 | } |
270 | |
202 | |
271 | bool |
203 | bool |
272 | keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) |
204 | keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) |
… | |
… | |
288 | { |
220 | { |
289 | const keysym_t &key = *keymap [index]; |
221 | const keysym_t &key = *keymap [index]; |
290 | |
222 | |
291 | if (key.type != keysym_t::BUILTIN) |
223 | if (key.type != keysym_t::BUILTIN) |
292 | { |
224 | { |
293 | int keysym_offset = keysym - key.keysym; |
|
|
294 | |
|
|
295 | wchar_t *wc = rxvt_utf8towcs (key.str); |
225 | wchar_t *wc = rxvt_utf8towcs (key.str); |
296 | char *str = rxvt_wcstombs (wc); |
226 | char *str = rxvt_wcstombs (wc); |
297 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
227 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
298 | free (wc); |
228 | free (wc); |
299 | |
229 | |
300 | switch (key.type) |
|
|
301 | { |
|
|
302 | case keysym_t::STRING: |
|
|
303 | output_string (term, str); |
230 | 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 | |
231 | |
345 | free (str); |
232 | free (str); |
346 | |
233 | |
347 | return true; |
234 | return true; |
348 | } |
235 | } |
349 | } |
236 | } |
350 | |
237 | |
351 | return false; |
238 | return false; |
352 | } |
|
|
353 | |
|
|
354 | // purge duplicate keymap entries |
|
|
355 | void 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 | } |
239 | } |
377 | |
240 | |
378 | void |
241 | void |
379 | keyboard_manager::setup_hash () |
242 | keyboard_manager::setup_hash () |
380 | { |
243 | { |
381 | unsigned int i, index, hashkey; |
244 | unsigned int i, index, hashkey; |
382 | vector <keysym_t *> sorted_keymap; |
245 | vector <keysym_t *> sorted_keymap; |
383 | uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket |
246 | uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket |
384 | uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket |
|
|
385 | |
247 | |
386 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
248 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
387 | memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter)); |
|
|
388 | |
249 | |
389 | // determine hash bucket size |
250 | // determine hash bucket size |
390 | for (i = 0; i < keymap.size (); ++i) |
251 | for (i = 0; i < keymap.size (); ++i) |
391 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
|
|
392 | { |
252 | { |
393 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
253 | hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; |
394 | ++hash_bucket_size [hashkey]; |
254 | ++hash_bucket_size [hashkey]; |
395 | } |
255 | } |
396 | |
256 | |
397 | // now we know the size of each bucket |
257 | // now we know the size of each bucket |
398 | // compute the index of each bucket |
258 | // compute the index of each bucket |
399 | hash [0] = 0; |
259 | hash [0] = 0; |
400 | for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) |
260 | for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) |
… | |
… | |
404 | } |
264 | } |
405 | |
265 | |
406 | // and allocate just enough space |
266 | // and allocate just enough space |
407 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); |
267 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); |
408 | |
268 | |
|
|
269 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
|
|
270 | |
409 | // fill in sorted_keymap |
271 | // fill in sorted_keymap |
410 | // it is sorted in each bucket |
272 | // it is sorted in each bucket |
411 | for (i = 0; i < keymap.size (); ++i) |
273 | for (i = 0; i < keymap.size (); ++i) |
412 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
|
|
413 | { |
274 | { |
414 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
275 | hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; |
415 | |
276 | |
416 | index = hash [hashkey] + hash_bucket_counter [hashkey]; |
277 | index = hash [hashkey] + hash_bucket_size [hashkey]; |
417 | |
278 | |
418 | while (index > hash [hashkey] |
279 | while (index > hash [hashkey] |
419 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
280 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
420 | { |
281 | { |
421 | sorted_keymap [index] = sorted_keymap [index - 1]; |
282 | sorted_keymap [index] = sorted_keymap [index - 1]; |
422 | --index; |
283 | --index; |
423 | } |
284 | } |
424 | |
285 | |
425 | sorted_keymap [index] = keymap [i]; |
286 | sorted_keymap [index] = keymap [i]; |
426 | ++hash_bucket_counter [hashkey]; |
287 | ++hash_bucket_size [hashkey]; |
427 | } |
288 | } |
428 | |
289 | |
429 | keymap.swap (sorted_keymap); |
290 | keymap.swap (sorted_keymap); |
430 | |
291 | |
431 | #ifndef NDEBUG |
292 | #ifndef NDEBUG |
432 | // check for invariants |
293 | // check for invariants |
433 | for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) |
294 | for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) |
434 | { |
295 | { |
435 | index = hash[i]; |
296 | index = hash[i]; |
436 | for (int j = 0; j < hash_bucket_size [i]; ++j) |
297 | for (int j = 0; j < hash_bucket_size [i]; ++j) |
437 | { |
298 | { |
438 | if (keymap [index + j]->range == 1) |
|
|
439 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
299 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
440 | |
300 | |
441 | if (j) |
301 | if (j) |
442 | assert (compare_priority (keymap [index + j - 1], |
302 | assert (compare_priority (keymap [index + j - 1], |
443 | keymap [index + j]) >= 0); |
303 | keymap [index + j]) >= 0); |
444 | } |
304 | } |
… | |
… | |
446 | |
306 | |
447 | // this should be able to detect most possible bugs |
307 | // this should be able to detect most possible bugs |
448 | for (i = 0; i < sorted_keymap.size (); ++i) |
308 | for (i = 0; i < sorted_keymap.size (); ++i) |
449 | { |
309 | { |
450 | keysym_t *a = sorted_keymap[i]; |
310 | 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); |
311 | int index = find_keysym (a->keysym, a->state); |
454 | |
312 | |
455 | assert (index >= 0); |
313 | assert (index >= 0); |
456 | keysym_t *b = keymap [index]; |
314 | keysym_t *b = keymap [index]; |
457 | assert (i == index // the normally expected result |
315 | assert (i == index // the normally expected result |
458 | || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) |
316 | || a->keysym == b->keysym |
459 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
317 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
460 | } |
|
|
461 | } |
318 | } |
462 | #endif |
319 | #endif |
463 | } |
320 | } |
464 | |
321 | |
465 | int |
322 | int |
… | |
… | |
473 | |
330 | |
474 | for (; index < end; ++index) |
331 | for (; index < end; ++index) |
475 | { |
332 | { |
476 | keysym_t *key = keymap [index]; |
333 | keysym_t *key = keymap [index]; |
477 | |
334 | |
478 | if (key->keysym <= keysym && keysym < key->keysym + key->range |
335 | if (key->keysym == keysym |
479 | // match only the specified bits in state and ignore others |
336 | // match only the specified bits in state and ignore others |
480 | && (key->state & state) == key->state) |
337 | && (key->state & state) == key->state) |
481 | return index; |
338 | return index; |
482 | } |
339 | } |
483 | |
340 | |