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.11 by root, Sun Feb 6 15:18:01 2005 UTC

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

Diff Legend

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