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

Diff Legend

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