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.33 by sf-exg, Mon Jul 26 09:57:53 2010 UTC vs.
Revision 1.34 by sf-exg, Mon Aug 23 15:09:00 2010 UTC

… …
49 * index: 0 I1 I2 I3 In 49 * index: 0 I1 I2 I3 In
50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An 50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
51 * where 51 * where
52 * A1 = 0; 52 * A1 = 0;
53 * Ai+1 = N1 + N2 + ... + Ni. 53 * Ai+1 = N1 + N2 + ... + Ni.
54 * it is computed from hash_budget_size[]: 54 * it is computed from hash_bucket_size[]:
55 * index: 0 I1 I2 I3 In 55 * index: 0 I1 I2 I3 In
56 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0 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 computation of hash[]) 57 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
58 * or we can say 58 * or we can say
59 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0, 59 * hash_bucket_size[Ii] = Ni; hash_bucket_size[elsewhere] = 0,
60 * where 60 * where
61 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym } 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 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[]; 63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[];
64 * Ni(the size of group i) = hash_budget_size[Ii]. 64 * Ni(the size of group i) = hash_bucket_size[Ii].
65 */ 65 */
66 66
67#if STOCK_KEYMAP 67#if STOCK_KEYMAP
68//////////////////////////////////////////////////////////////////////////////// 68////////////////////////////////////////////////////////////////////////////////
69// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
… …
378void 378void
379keyboard_manager::setup_hash () 379keyboard_manager::setup_hash ()
380{ 380{
381 unsigned int i, index, hashkey; 381 unsigned int i, index, hashkey;
382 vector <keysym_t *> sorted_keymap; 382 vector <keysym_t *> sorted_keymap;
383 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 383 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
384 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 384 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
385 385
386 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 386 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
387 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 387 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
388 388
389 // determine hash bucket size 389 // determine hash bucket size
390 for (i = 0; i < keymap.size (); ++i) 390 for (i = 0; i < keymap.size (); ++i)
391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
392 { 392 {
393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
394 ++hash_budget_size [hashkey]; 394 ++hash_bucket_size [hashkey];
395 } 395 }
396 396
397 // now we know the size of each budget 397 // now we know the size of each bucket
398 // compute the index of each budget 398 // compute the index of each bucket
399 hash [0] = 0; 399 hash [0] = 0;
400 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 400 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
401 { 401 {
402 index += hash_budget_size [i - 1]; 402 index += hash_bucket_size [i - 1];
403 hash [i] = index; 403 hash [i] = index;
404 } 404 }
405 405
406 // and allocate just enough space 406 // and allocate just enough space
407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
408 408
409 // fill in sorted_keymap 409 // fill in sorted_keymap
410 // it is sorted in each budget 410 // it is sorted in each bucket
411 for (i = 0; i < keymap.size (); ++i) 411 for (i = 0; i < keymap.size (); ++i)
412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
413 { 413 {
414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
415 415
416 index = hash [hashkey] + hash_budget_counter [hashkey]; 416 index = hash [hashkey] + hash_bucket_counter [hashkey];
417 417
418 while (index > hash [hashkey] 418 while (index > hash [hashkey]
419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
420 { 420 {
421 sorted_keymap [index] = sorted_keymap [index - 1]; 421 sorted_keymap [index] = sorted_keymap [index - 1];
422 --index; 422 --index;
423 } 423 }
424 424
425 sorted_keymap [index] = keymap [i]; 425 sorted_keymap [index] = keymap [i];
426 ++hash_budget_counter [hashkey]; 426 ++hash_bucket_counter [hashkey];
427 } 427 }
428 428
429 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
430 430
431#ifndef NDEBUG 431#ifndef NDEBUG
432 // check for invariants 432 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
434 { 434 {
435 index = hash[i]; 435 index = hash[i];
436 for (int j = 0; j < hash_budget_size [i]; ++j) 436 for (int j = 0; j < hash_bucket_size [i]; ++j)
437 { 437 {
438 if (keymap [index + j]->range == 1) 438 if (keymap [index + j]->range == 1)
439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 440
441 if (j) 441 if (j)
… …
465int 465int
466keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 466keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
467{ 467{
468 int hashkey = keysym & KEYSYM_HASH_MASK; 468 int hashkey = keysym & KEYSYM_HASH_MASK;
469 unsigned int index = hash [hashkey]; 469 unsigned int index = hash [hashkey];
470 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 470 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
471 ? hash [hashkey + 1] 471 ? hash [hashkey + 1]
472 : keymap.size (); 472 : keymap.size ();
473 473
474 for (; index < end; ++index) 474 for (; index < end; ++index)
475 { 475 {

Diff Legend

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