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.3 by root, Sun Jan 16 18:48:04 2005 UTC vs.
Revision 1.6 by root, Sun Jan 16 19:20:30 2005 UTC

… …
57 *ch |= 0x80; 57 *ch |= 0x80;
58 } 58 }
59 else if (rt->meta_char == C0_ESC) /* escape prefix */ 59 else if (rt->meta_char == C0_ESC) /* escape prefix */
60#endif 60#endif
61 { 61 {
62 const unsigned char 62 const unsigned char ch = C0_ESC;
63 ch = C0_ESC;
64 rt->tt_write (&ch, 1); 63 rt->tt_write (&ch, 1);
65 } 64 }
66 } 65 }
67 66
68 rt->tt_write ((unsigned char *) buf, buflen); 67 rt->tt_write ((unsigned char *) buf, buflen);
… …
73{ 72{
74 int len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]); 73 int len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]);
75 74
76 if (len >= bufsize) 75 if (len >= bufsize)
77 { 76 {
78 fprintf (stderr, "buffer overflowed!\n"); 77 rxvt_warn ("buffer overflowed!\n");
79 buf[bufsize - 1] = '\0'; 78 *buf = 0;
80 } 79 }
81 else if (len < 0) 80 else if (len < 0)
82 { 81 {
83 perror ("keyrange_translator()"); 82 rxvt_warn ("keyrange_translator(), snprintf error");
83 *buf = 0;
84 } 84 }
85 85
86 return len; 86 return len;
87} 87}
88 88
… …
119 119
120//////////////////////////////////////////////////////////////////////////////// 120////////////////////////////////////////////////////////////////////////////////
121keyboard_manager::keyboard_manager () 121keyboard_manager::keyboard_manager ()
122{ 122{
123 keymap.reserve (256); 123 keymap.reserve (256);
124 hash[0] = 1; // hash[0] != 0 indicates uninitialized data 124 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
125} 125}
126 126
127keyboard_manager::~keyboard_manager () 127keyboard_manager::~keyboard_manager ()
128{ 128{
129 clear (); 129 clear ();
… …
236bool 236bool
237keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 237keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
238{ 238{
239 assert (hash[0] == 0 && "register_done() need to be called"); 239 assert (hash[0] == 0 && "register_done() need to be called");
240 240
241 if (state & term->ModMetaMask) 241 if (state & term->ModMetaMask) state |= MetaMask;
242 state |= MetaMask;
243
244 if (state & term->ModNumLockMask) 242 if (state & term->ModNumLockMask) state |= NumLockMask;
245 state |= NumLockMask; 243 if (state & term->ModLevel3Mask) state |= Level3Mask;
246 244
247 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 245 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
248 state |= AppKeypadMask; 246 state |= AppKeypadMask;
249 247
250 int index = find_keysym (keysym, state); 248 int index = find_keysym (keysym, state);
… …
322{ 320{
323 for (unsigned int i = 0; i < keymap.size (); ++i) 321 for (unsigned int i = 0; i < keymap.size (); ++i)
324 { 322 {
325 for (unsigned int j = 0; j < i; ++j) 323 for (unsigned int j = 0; j < i; ++j)
326 { 324 {
327 if (keymap[i] == keymap[j]) 325 if (keymap [i] == keymap [j])
328 { 326 {
329 while (keymap[i] == keymap.back ()) 327 while (keymap [i] == keymap.back ())
330 keymap.pop_back (); 328 keymap.pop_back ();
331 329
332 if (i < keymap.size ()) 330 if (i < keymap.size ())
333 { 331 {
334 keymap[i] = keymap.back (); 332 keymap[i] = keymap.back ();
… …
352 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 350 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
353 351
354 // count keysyms for corresponding hash budgets 352 // count keysyms for corresponding hash budgets
355 for (i = 0; i < keymap.size (); ++i) 353 for (i = 0; i < keymap.size (); ++i)
356 { 354 {
357 assert (keymap[i]); 355 assert (keymap [i]);
358 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 356 hashkey = (keymap [i]->keysym & KEYSYM_HASH_MASK);
359 ++hash_budget_size[hashkey]; 357 ++hash_budget_size [hashkey];
360 } 358 }
361 359
362 // keysym A with range>1 is counted one more time for 360 // keysym A with range>1 is counted one more time for
363 // every keysym B lies in its range 361 // every keysym B lies in its range
364 for (i = 0; i < keymap.size (); ++i) 362 for (i = 0; i < keymap.size (); ++i)
365 { 363 {
366 if (keymap[i]->range > 1) 364 if (keymap[i]->range > 1)
367 { 365 {
368 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j) 366 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
369 { 367 {
370 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 368 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
371 if (hash_budget_size[hashkey]) 369 if (hash_budget_size [hashkey])
372 ++hash_budget_size[hashkey]; 370 ++hash_budget_size [hashkey];
373 } 371 }
374 } 372 }
375 } 373 }
376 374
377 // now we know the size of each budget 375 // now we know the size of each budget
378 // compute the index of each budget 376 // compute the index of each budget
379 hash[0] = 0; 377 hash [0] = 0;
380 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 378 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
381 { 379 {
382 index += hash_budget_size[i - 1]; 380 index += hash_budget_size [i - 1];
383 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]); 381 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]);
384 } 382 }
385 383
386 // and allocate just enough space 384 // and allocate just enough space
387 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]); 385 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
388 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size[i - 1], 0); 386 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
389 387
390 // fill in sorted_keymap 388 // fill in sorted_keymap
391 // it is sorted in each budget 389 // it is sorted in each budget
392 for (i = 0; i < keymap.size (); ++i) 390 for (i = 0; i < keymap.size (); ++i)
393 { 391 {
394 for (int j = min (keymap[i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 392 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
395 { 393 {
396 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 394 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
397 395
398 if (hash_budget_size[hashkey]) 396 if (hash_budget_size [hashkey])
399 { 397 {
400 index = hash[hashkey] + hash_budget_counter[hashkey]; 398 index = hash [hashkey] + hash_budget_counter [hashkey];
401 399
402 while (index > hash[hashkey] 400 while (index > hash [hashkey]
403 && compare_priority (keymap[i], sorted_keymap[index - 1]) > 0) 401 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
404 { 402 {
405 sorted_keymap[index] = sorted_keymap[index - 1]; 403 sorted_keymap [index] = sorted_keymap [index - 1];
406 --index; 404 --index;
407 } 405 }
408 406
409 sorted_keymap[index] = keymap[i]; 407 sorted_keymap [index] = keymap [i];
410 ++hash_budget_counter[hashkey]; 408 ++hash_budget_counter [hashkey];
411 } 409 }
412 } 410 }
413 } 411 }
414 412
415 keymap.swap (sorted_keymap); 413 keymap.swap (sorted_keymap);
… …
417#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 415#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
418 // check for invariants 416 // check for invariants
419 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 417 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
420 { 418 {
421 index = hash[i]; 419 index = hash[i];
422 for (int j = 0; j < hash_budget_size[i]; ++j) 420 for (int j = 0; j < hash_budget_size [i]; ++j)
423 { 421 {
424 if (keymap[index + j]->range == 1) 422 if (keymap [index + j]->range == 1)
425 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 423 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
426 424
427 if (j) 425 if (j)
428 assert (compare_priority (keymap[index + j - 1], 426 assert (compare_priority (keymap [index + j - 1],
429 keymap[index + j]) >= 0); 427 keymap [index + j]) >= 0);
430 } 428 }
431 } 429 }
432 430
433 // this should be able to detect most possible bugs 431 // this should be able to detect most possible bugs
434 for (i = 0; i < sorted_keymap.size (); ++i) 432 for (i = 0; i < sorted_keymap.size (); ++i)
435 { 433 {
436 keysym_t *a = sorted_keymap[i]; 434 keysym_t *a = sorted_keymap[i];
437 for (int j = 0; j < a->range; ++j) 435 for (int j = 0; j < a->range; ++j)
438 { 436 {
439 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 437 int index = find_keysym (a->keysym + j, a->state & OtherModMask);
438
440 assert (index >= 0); 439 assert (index >= 0);
441 keysym_t *b = keymap[index]; 440 keysym_t *b = keymap [index];
442 assert (i == (signed) index || // the normally expected result 441 assert (i == (signed) index || // the normally expected result
443 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same 442 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same
444 } 443 }
445 } 444 }
446#endif 445#endif
… …
452 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
453 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
454 453
455 for (; index < keymap.size (); ++index) 454 for (; index < keymap.size (); ++index)
456 { 455 {
457 keysym_t *key = keymap[index]; 456 keysym_t *key = keymap [index];
458 assert (key); 457 assert (key);
459 458
460 if (key->keysym <= keysym && key->keysym + key->range > keysym 459 if (key->keysym <= keysym && key->keysym + key->range > keysym
461 // match only the specified bits in state and ignore others 460 // match only the specified bits in state and ignore others
462 && (key->state & OtherModMask) == (key->state & state)) 461 && (key->state & OtherModMask) == (key->state & state))

Diff Legend

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