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.10 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.15 by root, Sun Apr 17 22:36:13 2005 UTC

… …
6#include <cstring> 6#include <cstring>
7 7
8#include "keyboard.h" 8#include "keyboard.h"
9#include "command.h" 9#include "command.h"
10 10
11/* an intro to the data structure:
12 *
13 * vector keymap[] is grouped.
14 *
15 * inside each group, elements are sorted by the criteria given by compare_priority().
16 * the lookup of keysym is done in two steps:
17 * 1) locate the group corresponds to the keysym;
18 * 2) do a linear search inside the group.
19 *
20 * array hash[] effectively defines a map from a keysym to a group in keymap[].
21 *
22 * each group has its address(the index of first group element in keymap[]),
23 * which is computed and stored in hash[].
24 * hash[] stores the addresses in the form of:
25 * index: 0 I1 I2 I3 In
26 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
27 * where
28 * A1 = 0;
29 * Ai+1 = N1 + N2 + ... + Ni.
30 * it is computed from hash_budget_size[]:
31 * index: 0 I1 I2 I3 In
32 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0
33 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[])
34 * or we can say
35 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0,
36 * where
37 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym }
38 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
39 * n(the number of groups) = the number of non-zero member of hash_budget_size[];
40 * Ni(the size of group i) = hash_budget_size[Ii].
41 */
42
43#if STOCK_KEYMAP
11//////////////////////////////////////////////////////////////////////////////// 44////////////////////////////////////////////////////////////////////////////////
12// default keycode translation map and keyevent handlers 45// default keycode translation map and keyevent handlers
13 46
14keysym_t keyboard_manager::stock_keymap[] = { 47keysym_t keyboard_manager::stock_keymap[] = {
15 /* examples */ 48 /* examples */
… …
32//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 65//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"},
33//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 66//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
34//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 67//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
35//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, 68//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
36}; 69};
70#endif
37 71
38static void 72static void
39output_string (rxvt_term *rt, const char *str) 73output_string (rxvt_term *rt, const char *str)
40{ 74{
41 if (strncmp (str, "command:", 8) == 0) 75 if (strncmp (str, "command:", 8) == 0)
… …
207} 241}
208 242
209void 243void
210keyboard_manager::register_done () 244keyboard_manager::register_done ()
211{ 245{
246#if STOCK_KEYMAP
212 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 247 int n = sizeof (stock_keymap) / sizeof (keysym_t);
213 248
249 //TODO: shield against repeated calls and empty keymap
214 if (keymap.back () != &stock_keymap[n - 1]) 250 //if (keymap.back () != &stock_keymap[n - 1])
215 for (i = 0; i < n; ++i) 251 for (int i = 0; i < n; ++i)
216 register_keymap (&stock_keymap[i]); 252 register_keymap (&stock_keymap[i]);
253#endif
217 254
218 purge_duplicate_keymap (); 255 purge_duplicate_keymap ();
219 256
220 setup_hash (); 257 setup_hash ();
221} 258}
222 259
223bool 260bool
224keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 261keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
225{ 262{
226 assert (hash[0] == 0 && "register_done() need to be called"); 263 assert (hash[0] == 0 && "register_done() need to be called");
264
265 state &= OtherModMask; // mask out uninteresting modifiers
227 266
228 if (state & term->ModMetaMask) state |= MetaMask; 267 if (state & term->ModMetaMask) state |= MetaMask;
229 if (state & term->ModNumLockMask) state |= NumLockMask; 268 if (state & term->ModNumLockMask) state |= NumLockMask;
230 if (state & term->ModLevel3Mask) state |= Level3Mask; 269 if (state & term->ModLevel3Mask) state |= Level3Mask;
231 270
… …
239 const keysym_t &key = *keymap [index]; 278 const keysym_t &key = *keymap [index];
240 279
241 int keysym_offset = keysym - key.keysym; 280 int keysym_offset = keysym - key.keysym;
242 281
243 wchar_t *wc = rxvt_utf8towcs (key.str); 282 wchar_t *wc = rxvt_utf8towcs (key.str);
244
245 char *str = rxvt_wcstombs (wc); 283 char *str = rxvt_wcstombs (wc);
246 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 284 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
247 free (wc); 285 free (wc);
248 286
249 switch (key.type) 287 switch (key.type)
250 { 288 {
251 case keysym_t::NORMAL: 289 case keysym_t::NORMAL:
… …
294 free (str); 332 free (str);
295 333
296 return true; 334 return true;
297 } 335 }
298 else 336 else
299 {
300 // fprintf(stderr,"[%x:%x]",state,keysym);
301 return false; 337 return false;
302 }
303} 338}
304 339
305// purge duplicate keymap entries 340// purge duplicate keymap entries
306void keyboard_manager::purge_duplicate_keymap () 341void keyboard_manager::purge_duplicate_keymap ()
307{ 342{
… …
317 if (i < keymap.size ()) 352 if (i < keymap.size ())
318 { 353 {
319 keymap[i] = keymap.back (); 354 keymap[i] = keymap.back ();
320 keymap.pop_back (); 355 keymap.pop_back ();
321 } 356 }
357
322 break; 358 break;
323 } 359 }
324 } 360 }
325 } 361 }
326} 362}
… …
334 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 370 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
335 371
336 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 372 memset (hash_budget_size, 0, sizeof (hash_budget_size));
337 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 373 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
338 374
339 // count keysyms for corresponding hash budgets 375 // determine hash bucket size
340 for (i = 0; i < keymap.size (); ++i) 376 for (i = 0; i < keymap.size (); ++i)
377 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
341 { 378 {
342 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; 379 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
343 ++hash_budget_size [hashkey]; 380 ++hash_budget_size [hashkey];
344 }
345
346 // a keysym_t with range>1 is counted one more time for every keysym that
347 // lies in its range
348 for (i = 0; i < keymap.size (); ++i)
349 {
350 if (keymap[i]->range > 1)
351 {
352 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
353 {
354 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
355 if (hash_budget_size [hashkey])
356 ++hash_budget_size [hashkey];
357 }
358 } 381 }
359 }
360 382
361 // now we know the size of each budget 383 // now we know the size of each budget
362 // compute the index of each budget 384 // compute the index of each budget
363 hash [0] = 0; 385 hash [0] = 0;
364 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 386 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
365 { 387 {
366 index += hash_budget_size [i - 1]; 388 index += hash_budget_size [i - 1];
367 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); 389 hash [i] = index;
368 } 390 }
369 391
370 // and allocate just enough space 392 // and allocate just enough space
371 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 393 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
372 394
373 // fill in sorted_keymap 395 // fill in sorted_keymap
374 // it is sorted in each budget 396 // it is sorted in each budget
375 for (i = 0; i < keymap.size (); ++i) 397 for (i = 0; i < keymap.size (); ++i)
376 {
377 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 398 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
378 { 399 {
379 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 400 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
380 401
381 if (hash_budget_size [hashkey])
382 {
383 index = hash [hashkey] + hash_budget_counter [hashkey]; 402 index = hash [hashkey] + hash_budget_counter [hashkey];
384 403
385 while (index > hash [hashkey] 404 while (index > hash [hashkey]
386 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 405 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
387 { 406 {
388 sorted_keymap [index] = sorted_keymap [index - 1]; 407 sorted_keymap [index] = sorted_keymap [index - 1];
389 --index; 408 --index;
390 } 409 }
391 410
392 sorted_keymap [index] = keymap [i]; 411 sorted_keymap [index] = keymap [i];
393 ++hash_budget_counter [hashkey]; 412 ++hash_budget_counter [hashkey];
394 }
395 } 413 }
396 }
397 414
398 keymap.swap (sorted_keymap); 415 keymap.swap (sorted_keymap);
399 416
400#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 417#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
401 // check for invariants 418 // check for invariants
… …
433int 450int
434keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 451keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
435{ 452{
436 int hashkey = keysym & KEYSYM_HASH_MASK; 453 int hashkey = keysym & KEYSYM_HASH_MASK;
437 unsigned int index = hash [hashkey]; 454 unsigned int index = hash [hashkey];
455 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
456 ? hash [hashkey + 1]
457 : keymap.size ();
438 458
439 for (; index < keymap.size (); ++index) 459 for (; index < end; ++index)
440 { 460 {
441 keysym_t *key = keymap [index]; 461 keysym_t *key = keymap [index];
442 462
443 if (key->keysym <= keysym && key->keysym + key->range > keysym 463 if (key->keysym <= keysym && keysym < key->keysym + key->range
464#if 0 // disabled because the custom ekymap does not know the builtin keymap
444 // match only the specified bits in state and ignore others 465 // match only the specified bits in state and ignore others
445 && (key->state & state) == key->state) 466 && (key->state & state) == key->state
467#else // re-enable this part once the builtin keymap is handled here, too
468 && key->state == state
469#endif
470 )
446 return index; 471 return index;
447 else if ((key->keysym & KEYSYM_HASH_MASK) > hashkey && key->range == 1)
448 return -1;
449 } 472 }
450 473
451 return -1; 474 return -1;
452} 475}
453 476

Diff Legend

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