ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.351 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

… …
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 newlen = 1; 553 newlen = 1;
553 switch (keysym) 554 switch (keysym)
554 { 555 {
555#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 557 case XK_BackSpace:
… …
566#endif 567#endif
567#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Delete 569# ifdef XK_KP_Delete
569 case XK_KP_Delete: 570 case XK_KP_Delete:
570 /* allow shift to override */ 571 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
572 { 573 {
573 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
574 break; 575 break;
575 } 576 }
576 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
… …
599#ifdef XK_KP_Left 600#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
605 { 606 {
606 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break; 609 break;
609 } 610 }
… …
632 633
633#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
635 case XK_KP_Prior: 636 case XK_KP_Prior:
636 /* allow shift to override */ 637 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
638 { 639 {
639 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
640 break; 641 break;
641 } 642 }
642 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
645 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
646 break; 647 break;
647# ifdef XK_KP_Next 648# ifdef XK_KP_Next
648 case XK_KP_Next: 649 case XK_KP_Next:
649 /* allow shift to override */ 650 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
651 { 652 {
652 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
653 break; 654 break;
654 } 655 }
655 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
658 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
659 break; 660 break;
660#endif 661#endif
661 case XK_KP_Enter: 662 case XK_KP_Enter:
662 /* allow shift to override */ 663 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
664 { 665 {
665 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
666 break; 667 break;
667 } 668 }
668 669
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 716 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
717 { 718 {
718 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 721 }
721 else 722 else
… …
730 break; 731 break;
731 732
732#ifdef XK_KP_Insert 733#ifdef XK_KP_Insert
733 case XK_KP_Insert: 734 case XK_KP_Insert:
734 /* allow shift to override */ 735 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
736 { 737 {
737 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
738 break; 739 break;
739 } 740 }
740 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
753 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
754 break; 755 break;
755#ifdef XK_KP_End 756#ifdef XK_KP_End
756 case XK_KP_End: 757 case XK_KP_End:
757 /* allow shift to override */ 758 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
759 { 760 {
760 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
761 break; 762 break;
762 } 763 }
763 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
766 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
767 break; 768 break;
768#ifdef XK_KP_Home 769#ifdef XK_KP_Home
769 case XK_KP_Home: 770 case XK_KP_Home:
770 /* allow shift to override */ 771 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
772 { 773 {
773 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
774 break; 775 break;
775 } 776 }
776 /* FALLTHROUGH */ 777 /* FALLTHROUGH */

Diff Legend

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