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.4 by root, Sun Jan 16 18:57:03 2005 UTC

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

Diff Legend

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