| … | |
… | |
| 315 | XK_KP_7, // XK_KP_Home |
315 | XK_KP_7, // XK_KP_Home |
| 316 | XK_KP_4, // XK_KP_Left |
316 | XK_KP_4, // XK_KP_Left |
| 317 | XK_KP_8, // XK_KP_Up |
317 | XK_KP_8, // XK_KP_Up |
| 318 | XK_KP_6, // XK_KP_Right |
318 | XK_KP_6, // XK_KP_Right |
| 319 | XK_KP_2, // XK_KP_Down |
319 | XK_KP_2, // XK_KP_Down |
| 320 | # ifndef UNSHIFTED_SCROLLKEYS |
|
|
| 321 | XK_KP_9, // XK_KP_Prior |
320 | XK_KP_9, // XK_KP_Prior |
| 322 | XK_KP_3, // XK_KP_Next |
321 | XK_KP_3, // XK_KP_Next |
| 323 | # else |
|
|
| 324 | XK_Prior, |
|
|
| 325 | XK_Next, |
|
|
| 326 | # endif |
|
|
| 327 | XK_KP_1, // XK_KP_End |
322 | XK_KP_1, // XK_KP_End |
| 328 | XK_KP_5, // XK_KP_Begin |
323 | XK_KP_5, // XK_KP_Begin |
| 329 | }; |
324 | }; |
| 330 | |
325 | |
| 331 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
326 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
| … | |
… | |
| 376 | param = 3; |
371 | param = 3; |
| 377 | break; |
372 | break; |
| 378 | case XK_Select: |
373 | case XK_Select: |
| 379 | param = 4; |
374 | param = 4; |
| 380 | break; |
375 | break; |
| 381 | #ifndef UNSHIFTED_SCROLLKEYS |
|
|
| 382 | case XK_Prior: |
376 | case XK_Prior: |
| 383 | param = 5; |
377 | param = 5; |
| 384 | break; |
378 | break; |
| 385 | case XK_Next: |
379 | case XK_Next: |
| 386 | param = 6; |
380 | param = 6; |
| … | |
… | |
| 389 | param = 7; |
383 | param = 7; |
| 390 | break; |
384 | break; |
| 391 | case XK_End: |
385 | case XK_End: |
| 392 | param = 8; |
386 | param = 8; |
| 393 | break; |
387 | break; |
| 394 | #endif |
|
|
| 395 | case XK_Help: |
388 | case XK_Help: |
| 396 | param = 28; |
389 | param = 28; |
| 397 | break; |
390 | break; |
| 398 | case XK_Menu: |
391 | case XK_Menu: |
| 399 | param = 29; |
392 | param = 29; |
| … | |
… | |
| 413 | |
406 | |
| 414 | void ecb_cold |
407 | void ecb_cold |
| 415 | rxvt_term::key_press (XKeyEvent &ev) |
408 | rxvt_term::key_press (XKeyEvent &ev) |
| 416 | { |
409 | { |
| 417 | int ctrl, meta, shft, len; |
410 | int ctrl, meta, shft, len; |
| 418 | KeySym keysym; |
411 | KeySym keysym = NoSymbol; |
| 419 | int valid_keysym; |
|
|
| 420 | char rkbuf[KBUFSZ + 1]; |
412 | char rkbuf[KBUFSZ + 1]; |
| 421 | char *kbuf = rkbuf + 1; |
413 | char *kbuf = rkbuf + 1; |
| 422 | |
414 | |
| 423 | #if ISO_14755 |
415 | #if ISO_14755 |
| 424 | if (iso14755buf & ISO_14755_52) |
416 | if (iso14755buf & ISO_14755_52) |
| … | |
… | |
| 483 | } |
475 | } |
| 484 | } |
476 | } |
| 485 | else |
477 | else |
| 486 | len = 0; |
478 | len = 0; |
| 487 | } |
479 | } |
| 488 | |
|
|
| 489 | valid_keysym = status_return == XLookupKeySym |
|
|
| 490 | || status_return == XLookupBoth; |
|
|
| 491 | } |
480 | } |
| 492 | else |
481 | else |
| 493 | #endif |
482 | #endif |
| 494 | { |
483 | { |
| 495 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
484 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
| 496 | valid_keysym = keysym != NoSymbol; |
|
|
| 497 | } |
|
|
| 498 | |
|
|
| 499 | if (valid_keysym) |
|
|
| 500 | { |
485 | } |
|
|
486 | |
|
|
487 | if (keysym != NoSymbol) |
|
|
488 | { |
|
|
489 | KeySym orig_keysym = keysym; |
|
|
490 | |
|
|
491 | /* Shift + F1 - F10 generates F11 - F20 */ |
|
|
492 | if (shft && keysym >= XK_F1 && keysym <= XK_F10) |
|
|
493 | { |
|
|
494 | keysym += (XK_F11 - XK_F1); |
|
|
495 | shft = 0; /* turn off Shift */ |
|
|
496 | } |
|
|
497 | |
| 501 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
498 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
| 502 | { |
499 | { |
| 503 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
500 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
| 504 | unsigned int newlen = 1; |
501 | unsigned int newlen = 1; |
| 505 | |
502 | |
| … | |
… | |
| 685 | meta = 0; |
682 | meta = 0; |
| 686 | } |
683 | } |
| 687 | #endif |
684 | #endif |
| 688 | /* nil */ ; |
685 | /* nil */ ; |
| 689 | } |
686 | } |
|
|
687 | |
|
|
688 | keysym = orig_keysym; |
| 690 | } |
689 | } |
| 691 | |
690 | |
| 692 | /* escape prefix */ |
691 | /* escape prefix */ |
| 693 | if (len && meta |
692 | if (len && meta |
| 694 | #ifdef META8_OPTION |
693 | #ifdef META8_OPTION |
| … | |
… | |
| 701 | } |
700 | } |
| 702 | |
701 | |
| 703 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
702 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
| 704 | return; |
703 | return; |
| 705 | |
704 | |
| 706 | if (valid_keysym) |
705 | if (keysym != NoSymbol) |
| 707 | { |
706 | { |
| 708 | #ifdef KEYSYM_RESOURCE |
707 | #ifdef KEYSYM_RESOURCE |
| 709 | if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) |
708 | if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) |
| 710 | return; |
709 | return; |
| 711 | #endif |
710 | #endif |
| … | |
… | |
| 770 | #endif |
769 | #endif |
| 771 | } |
770 | } |
| 772 | |
771 | |
| 773 | if (shft) |
772 | if (shft) |
| 774 | { |
773 | { |
| 775 | /* Shift + F1 - F10 generates F11 - F20 */ |
|
|
| 776 | if (keysym >= XK_F1 && keysym <= XK_F10) |
|
|
| 777 | { |
|
|
| 778 | keysym += (XK_F11 - XK_F1); |
|
|
| 779 | shft = 0; /* turn off Shift */ |
|
|
| 780 | } |
|
|
| 781 | else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) |
774 | if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) |
| 782 | { |
775 | { |
| 783 | switch (keysym) |
776 | switch (keysym) |
| 784 | { |
777 | { |
| 785 | /* normal XTerm key bindings */ |
778 | /* normal XTerm key bindings */ |
| 786 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
779 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
