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

Diff Legend

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