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.532 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
400 break; 400 break;
401 } 401 }
402 return param; 402 return param;
403} 403}
404 404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
405void ecb_cold 414void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
407{ 416{
408 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
409 KeySym keysym; 418 KeySym keysym;
410 int valid_keysym; 419 int valid_keysym;
411 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
412 422
413#if ISO_14755 423#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
415 return; 425 return;
416#endif 426#endif
… …
486 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
487 } 497 }
488 498
489 if (valid_keysym) 499 if (valid_keysym)
490 { 500 {
501 KeySym orig_keysym = keysym;
502
503 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
505 {
506 keysym += (XK_F11 - XK_F1);
507 shft = 0; /* turn off Shift */
508 }
509
510 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
511 {
512 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
513 unsigned int newlen = 1;
514
515 if (ev.state & ModNumLockMask)
516 kp = false;
517
518 keysym = translate_keypad (keysym, kp);
519
520 switch (keysym)
521 {
522#ifndef NO_BACKSPACE_KEY
523 case XK_BackSpace:
524 if (priv_modes & PrivMode_HaveBackSpace)
525 {
526 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
527 ^ !!ctrl) ? '\b' : '\177';
528 kbuf[1] = '\0';
529 }
530 else
531 strcpy (kbuf, rs[Rs_backspace_key]);
532 break;
533#endif
534#ifndef NO_DELETE_KEY
535 case XK_Delete:
536 strcpy (kbuf, rs[Rs_delete_key]);
537 break;
538#endif
539 case XK_Tab:
540 if (shft)
541 strcpy (kbuf, "\033[Z");
542 else
543 {
544#ifdef CTRL_TAB_MAKES_META
545 if (ctrl)
546 meta = 1;
547#endif
548#ifdef MOD4_TAB_MAKES_META
549 if (ev.state & Mod4Mask)
550 meta = 1;
551#endif
552 newlen = 0;
553 }
554 break;
555
556 case XK_Up: /* "\033[A" */
557 case XK_Down: /* "\033[B" */
558 case XK_Right: /* "\033[C" */
559 case XK_Left: /* "\033[D" */
560 strcpy (kbuf, "\033[Z");
561 kbuf[2] = "DACB"[keysym - XK_Left];
562 /* do Shift first */
563 if (shft)
564 kbuf[2] = "dacb"[keysym - XK_Left];
565 else if (ctrl)
566 {
567 kbuf[1] = 'O';
568 kbuf[2] = "dacb"[keysym - XK_Left];
569 }
570 else if (priv_modes & PrivMode_aplCUR)
571 kbuf[1] = 'O';
572 break;
573
574 case XK_KP_Enter:
575 /* allow shift to override */
576 if (kp)
577 {
578 strcpy (kbuf, "\033OM");
579 break;
580 }
581
582 /* FALLTHROUGH */
583
584 case XK_Return:
585 if (priv_modes & PrivMode_LFNL)
586 {
587 kbuf[0] = '\015';
588 kbuf[1] = '\012';
589 kbuf[2] = '\0';
590 }
591 else
592 {
593 kbuf[0] = '\015';
594 kbuf[1] = '\0';
595 }
596 break;
597
598 case XK_KP_F1: /* "\033OP" */
599 case XK_KP_F2: /* "\033OQ" */
600 case XK_KP_F3: /* "\033OR" */
601 case XK_KP_F4: /* "\033OS" */
602 strcpy (kbuf, "\033OP");
603 kbuf[2] += (keysym - XK_KP_F1);
604 break;
605
606 case XK_KP_Multiply: /* "\033Oj" : "*" */
607 case XK_KP_Add: /* "\033Ok" : "+" */
608 case XK_KP_Separator: /* "\033Ol" : "," */
609 case XK_KP_Subtract: /* "\033Om" : "-" */
610 case XK_KP_Decimal: /* "\033On" : "." */
611 case XK_KP_Divide: /* "\033Oo" : "/" */
612 case XK_KP_0: /* "\033Op" : "0" */
613 case XK_KP_1: /* "\033Oq" : "1" */
614 case XK_KP_2: /* "\033Or" : "2" */
615 case XK_KP_3: /* "\033Os" : "3" */
616 case XK_KP_4: /* "\033Ot" : "4" */
617 case XK_KP_5: /* "\033Ou" : "5" */
618 case XK_KP_6: /* "\033Ov" : "6" */
619 case XK_KP_7: /* "\033Ow" : "7" */
620 case XK_KP_8: /* "\033Ox" : "8" */
621 case XK_KP_9: /* "\033Oy" : "9" */
622 /* allow shift to override */
623 if (kp)
624 {
625 strcpy (kbuf, "\033Oj");
626 kbuf[2] += (keysym - XK_KP_Multiply);
627 }
628 else
629 {
630 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
631 kbuf[1] = '\0';
632 }
633 break;
634
635 default:
636 {
637 int param = map_function_key (keysym);
638 if (param > 0)
639 sprintf (kbuf,"\033[%d~", param);
640 else
641 newlen = 0;
642 }
643 break;
644 }
645
646 if (newlen)
647 len = strlen (kbuf);
648
649 if (len > 0)
650 {
651 /*
652 * pass Shift/Control indicators for function keys ending with `~'
653 *
654 * eg,
655 * Prior = "ESC[5~"
656 * Shift+Prior = "ESC[5$"
657 * Ctrl+Prior = "ESC[5^"
658 * Ctrl+Shift+Prior = "ESC[5@"
659 */
660 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
661 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
662
663 /*
664 * Pass meta for all function keys, if 'meta' option set
665 */
666#ifdef META8_OPTION
667 if (meta && (meta_char == 0x80))
668 kbuf[len - 1] |= 0x80;
669#endif
670 }
671
672 }
673 else if (ctrl && keysym == XK_minus)
674 {
675 len = 1;
676 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
677 }
678 else if (keysym == XK_ISO_Left_Tab)
679 {
680 strcpy (kbuf, "\033[Z");
681 len = 3;
682 }
683 else
684 {
685#ifdef META8_OPTION
686 /* set 8-bit on */
687 if (meta && (meta_char == 0x80))
688 {
689 char *ch;
690
691 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80;
693
694 meta = 0;
695 }
696#endif
697 /* nil */ ;
698 }
699
700 keysym = orig_keysym;
701 }
702
703 /* escape prefix */
704 if (len && meta
705#ifdef META8_OPTION
706 && meta_char == C0_ESC
707#endif
708 )
709 {
710 *--kbuf = C0_ESC;
711 len++;
712 }
713
714 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
715 return;
716
717 if (valid_keysym)
718 {
491#ifdef KEYSYM_RESOURCE 719#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 721 return;
494#endif 722#endif
495 723
496 if (saveLines) 724 if (saveLines)
497 { 725 {
… …
510#endif 738#endif
511 max_it (lnsppg, 1); 739 max_it (lnsppg, 1);
512 740
513 if (keysym == XK_Prior) 741 if (keysym == XK_Prior)
514 { 742 {
515 scr_page (UP, lnsppg); 743 scr_page (lnsppg);
516 return; 744 return;
517 } 745 }
518 else if (keysym == XK_Next) 746 else if (keysym == XK_Next)
519 { 747 {
520 scr_page (DN, lnsppg); 748 scr_page (-lnsppg);
521 return; 749 return;
522 } 750 }
523 } 751 }
524#ifdef SCROLL_ON_UPDOWN_KEYS 752#ifdef SCROLL_ON_UPDOWN_KEYS
525 if (IS_SCROLL_MOD) 753 if (IS_SCROLL_MOD)
526 { 754 {
527 if (keysym == XK_Up) 755 if (keysym == XK_Up)
528 { 756 {
529 scr_page (UP, 1); 757 scr_page (1);
530 return; 758 return;
531 } 759 }
532 else if (keysym == XK_Down) 760 else if (keysym == XK_Down)
533 { 761 {
534 scr_page (DN, 1); 762 scr_page (-1);
535 return; 763 return;
536 } 764 }
537 } 765 }
538#endif 766#endif
539#ifdef SCROLL_ON_HOMEEND_KEYS 767#ifdef SCROLL_ON_HOMEEND_KEYS
540 if (IS_SCROLL_MOD) 768 if (IS_SCROLL_MOD)
541 { 769 {
542 if (keysym == XK_Home) 770 if (keysym == XK_Home)
543 { 771 {
544 scr_move_to (0, 1); 772 scr_changeview (top_row);
545 return; 773 return;
546 } 774 }
547 else if (keysym == XK_End) 775 else if (keysym == XK_End)
548 { 776 {
549 scr_move_to (1, 1); 777 scr_changeview (0);
550 return; 778 return;
551 } 779 }
552 } 780 }
553#endif 781#endif
554 } 782 }
555 783
556 if (shft) 784 if (shft)
557 { 785 {
558 /* Shift + F1 - F10 generates F11 - F20 */
559 if (keysym >= XK_F1 && keysym <= XK_F10)
560 {
561 keysym += (XK_F11 - XK_F1);
562 shft = 0; /* turn off Shift */
563 }
564 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 786 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
565 { 787 {
566 switch (keysym) 788 switch (keysym)
567 { 789 {
568 /* normal XTerm key bindings */ 790 /* normal XTerm key bindings */
569 case XK_Insert: /* Shift+Insert = paste mouse selection */ 791 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 798 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 799 return;
578#endif 800#endif
579 } 801 }
580 } 802 }
803 }
804
805 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
806 {
807 if (keysym == XK_v)
808 selection_request (ev.time, Sel_Clipboard);
809 else if (selection.len > 0)
810 {
811 free (selection.clip_text);
812 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
813 selection.clip_len = selection.len;
814 selection_grab (CurrentTime, true);
815 }
816
817 return;
581 } 818 }
582 819
583#if ENABLE_FRILLS || ISO_14755 820#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 821 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 877 {
641 scr_printscreen (ctrl | shft); 878 scr_printscreen (ctrl | shft);
642 return; 879 return;
643 } 880 }
644#endif 881#endif
645
646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
772 {
773 int param = map_function_key (keysym);
774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
778 }
779 break;
780 }
781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
800 * Pass meta for all function keys, if 'meta' option set
801 */
802#ifdef META8_OPTION
803 if (meta && (meta_char == 0x80))
804 kbuf[len - 1] |= 0x80;
805#endif
806 }
807
808 }
809 else if (ctrl && keysym == XK_minus)
810 {
811 len = 1;
812 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
813 }
814 else if (keysym == XK_ISO_Left_Tab)
815 {
816 strcpy (kbuf, "\033[Z");
817 len = 3;
818 }
819 else
820 {
821#ifdef META8_OPTION
822 /* set 8-bit on */
823 if (meta && (meta_char == 0x80))
824 {
825 char *ch;
826
827 for (ch = kbuf; ch < kbuf + len; ch++)
828 *ch |= 0x80;
829
830 meta = 0;
831 }
832#endif
833 /* nil */ ;
834 }
835 } 882 }
836
837 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
838 return;
839 883
840 if (len <= 0) 884 if (len <= 0)
841 return; /* not mapped */ 885 return; /* not mapped */
842 886
843 if (option (Opt_scrollTtyKeypress))
844 if (view_start)
845 {
846 view_start = 0;
847 want_refresh = 1;
848 }
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 887 tt_write_user_input (kbuf, (unsigned int)len);
862} 888}
863 889
864void ecb_cold 890void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 891rxvt_term::key_release (XKeyEvent &ev)
866{ 892{
… …
1077 1103
1078#ifdef SELECTION_SCROLLING 1104#ifdef SELECTION_SCROLLING
1079void 1105void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1106rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1107{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1108 if (scr_page (scroll_selection_lines))
1083 { 1109 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1110 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1111 want_refresh = 1;
1086 refresh_check (); 1112 refresh_check ();
1087 } 1113 }
… …
1092 1118
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1119#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1120void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1121rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1122{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1123 if (scr_page (mouse_slip_wheel_speed))
1098 { 1124 {
1099 want_refresh = 1; 1125 want_refresh = 1;
1100 refresh_check (); 1126 refresh_check ();
1101 } 1127 }
1102 1128
… …
1638 1664
1639#ifdef SELECTION_SCROLLING 1665#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1666 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1667 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1668 {
1669 page_dirn scroll_selection_dir;
1643 int dist; 1670 int dist;
1644 1671
1645 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1647 */ 1674 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1699 + 1;
1673 min_it (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1702 scroll_selection_lines *= scroll_selection_dir;
1675 } 1703 }
1676 else 1704 else
1677 { 1705 {
1678 /* we are within the text window, so we 1706 /* we are within the text window, so we
1679 * shouldn't be scrolling 1707 * shouldn't be scrolling
… …
1860 { 1888 {
1861 rxvt_img::new_from_root (this)->replace (root_img); 1889 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background (); 1890 update_background ();
1863 } 1891 }
1864#endif 1892#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1868 } 1894 }
1869 1895
1870 break; 1896 break;
1871 } 1897 }
1872 1898
… …
2197 2223
2198#ifdef MOUSE_WHEEL 2224#ifdef MOUSE_WHEEL
2199 case Button4: 2225 case Button4:
2200 case Button5: 2226 case Button5:
2201 { 2227 {
2202 int i; 2228 int lines;
2203 page_dirn v; 2229 page_dirn dirn;
2204 2230
2205 v = ev.button == Button4 ? UP : DN; 2231 dirn = ev.button == Button4 ? UP : DN;
2206 2232
2207 if (ev.state & ShiftMask) 2233 if (ev.state & ShiftMask)
2208 i = 1; 2234 lines = 1;
2209 else if (option (Opt_mouseWheelScrollPage)) 2235 else if (option (Opt_mouseWheelScrollPage))
2210 i = nrow - 1; 2236 lines = nrow - 1;
2211 else 2237 else
2212 i = 5; 2238 lines = 5;
2213 2239
2214# ifdef MOUSE_SLIP_WHEELING 2240# ifdef MOUSE_SLIP_WHEELING
2215 if (ev.state & ControlMask) 2241 if (ev.state & ControlMask)
2216 { 2242 {
2217 mouse_slip_wheel_speed += v ? -1 : 1; 2243 mouse_slip_wheel_speed += dirn;
2218 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2244 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2219 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2220 2245
2221 if (!slip_wheel_ev.is_active ()) 2246 if (!slip_wheel_ev.is_active ())
2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2247 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2223 } 2248 }
2224 else 2249 else
2225# endif 2250# endif
2226 { 2251 {
2227 scr_page (v, i); 2252 scr_page (dirn, lines);
2228 scrollBar.show (1); 2253 scrollBar.show (1);
2229 } 2254 }
2230 } 2255 }
2231 break; 2256 break;
2232#endif 2257#endif
… …
2801 }; 2826 };
2802 2827
2803void ecb_hot 2828void ecb_hot
2804rxvt_term::process_csi_seq () 2829rxvt_term::process_csi_seq ()
2805{ 2830{
2806 unicode_t ch, priv, i; 2831 unicode_t ch, priv, prev_ch, i;
2807 unsigned int nargs, p; 2832 unsigned int nargs, p;
2808 int n, ndef; 2833 int n, ndef;
2809 int arg[ESC_ARGS] = { }; 2834 int arg[ESC_ARGS] = { };
2810 2835
2811 nargs = 0; 2836 nargs = 0;
… …
2817 /* '<' '=' '>' '?' '!' */ 2842 /* '<' '=' '>' '?' '!' */
2818 priv = ch; 2843 priv = ch;
2819 ch = cmd_getc (); 2844 ch = cmd_getc ();
2820 } 2845 }
2821 2846
2847 prev_ch = 0;
2822 /* read any numerical arguments */ 2848 /* read any numerical arguments */
2823 for (n = -1; ch < CSI_ICH; ) 2849 for (n = -1; ch < CSI_ICH; )
2824 { 2850 {
2825 if (isdigit (ch)) 2851 if (isdigit (ch))
2826 { 2852 {
… …
2836 n = -1; 2862 n = -1;
2837 } 2863 }
2838 else if (IS_CONTROL (ch)) 2864 else if (IS_CONTROL (ch))
2839 process_nonprinting (ch); 2865 process_nonprinting (ch);
2840 2866
2867 prev_ch = ch;
2841 ch = cmd_getc (); 2868 ch = cmd_getc ();
2842 } 2869 }
2843 2870
2844 if (ch > CSI_7F) 2871 if (ch > CSI_7F)
2845 return; 2872 return;
… …
3079 scr_insert_mode (1); 3106 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3107 else if (arg[0] == 20)
3081 priv_modes |= PrivMode_LFNL; 3108 priv_modes |= PrivMode_LFNL;
3082 break; 3109 break;
3083 3110
3111 case CSI_71: // DESCUSR: set cursor style
3112 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]);
3114 break;
3115
3084 /* 3116 /*
3085 * PRIVATE USE beyond this point. All CSI_7? sequences here 3117 * PRIVATE USE beyond this point. All CSI_7? sequences here
3086 */ 3118 */
3087 case CSI_72: /* DECSTBM: set top and bottom margins */ 3119 case CSI_72: /* DECSTBM: set top and bottom margins */
3088 if (nargs == 1) 3120 if (nargs == 1)
… …
3221rxvt_term::get_to_st (unicode_t &ends_how) 3253rxvt_term::get_to_st (unicode_t &ends_how)
3222{ 3254{
3223 unicode_t ch; 3255 unicode_t ch;
3224 bool seen_esc = false; 3256 bool seen_esc = false;
3225 unsigned int n = 0; 3257 unsigned int n = 0;
3226 wchar_t string[STRING_MAX]; 3258 wchar_t string[CBUFSIZ];
3227 3259
3228 while ((ch = cmd_getc ()) != NOCHAR) 3260 while ((ch = cmd_getc ()) != NOCHAR)
3229 { 3261 {
3230 if (seen_esc) 3262 if (seen_esc)
3231 { 3263 {
… …
3246 else if (ch < 0x20) 3278 else if (ch < 0x20)
3247 return NULL; /* other control character - exit */ 3279 return NULL; /* other control character - exit */
3248 3280
3249 seen_esc = false; 3281 seen_esc = false;
3250 3282
3251 if (n >= STRING_MAX - 1) 3283 if (n >= sizeof (string) - 1)
3252 // stop at some sane length 3284 // stop at some sane length
3253 return NULL; 3285 return NULL;
3254 3286
3255 string[n++] = ch; 3287 string[n++] = ch;
3256 } 3288 }
… …
3373 &nitems, &bytes_after, &value) == Success 3405 &nitems, &bytes_after, &value) == Success
3374 && actual_type != None 3406 && actual_type != None
3375 && actual_format == 8) 3407 && actual_format == 8)
3376 str = (const char *)(value); 3408 str = (const char *)(value);
3377 3409
3378 tt_printf ("\033]%d;%s%c", op, str, resp); 3410 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3379 3411
3380 XFree (value); 3412 XFree (value);
3381 } 3413 }
3382 else 3414 else
3383 { 3415 {
… …
3993 break; 4025 break;
3994#endif 4026#endif
3995 } 4027 }
3996 } 4028 }
3997} 4029}
4030
4031void
4032rxvt_term::set_cursor_style (int style)
4033{
4034 if (!IN_RANGE_INC (style, 0, 4))
4035 return;
4036
4037 set_option (Opt_cursorUnderline, style >= 3);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1));
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3998/*}}} */ 4046/*}}} */
3999 4047
4000/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
4001 4052
4002/* 4053/*
4003 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
4004 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
4005 */ 4056 */
… …
4013 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4014 va_end (arg_ptr); 4065 va_end (arg_ptr);
4015 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
4016} 4067}
4017 4068
4018/* ---------------------------------------------------------------------- */
4019/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
4020 * or generated by us in response to a query ESC sequence. 4070void
4021 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4022static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
4023 4085
4024void 4086void
4025rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
4026{ 4088{
4027 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4028 return; 4090 return;
4029 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
4030 if (pty->pty < 0) 4100 if (pty->pty < 0)
4031 return; 4101 return;
4032 4102
4033 if (v_buflen == 0) 4103 if (v_buflen == 0)
4034 { 4104 {

Diff Legend

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