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.538 by sf-exg, Thu Apr 11 08:13:43 2013 UTC vs.
Revision 1.552 by sf-exg, Fri Jul 25 17:03:38 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 = NoSymbol;
410 int valid_keysym;
411 char kbuf[KBUFSZ]; 419 char rkbuf[KBUFSZ + 1];
420 char *kbuf = rkbuf + 1;
412 421
413#if ISO_14755 422#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 423 if (iso14755buf & ISO_14755_52)
415 return; 424 return;
416#endif 425#endif
… …
473 } 482 }
474 } 483 }
475 else 484 else
476 len = 0; 485 len = 0;
477 } 486 }
478
479 valid_keysym = status_return == XLookupKeySym
480 || status_return == XLookupBoth;
481 } 487 }
482 else 488 else
483#endif 489#endif
484 { 490 {
485 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 491 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
486 valid_keysym = keysym != NoSymbol; 492 }
493
494 if (keysym != NoSymbol)
487 } 495 {
496 KeySym orig_keysym = keysym;
488 497
489 if (valid_keysym) 498 /* Shift + F1 - F10 generates F11 - F20 */
499 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
500 {
501 keysym += (XK_F11 - XK_F1);
502 shft = 0; /* turn off Shift */
503 }
504
505 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
506 {
507 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
508 unsigned int newlen = 1;
509
510 if (ev.state & ModNumLockMask)
511 kp = false;
512
513 keysym = translate_keypad (keysym, kp);
514
515 switch (keysym)
516 {
517#ifndef NO_BACKSPACE_KEY
518 case XK_BackSpace:
519 if (priv_modes & PrivMode_HaveBackSpace)
520 {
521 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
522 ^ !!ctrl) ? '\b' : '\177';
523 kbuf[1] = '\0';
524 }
525 else
526 strcpy (kbuf, rs[Rs_backspace_key]);
527 break;
528#endif
529#ifndef NO_DELETE_KEY
530 case XK_Delete:
531 strcpy (kbuf, rs[Rs_delete_key]);
532 break;
533#endif
534 case XK_Tab:
535 if (shft)
536 strcpy (kbuf, "\033[Z");
537 else
538 {
539#ifdef CTRL_TAB_MAKES_META
540 if (ctrl)
541 meta = 1;
542#endif
543#ifdef MOD4_TAB_MAKES_META
544 if (ev.state & Mod4Mask)
545 meta = 1;
546#endif
547 newlen = 0;
548 }
549 break;
550
551 case XK_Up: /* "\033[A" */
552 case XK_Down: /* "\033[B" */
553 case XK_Right: /* "\033[C" */
554 case XK_Left: /* "\033[D" */
555 strcpy (kbuf, "\033[Z");
556 kbuf[2] = "DACB"[keysym - XK_Left];
557 /* do Shift first */
558 if (shft)
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 else if (ctrl)
561 {
562 kbuf[1] = 'O';
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 }
565 else if (priv_modes & PrivMode_aplCUR)
566 kbuf[1] = 'O';
567 break;
568
569 case XK_KP_Enter:
570 /* allow shift to override */
571 if (kp)
572 {
573 strcpy (kbuf, "\033OM");
574 break;
575 }
576
577 /* FALLTHROUGH */
578
579 case XK_Return:
580 if (priv_modes & PrivMode_LFNL)
581 {
582 kbuf[0] = '\015';
583 kbuf[1] = '\012';
584 kbuf[2] = '\0';
585 }
586 else
587 {
588 kbuf[0] = '\015';
589 kbuf[1] = '\0';
590 }
591 break;
592
593 case XK_KP_F1: /* "\033OP" */
594 case XK_KP_F2: /* "\033OQ" */
595 case XK_KP_F3: /* "\033OR" */
596 case XK_KP_F4: /* "\033OS" */
597 strcpy (kbuf, "\033OP");
598 kbuf[2] += (keysym - XK_KP_F1);
599 break;
600
601 case XK_KP_Multiply: /* "\033Oj" : "*" */
602 case XK_KP_Add: /* "\033Ok" : "+" */
603 case XK_KP_Separator: /* "\033Ol" : "," */
604 case XK_KP_Subtract: /* "\033Om" : "-" */
605 case XK_KP_Decimal: /* "\033On" : "." */
606 case XK_KP_Divide: /* "\033Oo" : "/" */
607 case XK_KP_0: /* "\033Op" : "0" */
608 case XK_KP_1: /* "\033Oq" : "1" */
609 case XK_KP_2: /* "\033Or" : "2" */
610 case XK_KP_3: /* "\033Os" : "3" */
611 case XK_KP_4: /* "\033Ot" : "4" */
612 case XK_KP_5: /* "\033Ou" : "5" */
613 case XK_KP_6: /* "\033Ov" : "6" */
614 case XK_KP_7: /* "\033Ow" : "7" */
615 case XK_KP_8: /* "\033Ox" : "8" */
616 case XK_KP_9: /* "\033Oy" : "9" */
617 /* allow shift to override */
618 if (kp)
619 {
620 strcpy (kbuf, "\033Oj");
621 kbuf[2] += (keysym - XK_KP_Multiply);
622 }
623 else
624 {
625 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
626 kbuf[1] = '\0';
627 }
628 break;
629
630 default:
631 {
632 int param = map_function_key (keysym);
633 if (param > 0)
634 sprintf (kbuf,"\033[%d~", param);
635 else
636 newlen = 0;
637 }
638 break;
639 }
640
641 if (newlen)
642 len = strlen (kbuf);
643
644 if (len > 0)
645 {
646 /*
647 * pass Shift/Control indicators for function keys ending with `~'
648 *
649 * eg,
650 * Prior = "ESC[5~"
651 * Shift+Prior = "ESC[5$"
652 * Ctrl+Prior = "ESC[5^"
653 * Ctrl+Shift+Prior = "ESC[5@"
654 */
655 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
656 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
657
658 /*
659 * Pass meta for all function keys, if 'meta' option set
660 */
661#ifdef META8_OPTION
662 if (meta && (meta_char == 0x80))
663 kbuf[len - 1] |= 0x80;
664#endif
665 }
666
667 }
668 else if (ctrl && keysym == XK_minus)
669 {
670 len = 1;
671 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
672 }
673 else if (keysym == XK_ISO_Left_Tab)
674 {
675 strcpy (kbuf, "\033[Z");
676 len = 3;
677 }
678 else
679 {
680#ifdef META8_OPTION
681 /* set 8-bit on */
682 if (meta && (meta_char == 0x80))
683 {
684 char *ch;
685
686 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80;
688
689 meta = 0;
690 }
691#endif
692 /* nil */ ;
693 }
694
695 keysym = orig_keysym;
696 }
697
698 /* escape prefix */
699 if (len && meta
700#ifdef META8_OPTION
701 && meta_char == C0_ESC
702#endif
703 )
704 {
705 *--kbuf = C0_ESC;
706 len++;
707 }
708
709 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
710 return;
711
712 if (keysym != NoSymbol)
490 { 713 {
491#ifdef KEYSYM_RESOURCE 714#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 715 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 716 return;
494#endif 717#endif
495 718
496 if (saveLines) 719 if (saveLines)
497 { 720 {
… …
553#endif 776#endif
554 } 777 }
555 778
556 if (shft) 779 if (shft)
557 { 780 {
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)) 781 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
565 { 782 {
566 switch (keysym) 783 switch (keysym)
567 { 784 {
568 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
569 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 794 return;
578#endif 795#endif
579 } 796 }
580 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
581 } 813 }
582 814
583#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 816 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 872 {
641 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
642 return; 874 return;
643 } 875 }
644#endif 876#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 } 877 }
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 878
840 if (len <= 0) 879 if (len <= 0)
841 return; /* not mapped */ 880 return; /* not mapped */
842 881
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); 882 tt_write_user_input (kbuf, (unsigned int)len);
862} 883}
863 884
864void ecb_cold 885void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
866{ 887{
… …
1077 1098
1078#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1079void 1100void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1102{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1083 { 1104 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1106 want_refresh = 1;
1086 refresh_check (); 1107 refresh_check ();
1087 } 1108 }
… …
1092 1113
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1115void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1117{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1098 { 1119 {
1099 want_refresh = 1; 1120 want_refresh = 1;
1100 refresh_check (); 1121 refresh_check ();
1101 } 1122 }
1102 1123
… …
1638 1659
1639#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1663 {
1664 page_dirn scroll_selection_dir;
1643 int dist; 1665 int dist;
1644 1666
1645 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1647 */ 1669 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1694 + 1;
1673 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1675 } 1698 }
1676 else 1699 else
1677 { 1700 {
1678 /* we are within the text window, so we 1701 /* we are within the text window, so we
1679 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
2211 2234
2212# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2214 { 2237 {
2215 mouse_slip_wheel_speed += dirn; 2238 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2240
2219 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221 } 2243 }
2222 else 2244 else
… …
3226rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3227{ 3249{
3228 unicode_t ch; 3250 unicode_t ch;
3229 bool seen_esc = false; 3251 bool seen_esc = false;
3230 unsigned int n = 0; 3252 unsigned int n = 0;
3231 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3232 3254
3233 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3234 { 3256 {
3235 if (seen_esc) 3257 if (seen_esc)
3236 { 3258 {
… …
3251 else if (ch < 0x20) 3273 else if (ch < 0x20)
3252 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3253 3275
3254 seen_esc = false; 3276 seen_esc = false;
3255 3277
3256 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3257 // stop at some sane length 3279 // stop at some sane length
3258 return NULL; 3280 return NULL;
3259 3281
3260 string[n++] = ch; 3282 string[n++] = ch;
3261 } 3283 }
… …
3378 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3379 && actual_type != None 3401 && actual_type != None
3380 && actual_format == 8) 3402 && actual_format == 8)
3381 str = (const char *)(value); 3403 str = (const char *)(value);
3382 3404
3383 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3384 3406
3385 XFree (value); 3407 XFree (value);
3386 } 3408 }
3387 else 3409 else
3388 { 3410 {
… …
4016 4038
4017 want_refresh = 1; 4039 want_refresh = 1;
4018} 4040}
4019/*}}} */ 4041/*}}} */
4020 4042
4021/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
4022 4047
4023/* 4048/*
4024 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
4025 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
4026 */ 4051 */
… …
4034 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4035 va_end (arg_ptr); 4060 va_end (arg_ptr);
4036 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
4037} 4062}
4038 4063
4039/* ---------------------------------------------------------------------- */
4040/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
4041 * or generated by us in response to a query ESC sequence. 4065void
4042 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
4044 4080
4045void 4081void
4046rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
4047{ 4083{
4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4049 return; 4085 return;
4050 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
4051 if (pty->pty < 0) 4095 if (pty->pty < 0)
4052 return; 4096 return;
4053 4097
4054 if (v_buflen == 0) 4098 if (v_buflen == 0)
4055 { 4099 {

Diff Legend

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