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.29 by ayin, Thu Jan 10 00:46:12 2008 UTC vs.
Revision 1.35 by sf-exg, Mon Aug 23 15:58:43 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 compution 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
… …
143// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
144static int 144static int
145compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
146{ 146{
147 // (the more '1's in state; the less range): the greater priority 147 // (the more '1's in state; the less range): the greater priority
148 int ca = popcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
149 int cb = popcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
150 150
151 if (ca != cb) 151 if (ca != cb)
152 return ca - cb; 152 return ca - cb;
153//else if (a->state != b->state) // this behavior is to be disscussed 153//else if (a->state != b->state) // this behavior is to be discussed
154// return b->state - a->state; 154// return b->state - a->state;
155 else 155 else
156 return b->range - a->range; 156 return b->range - a->range;
157} 157}
158 158
… …
171void 171void
172keyboard_manager::clear () 172keyboard_manager::clear ()
173{ 173{
174 keymap.clear (); 174 keymap.clear ();
175 hash [0] = 2; 175 hash [0] = 2;
176
177 for (unsigned int i = 0; i < user_translations.size (); ++i)
178 {
179 free ((void *)user_translations [i]);
180 user_translations [i] = 0;
181 }
182
183 for (unsigned int i = 0; i < user_keymap.size (); ++i)
184 {
185 delete user_keymap [i];
186 user_keymap [i] = 0;
187 }
188
189 user_keymap.clear ();
190 user_translations.clear ();
191} 176}
192 177
193// a wrapper for register_keymap, 178// a wrapper for register_keymap,
194// so that outside codes don't have to know so much details. 179// so that outside codes don't have to know so much details.
195// 180//
… …
227 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 212 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
228 } 213 }
229 else if (strncmp (translation, "builtin:", 8) == 0) 214 else if (strncmp (translation, "builtin:", 8) == 0)
230 key->type = keysym_t::BUILTIN; 215 key->type = keysym_t::BUILTIN;
231 216
232 user_keymap.push_back (key);
233 user_translations.push_back (translation);
234 register_keymap (key); 217 register_keymap (key);
235 } 218 }
236 else 219 else
237 { 220 {
238 delete key; 221 delete key;
… …
378void 361void
379keyboard_manager::setup_hash () 362keyboard_manager::setup_hash ()
380{ 363{
381 unsigned int i, index, hashkey; 364 unsigned int i, index, hashkey;
382 vector <keysym_t *> sorted_keymap; 365 vector <keysym_t *> sorted_keymap;
383 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 366 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 367 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
385 368
386 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 369 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
387 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 370 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
388 371
389 // determine hash bucket size 372 // determine hash bucket size
390 for (i = 0; i < keymap.size (); ++i) 373 for (i = 0; i < keymap.size (); ++i)
391 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 374 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
392 { 375 {
393 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 376 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
394 ++hash_budget_size [hashkey]; 377 ++hash_bucket_size [hashkey];
395 } 378 }
396 379
397 // now we know the size of each budget 380 // now we know the size of each bucket
398 // compute the index of each budget 381 // compute the index of each bucket
399 hash [0] = 0; 382 hash [0] = 0;
400 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 383 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
401 { 384 {
402 index += hash_budget_size [i - 1]; 385 index += hash_bucket_size [i - 1];
403 hash [i] = index; 386 hash [i] = index;
404 } 387 }
405 388
406 // and allocate just enough space 389 // and allocate just enough space
407 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 390 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
408 391
409 // fill in sorted_keymap 392 // fill in sorted_keymap
410 // it is sorted in each budget 393 // it is sorted in each bucket
411 for (i = 0; i < keymap.size (); ++i) 394 for (i = 0; i < keymap.size (); ++i)
412 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 395 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
413 { 396 {
414 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 397 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
415 398
416 index = hash [hashkey] + hash_budget_counter [hashkey]; 399 index = hash [hashkey] + hash_bucket_counter [hashkey];
417 400
418 while (index > hash [hashkey] 401 while (index > hash [hashkey]
419 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 402 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
420 { 403 {
421 sorted_keymap [index] = sorted_keymap [index - 1]; 404 sorted_keymap [index] = sorted_keymap [index - 1];
422 --index; 405 --index;
423 } 406 }
424 407
425 sorted_keymap [index] = keymap [i]; 408 sorted_keymap [index] = keymap [i];
426 ++hash_budget_counter [hashkey]; 409 ++hash_bucket_counter [hashkey];
427 } 410 }
428 411
429 keymap.swap (sorted_keymap); 412 keymap.swap (sorted_keymap);
430 413
431#ifdef DEBUG_STRICT 414#ifndef NDEBUG
432 // check for invariants 415 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 416 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
434 { 417 {
435 index = hash[i]; 418 index = hash[i];
436 for (int j = 0; j < hash_budget_size [i]; ++j) 419 for (int j = 0; j < hash_bucket_size [i]; ++j)
437 { 420 {
438 if (keymap [index + j]->range == 1) 421 if (keymap [index + j]->range == 1)
439 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 422 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 423
441 if (j) 424 if (j)
… …
452 { 435 {
453 int index = find_keysym (a->keysym + j, a->state); 436 int index = find_keysym (a->keysym + j, a->state);
454 437
455 assert (index >= 0); 438 assert (index >= 0);
456 keysym_t *b = keymap [index]; 439 keysym_t *b = keymap [index];
457 assert (i == (signed) index || // the normally expected result 440 assert (i == index // the normally expected result
458 (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 441 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
442 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
459 } 443 }
460 } 444 }
461#endif 445#endif
462} 446}
463 447
464int 448int
465keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 449keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
466{ 450{
467 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
468 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
469 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 453 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
470 ? hash [hashkey + 1] 454 ? hash [hashkey + 1]
471 : keymap.size (); 455 : keymap.size ();
472 456
473 for (; index < end; ++index) 457 for (; index < end; ++index)
474 { 458 {

Diff Legend

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