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.2 by root, Sun Jan 16 18:05:37 2005 UTC

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

Diff Legend

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