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.2 by root, Sun Jan 16 18:05:37 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 ();
… …
228 for (i = 0; i < n; ++i) 228 for (i = 0; i < n; ++i)
229 register_keymap (&stock_keymap[i]); 229 register_keymap (&stock_keymap[i]);
230 230
231 purge_duplicate_keymap (); 231 purge_duplicate_keymap ();
232 232
233#if TO_BE_DONE_INSIDE_dispatch
234 for (i = 0; i < keymap.size (); ++i)
235 {
236 keysym_t *key = keymap[i];
237
238 assert (bitcount (term_->ModMetaMask) == 1 && "call me after ModMetaMask was set!");
239
240 if (key->state & MetaMask)
241 {
242 //key->state &= ~MetaMask;
243 key->state |= term_->ModMetaMask;
244 }
245
246 assert (bitcount (term_->ModNumLockMask) == 1 && "call me after ModNumLockMask was set!");
247
248 if (key->state & NumLockMask)
249 {
250 //key->state &= ~NumLockMask;
251 key->state |= term_->ModNumLockMask;
252 }
253 }
254#endif
255
256 setup_hash (); 233 setup_hash ();
257} 234}
258 235
259bool 236bool
260keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 237keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
261{ 238{
262 assert (hash[0] == 0 && "register_done() need to be called"); 239 assert (hash[0] == 0 && "register_done() need to be called");
240
241 if (state & term->ModMetaMask) state |= MetaMask;
242 if (state & term->ModNumLockMask) state |= NumLockMask;
243 if (state & term->ModLevel3Mask) state |= Level3Mask;
244
245 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
246 state |= AppKeypadMask;
263 247
264 int index = find_keysym (keysym, state); 248 int index = find_keysym (keysym, state);
265 249
266 if (index >= 0) 250 if (index >= 0)
267 { 251 {
… …
336{ 320{
337 for (unsigned int i = 0; i < keymap.size (); ++i) 321 for (unsigned int i = 0; i < keymap.size (); ++i)
338 { 322 {
339 for (unsigned int j = 0; j < i; ++j) 323 for (unsigned int j = 0; j < i; ++j)
340 { 324 {
341 if (keymap[i] == keymap[j]) 325 if (keymap [i] == keymap [j])
342 { 326 {
343 while (keymap[i] == keymap.back ()) 327 while (keymap [i] == keymap.back ())
344 keymap.pop_back (); 328 keymap.pop_back ();
345 329
346 if (i < keymap.size ()) 330 if (i < keymap.size ())
347 { 331 {
348 keymap[i] = keymap.back (); 332 keymap[i] = keymap.back ();
… …
366 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 350 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
367 351
368 // count keysyms for corresponding hash budgets 352 // count keysyms for corresponding hash budgets
369 for (i = 0; i < keymap.size (); ++i) 353 for (i = 0; i < keymap.size (); ++i)
370 { 354 {
371 assert (keymap[i]); 355 assert (keymap [i]);
372 hashkey = (keymap[i]->keysym & KEYSYM_HASH_MASK); 356 hashkey = (keymap [i]->keysym & KEYSYM_HASH_MASK);
373 ++hash_budget_size[hashkey]; 357 ++hash_budget_size [hashkey];
374 } 358 }
375 359
376 // keysym A with range>1 is counted one more time for 360 // keysym A with range>1 is counted one more time for
377 // every keysym B lies in its range 361 // every keysym B lies in its range
378 for (i = 0; i < keymap.size (); ++i) 362 for (i = 0; i < keymap.size (); ++i)
379 { 363 {
380 if (keymap[i]->range > 1) 364 if (keymap[i]->range > 1)
381 { 365 {
382 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)
383 { 367 {
384 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 368 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
385 if (hash_budget_size[hashkey]) 369 if (hash_budget_size [hashkey])
386 ++hash_budget_size[hashkey]; 370 ++hash_budget_size [hashkey];
387 } 371 }
388 } 372 }
389 } 373 }
390 374
391 // now we know the size of each budget 375 // now we know the size of each budget
392 // compute the index of each budget 376 // compute the index of each budget
393 hash[0] = 0; 377 hash [0] = 0;
394 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 378 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
395 { 379 {
396 index += hash_budget_size[i - 1]; 380 index += hash_budget_size [i - 1];
397 hash[i] = (hash_budget_size[i] ? index : hash[i - 1]); 381 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]);
398 } 382 }
399 383
400 // and allocate just enough space 384 // and allocate just enough space
401 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]); 385 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
402 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);
403 387
404 // fill in sorted_keymap 388 // fill in sorted_keymap
405 // it is sorted in each budget 389 // it is sorted in each budget
406 for (i = 0; i < keymap.size (); ++i) 390 for (i = 0; i < keymap.size (); ++i)
407 { 391 {
408 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)
409 { 393 {
410 hashkey = ((keymap[i]->keysym + j) & KEYSYM_HASH_MASK); 394 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
411 395
412 if (hash_budget_size[hashkey]) 396 if (hash_budget_size [hashkey])
413 { 397 {
414 index = hash[hashkey] + hash_budget_counter[hashkey]; 398 index = hash [hashkey] + hash_budget_counter [hashkey];
415 399
416 while (index > hash[hashkey] 400 while (index > hash [hashkey]
417 && compare_priority (keymap[i], sorted_keymap[index - 1]) > 0) 401 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
418 { 402 {
419 sorted_keymap[index] = sorted_keymap[index - 1]; 403 sorted_keymap [index] = sorted_keymap [index - 1];
420 --index; 404 --index;
421 } 405 }
422 406
423 sorted_keymap[index] = keymap[i]; 407 sorted_keymap [index] = keymap [i];
424 ++hash_budget_counter[hashkey]; 408 ++hash_budget_counter [hashkey];
425 } 409 }
426 } 410 }
427 } 411 }
428 412
429 keymap.swap (sorted_keymap); 413 keymap.swap (sorted_keymap);
… …
431#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 415#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
432 // check for invariants 416 // check for invariants
433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 417 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
434 { 418 {
435 index = hash[i]; 419 index = hash[i];
436 for (int j = 0; j < hash_budget_size[i]; ++j) 420 for (int j = 0; j < hash_budget_size [i]; ++j)
437 { 421 {
438 if (keymap[index + j]->range == 1) 422 if (keymap [index + j]->range == 1)
439 assert (i == (keymap[index + j]->keysym & KEYSYM_HASH_MASK)); 423 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
440 424
441 if (j) 425 if (j)
442 assert (compare_priority (keymap[index + j - 1], 426 assert (compare_priority (keymap [index + j - 1],
443 keymap[index + j]) >= 0); 427 keymap [index + j]) >= 0);
444 } 428 }
445 } 429 }
446 430
447 // this should be able to detect most possible bugs 431 // this should be able to detect most possible bugs
448 for (i = 0; i < sorted_keymap.size (); ++i) 432 for (i = 0; i < sorted_keymap.size (); ++i)
449 { 433 {
450 keysym_t *a = sorted_keymap[i]; 434 keysym_t *a = sorted_keymap[i];
451 for (int j = 0; j < a->range; ++j) 435 for (int j = 0; j < a->range; ++j)
452 { 436 {
453 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 437 int index = find_keysym (a->keysym + j, a->state & OtherModMask);
438
454 assert (index >= 0); 439 assert (index >= 0);
455 keysym_t *b = keymap[index]; 440 keysym_t *b = keymap [index];
456 assert (i == (signed) index || // the normally expected result 441 assert (i == (signed) index || // the normally expected result
457 (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
458 } 443 }
459 } 444 }
460#endif 445#endif
… …
466 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
467 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
468 453
469 for (; index < keymap.size (); ++index) 454 for (; index < keymap.size (); ++index)
470 { 455 {
471 keysym_t *key = keymap[index]; 456 keysym_t *key = keymap [index];
472 assert (key); 457 assert (key);
473 458
474 if (key->keysym <= keysym && key->keysym + key->range > keysym 459 if (key->keysym <= keysym && key->keysym + key->range > keysym
475 // match only the specified bits in state and ignore others 460 // match only the specified bits in state and ignore others
476 && (key->state & OtherModMask) == (key->state & state)) 461 && (key->state & OtherModMask) == (key->state & state))

Diff Legend

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