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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.18 by pcg, Thu Dec 18 02:07:12 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ 4 * $Id: command.C,v 1.18 2003/12/18 02:07:12 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
61 unsigned int newlen; 61 unsigned int newlen;
62 KeySym keysym; 62 KeySym keysym;
63#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
65#endif 65#endif
66#ifdef USE_XIM
67 int valid_keysym; 66 int valid_keysym;
68#endif
69 unsigned char *kbuf = R->kbuf; 67 unsigned char *kbuf = R->kbuf;
70 68
71/* 69/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 77 meta = (ev->state & R->ModMetaMask);
78
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 79 if (R->numlock_state || (ev->state & R->ModNumLockMask))
80 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 81 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 83 }
84
85 kbuf[0] = 0;
86
84#ifdef USE_XIM 87#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 88 if (R->Input_Context)
89 {
86 Status status_return; 90 Status status_return;
87 91
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 93 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 94 KBUFSZ, &keysym, &status_return);
92#else 95#else
96 wchar_t wkbuf[KBUFSZ + 1];
97
98 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 99 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 100 KBUFSZ, &keysym, &status_return);
101
102 if (status_return == XLookupChars
103 || status_return == XLookupBoth)
104 {
105 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
107 }
108 else
109 len = 0;
95#endif 110#endif
96 valid_keysym = ((status_return == XLookupKeySym) 111 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 112 || status_return == XLookupBoth;
113 }
98 } else { 114 else
115#endif
116 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 117 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 118 valid_keysym = !len;
102 } 119 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 120
120#ifdef USE_XIM
121 if (valid_keysym) 121 if (valid_keysym)
122#endif
123 { 122 {
124/* for some backwards compatibility */ 123/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 124#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 125# ifdef HOTKEY_CTRL
127 if (ctrl) { 126 if (ctrl)
128# else 127# else
129 if (meta) { 128 if (meta)
130# endif 129# endif
130 {
131 if (keysym == R->ks_bigfont) { 131 if (keysym == R->ks_bigfont)
132 {
132 rxvt_change_font(aR_ 0, FONT_UP); 133 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 134 return;
135 }
134 } else if (keysym == R->ks_smallfont) { 136 else if (keysym == R->ks_smallfont)
137 {
135 rxvt_change_font(aR_ 0, FONT_DN); 138 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 139 return;
137 } 140 }
138 } 141 }
139#endif 142#endif
140 143
141 if (R->TermWin.saveLines) { 144 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 145#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 146 if (!ctrl && !meta) {
237 /* escape prefix */ 240 /* escape prefix */
238 if (meta) 241 if (meta)
239# ifdef META8_OPTION 242# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 243 if (R->meta_char == C0_ESC)
241# endif 244# endif
242 rxvt_tt_write(aR_ &ch, 1); 245 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 246 R->tt_write (kbuf0, l);
244 return; 247 return;
245 } else 248 } else
246#endif 249#endif
247 { 250 {
248 newlen = 1; 251 newlen = 1;
572 if (R->greek_mode) 575 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 576 len = greek_xlat(kbuf, len);
574#endif 577#endif
575 /* nil */ ; 578 /* nil */ ;
576 } 579 }
577 } 580 }
578 581
579 if (len <= 0) 582 if (len <= 0)
580 return; /* not mapped */ 583 return; /* not mapped */
581 584
582 if (R->Options & Opt_scrollTtyKeypress) 585 if (R->Options & Opt_scrollTtyKeypress)
605 && (R->meta_char == C0_ESC) 608 && (R->meta_char == C0_ESC)
606#endif 609#endif
607 ) { 610 ) {
608 const unsigned char ch = C0_ESC; 611 const unsigned char ch = C0_ESC;
609 612
610 rxvt_tt_write(aR_ &ch, 1); 613 R->tt_write(&ch, 1);
611 } 614 }
612#ifdef DEBUG_CMD 615#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 616 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 617 char *p;
615 int i; 618 int i;
618 for (i = 0, p = kbuf; i < len; i++, p++) 621 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 622 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 623 fprintf(stderr, "'\n");
621 } 624 }
622#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 626 R->tt_write(kbuf, (unsigned int)len);
624} 627}
625/*}}} */ 628/*}}} */
626 629
627#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 635rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633{ 636{
634 unsigned int n, s; 637 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->cmdbuf_base, 638 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->cmdbuf_endp, 639 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->cmdbuf_ptr; 640 *cmdbuf_ptr = R->cmdbuf_ptr;
638 641
639 n = cmdbuf_ptr - cmdbuf_base; 642 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 643 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 644 if (n > 0 && s < count) {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 645 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
656 return 0; 659 return 0;
657} 660}
658#endif /* MENUBAR_MAX */ 661#endif /* MENUBAR_MAX */
659 662
660void 663void
664rxvt_term::flush ()
665{
666#ifdef TRANSPARENT
667 if (want_full_refresh)
668 {
669 want_full_refresh = 0;
670 rxvt_scr_clear (this);
671 rxvt_scr_touch (this, False);
672 want_refresh = 1;
673 }
674#endif
675
676 if (want_refresh)
677 {
678 rxvt_scr_refresh (this, refresh_type);
679 rxvt_scrollbar_show (this, 1);
680#ifdef USE_XIM
681 rxvt_IMSendSpot (this);
682#endif
683 }
684
685 XFlush (Xdisplay);
686#if 0
687 if (XPending (Xdisplay)) process_x_events ();
688 if (XPending (Xdisplay)) process_x_events ();
689#endif
690}
691
692void
693rxvt_term::check_cb (check_watcher &w)
694{
695 SET_R (this);
696
697 flush ();
698}
699
700void
661rxvt_term::process_x_events () 701rxvt_term::process_x_events ()
662{ 702{
663 do 703 do
664 { 704 {
665 XEvent xev; 705 XEvent xev;
666 706
667 XNextEvent (Xdisplay, &xev); 707 XNextEvent (Xdisplay, &xev);
708
668#if defined(CURSOR_BLINK) 709#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 710 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) { 711 && xev.type == KeyPress)
712 {
671 if (hidden_cursor) { 713 if (hidden_cursor)
714 {
672 hidden_cursor = 0; 715 hidden_cursor = 0;
673 want_refresh = 1; 716 want_refresh = 1;
674 } 717 }
675 want_keypress_time = 1; 718
719 blink_ev.start (NOW + BLINK_INTERVAL);
676 } 720 }
677#endif 721#endif
678 722
679#if defined(POINTER_BLANK) 723#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 724 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) { 725 && (pointerBlankDelay > 0))
726 {
682 if (xev.type == MotionNotify 727 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 728 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 729 || xev.type == ButtonRelease)
685 if (hidden_pointer) 730 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 731 pointer_unblank ();
687 want_motion_time = 1; 732
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 733 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 734 pointer_blank ();
691 } 735 }
692#endif 736#endif
693 737
694#ifdef USE_XIM 738#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 739 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 740#endif
698 } 742 }
699 while (XPending (Xdisplay)); 743 while (XPending (Xdisplay));
700} 744}
701 745
702void 746void
747rxvt_term::blink_cb (time_watcher &w)
748{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor;
753 want_refresh = 1;
754}
755
756void
703rxvt_term::x_cb (io_watcher &w, short revents) 757rxvt_term::x_cb (io_watcher &w, short revents)
704{ 758{
759 SET_R (this);
760
705 process_x_events (); 761 process_x_events ();
762}
763
764bool
765rxvt_term::pty_fill ()
766{
767 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
768
769 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n;
772
773 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
774
775 if (n > 0)
776 {
777 cmdbuf_endp += n;
778 return true;
779 }
780 else if (n < 0 && errno != EAGAIN)
781 destroy ();
782
783 return false;
784}
785
786void
787rxvt_term::pty_cb (io_watcher &w, short revents)
788{
789 SET_R (this);
790
791 if (revents & EVENT_WRITE)
792 tt_write (0, 0);
793 else if (revents & EVENT_READ)
794 {
795 bool flag = true;
796
797 // loop, but don't allow a single term to monopolize us
798 // the number of loops is fully arbitrary, and thus wrong
799 while (flag && pty_fill ())
800 {
801 if (!seen_input)
802 {
803 seen_input = 1;
804 /* once we know the shell is running, send the screen size. Again! */
805 tt_winch ();
806 }
807
808 uint32_t ch = NOCHAR;
809
810 for (;;)
811 {
812 if (ch == NOCHAR)
813 ch = next_char ();
814
815 if (ch == NOCHAR) // TODO: improve
816 break;
817
818 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
819 {
820 /* Read a text string from the input buffer */
821 uint32_t buf[BUFSIZ];
822 bool refreshnow = false;
823 int nlines = 0;
824 uint32_t *str = buf;
825
826 *str++ = ch;
827
828 for (;;)
829 {
830 ch = next_char ();
831
832 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
833 break;
834 else
835 {
836 *str++ = ch;
837
838 if (ch == '\n')
839 {
840 nlines++;
841 refresh_count++;
842
843 if (!(Options & Opt_jumpScroll)
844 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
845 {
846 refreshnow = true;
847 flag = false;
848 ch = NOCHAR;
849 break;
850 }
851 }
852
853 if (str >= buf + BUFSIZ)
854 {
855 ch = NOCHAR;
856 break;
857 }
858 }
859 }
860
861 rxvt_scr_add_lines (this, buf, nlines, str - buf);
862
863 /*
864 * If there have been a lot of new lines, then update the screen
865 * What the heck I'll cheat and only refresh less than every page-full.
866 * the number of pages between refreshes is refresh_limit, which
867 * is incremented here because we must be doing flat-out scrolling.
868 *
869 * refreshing should be correct for small scrolls, because of the
870 * time-out
871 */
872 if (refreshnow)
873 {
874 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
875 refresh_limit++;
876
877 rxvt_scr_refresh (this, refresh_type);
878 }
879
880 }
881 else
882 {
883 switch (ch)
884 {
885 default:
886 rxvt_process_nonprinting (this, ch);
887 break;
888 case C0_ESC: /* escape char */
889 rxvt_process_escape_seq (this);
890 break;
891 /*case 0x9b: */ /* CSI */
892 /* rxvt_process_csi_seq (this); */
893 }
894
895 ch = NOCHAR;
896 }
897 }
898 }
899 }
706} 900}
707 901
708// read the next character, currently handles UTF-8 902// read the next character, currently handles UTF-8
709// will probably handle all sorts of other stuff in the future 903// will probably handle all sorts of other stuff in the future
710static uint32_t 904uint32_t
711next_char (pR) 905rxvt_term::next_char ()
712{ 906{
713 mbstate &s = R->mbstate; 907 struct mbstate &s = mbstate;
714 908
715 while (R->cmdbuf_ptr < R->cmdbuf_endp) 909 while (cmdbuf_ptr < cmdbuf_endp)
716 { 910 {
717 uint8_t ch = *R->cmdbuf_ptr; 911 uint8_t ch = *cmdbuf_ptr;
718 912
719 if (s.cnt) 913 if (s.cnt)
720 { 914 {
721 if ((ch & 0xc0) == 0x80) 915 if ((ch & 0xc0) == 0x80)
722 { 916 {
723 R->cmdbuf_ptr++; 917 cmdbuf_ptr++;
724 918
725 /* continuation */ 919 /* continuation */
726 s.reg = (s.reg << 6) | (ch & 0x7f); 920 s.reg = (s.reg << 6) | (ch & 0x7f);
727 921
728 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ 922 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
737 } 931 }
738 } 932 }
739 933
740 if ((ch & 0xc0) == 0xc0) 934 if ((ch & 0xc0) == 0xc0)
741 { 935 {
742 R->cmdbuf_ptr++; 936 cmdbuf_ptr++;
743 937
744 /* first byte */ 938 /* first byte */
745 s.orig = ch; /* for broken encodings */ 939 s.orig = ch; /* for broken encodings */
746 s.reg = ch; 940 s.reg = ch;
747 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 941 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
750 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 944 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
751 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 945 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
752 } 946 }
753 else 947 else
754 { 948 {
755 R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 949 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756 return ch; 950 return ch;
757 } 951 }
758 } 952 }
759 953
760 return NOCHAR; 954 return NOCHAR;
761}
762
763void
764rxvt_term::pty_cb (io_watcher &w, short revents)
765{
766 int n;
767 unsigned int count;
768
769 if (count = (cmdbuf_endp - cmdbuf_ptr))
770 {
771 memmove (cmdbuf_base, cmdbuf_ptr, count);
772 cmdbuf_ptr = cmdbuf_base;
773 cmdbuf_endp = cmdbuf_ptr + count;
774 }
775
776
777 for (count = BUFSIZ - count; count; count -= n, cmdbuf_endp += n)
778 if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0)
779 continue;
780 else if (n == 0 || (n < 0 && errno == EAGAIN))
781 break;
782 else
783 {
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786 }
787
788 if (count != BUFSIZ) /* some characters read in */
789 {
790 uint32_t c = next_char (this);
791
792#if 0
793 if (c != NOCHAR)
794 return c;
795#endif
796 }
797} 955}
798 956
799/* rxvt_cmd_getc() - Return next input character */ 957/* rxvt_cmd_getc() - Return next input character */
800/* 958/*
801 * Return the next input character after first passing any keyboard input 959 * Return the next input character after first passing any keyboard input
803 */ 961 */
804/* INTPROTO */ 962/* INTPROTO */
805uint32_t 963uint32_t
806rxvt_cmd_getc(pR) 964rxvt_cmd_getc(pR)
807{ 965{
966 for (;;)
967 {
968 uint32_t c = R->next_char ();
969 if (c != NOCHAR)
970 return c;
971
972 // incomplete sequences should occur rarely, still, a better solution
973 // would be preferred. either setjmp/longjmp or better design.
974 fcntl (R->cmd_fd, F_SETFL, 0);
975 R->pty_fill ();
976 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
977 }
978
979#if 0
808#define TIMEOUT_USEC 5000 980#define TIMEOUT_USEC 5000
809 fd_set readfds; 981 fd_set readfds;
810 int quick_timeout, select_res; 982 int quick_timeout, select_res;
811 int want_motion_time, want_keypress_time; 983 int want_motion_time, want_keypress_time;
812 struct timeval value; 984 struct timeval value;
813#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 985#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
814 struct timeval tp; 986 struct timeval tp;
815#endif 987#endif
816 988
817 uint32_t c = next_char (aR);
818 if (c != NOCHAR)
819 return c;
820
821 for (;;) { 989 for (;;) {
822 /* loop until we can return something */ 990 /* loop until we can return something */
823 991
824 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 992 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825 rxvt_tt_write(aR_ NULL, 0); 993 R->tt_write(NULL, 0);
826
827#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
828 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
829#endif
830#if defined(CURSOR_BLINK)
831 want_keypress_time = 0;
832#endif
833#if defined(POINTER_BLANK)
834 want_motion_time = 0;
835#endif
836
837 if (XPending (R->Xdisplay))
838 {
839 R->process_x_events ();
840
841 /* in case button actions pushed chars to cmdbuf */
842 if (R->cmdbuf_ptr < R->cmdbuf_endp)
843 return *R->cmdbuf_ptr++;
844 }
845
846#if defined(CURSOR_BLINK)
847 if (want_keypress_time) {
848 (void)gettimeofday(&tp, NULL);
849 R->lastcursorchange.tv_sec = tp.tv_sec;
850 R->lastcursorchange.tv_usec = tp.tv_usec;
851 }
852#endif
853#if defined(POINTER_BLANK)
854 if (want_motion_time) {
855 if (!tp.tv_sec)
856 (void)gettimeofday(&tp, NULL);
857 R->lastmotion.tv_sec = tp.tv_sec;
858 R->lastmotion.tv_usec = tp.tv_usec;
859 }
860#endif
861
862/*
863 * the command input buffer is empty and we have no pending X events
864 */
865 quick_timeout = 0;
866 994
867#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 995#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868 if (R->mouse_slip_wheel_speed) { 996 if (R->mouse_slip_wheel_speed) {
869 quick_timeout = 1; 997 quick_timeout = 1;
870 if (!R->mouse_slip_wheel_delay-- 998 if (!R->mouse_slip_wheel_delay--
900 R->want_refresh = 1; 1028 R->want_refresh = 1;
901 } 1029 }
902 } 1030 }
903#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1031#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904 1032
905 FD_ZERO(&readfds);
906 FD_SET(R->cmd_fd, &readfds);
907 FD_SET(R->Xfd, &readfds);
908 value.tv_usec = TIMEOUT_USEC;
909 value.tv_sec = 0;
910
911 if (!R->TermWin.mapped)
912 quick_timeout = 0;
913 else {
914 quick_timeout |= R->want_refresh;
915#ifdef TRANSPARENT 1033#ifdef TRANSPARENT
916 quick_timeout |= R->want_full_refresh; 1034 quick_timeout |= R->want_full_refresh;
917#endif 1035#endif
918 }
919
920#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
921 {
922 int set_quick_timeout = 0;
923 long csdiff, psdiff;
924
925#define BLINK_TIME 500000L
926 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
927# if defined(CURSOR_BLINK)
928 if (R->Options & Opt_cursorBlink) {
929 if (!tp.tv_sec) /* didn't get it before so get it now */
930 (void)gettimeofday(&tp, NULL);
931
932 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
933 + tp.tv_usec - R->lastcursorchange.tv_usec;
934 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
935 R->lastcursorchange.tv_sec = tp.tv_sec;
936 R->lastcursorchange.tv_usec = tp.tv_usec;
937 R->hidden_cursor = !R->hidden_cursor;
938 csdiff = 0;
939 } else
940 csdiff = BLINK_TIME - csdiff;
941 set_quick_timeout = 1;
942 }
943# endif 1036#endif
944# if defined(POINTER_BLANK)
945 /*
946 * If we haven't moved the pointer for a while
947 */
948 if ((R->Options & Opt_pointerBlank)
949 && (R->pointerBlankDelay > 0)
950 && (R->hidden_pointer == 0)) {
951 long pdelay;
952
953 if (!tp.tv_sec) /* didn't get it before so get it now */
954 (void)gettimeofday(&tp, NULL);
955 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
956 + tp.tv_usec - R->lastmotion.tv_usec;
957 pdelay = R->pointerBlankDelay * 1000000L;
958 if (psdiff >= pdelay)
959 rxvt_pointer_blank(aR);
960 else {
961 set_quick_timeout = 1;
962 psdiff = pdelay - psdiff;
963 }
964 }
965# endif
966 if (!quick_timeout && set_quick_timeout) {
967 MIN_IT(csdiff, psdiff);
968 value.tv_sec = csdiff / 1000000L;
969 value.tv_usec = csdiff % 1000000L;
970 quick_timeout = 1;
971 }
972 }
973#endif
974
975 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
976 (quick_timeout ? &value : NULL))) == 0) {
977 /* select statement timed out - we're not hard and fast scrolling */
978 R->refresh_limit = 1;
979 }
980#if defined(CURSOR_BLINK)
981 if (R->Options & Opt_cursorBlink)
982 R->want_refresh = 1;
983#endif
984
985 /* See if we can read new data from the application */
986 if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) {
987 int n;
988 unsigned int count;
989
990 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
991 for (count = BUFSIZ; count; count -= n, R->cmdbuf_endp += n)
992 if ((n = read(R->cmd_fd, R->cmdbuf_endp, count)) > 0)
993 continue;
994 else if (n == 0 || (n < 0 && errno == EAGAIN))
995 break;
996 else {
997 rxvt_clean_exit();
998 exit(EXIT_FAILURE); /* bad order of events? */
999 }
1000
1001 if (count != BUFSIZ) /* some characters read in */
1002 {
1003 uint32_t c = next_char (aR);
1004 if (c != NOCHAR)
1005 return c;
1006 }
1007 }
1008#ifdef TRANSPARENT
1009 if (R->want_full_refresh) {
1010 R->want_full_refresh = 0;
1011 rxvt_scr_clear(aR);
1012 rxvt_scr_touch(aR_ False);
1013 R->want_refresh = 1;
1014 }
1015#endif
1016 if (R->want_refresh) {
1017 rxvt_scr_refresh(aR_ R->refresh_type);
1018 rxvt_scrollbar_show(aR_ 1);
1019#ifdef USE_XIM
1020 rxvt_IMSendSpot(aR);
1021#endif
1022 }
1023 }
1024/* NOTREACHED */
1025} 1037}
1026/*}}} */
1027 1038
1028/* EXTPROTO */
1029void 1039void
1030rxvt_pointer_unblank(pR) 1040rxvt_term::pointer_unblank ()
1031{ 1041{
1032 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033 rxvt_recolour_cursor(aR); 1043 rxvt_recolour_cursor (this);
1044
1034#ifdef POINTER_BLANK 1045#ifdef POINTER_BLANK
1035 R->hidden_pointer = 0; 1046 hidden_pointer = 0;
1036 if (R->pointerBlankDelay > 0) {
1037 struct timeval tp;
1038 1047
1039 (void)gettimeofday(&tp, NULL); 1048 if (Options & Opt_pointerBlank)
1040 R->lastmotion.tv_sec = tp.tv_sec; 1049 pointer_ev.start (NOW + pointerBlankDelay);
1041 R->lastmotion.tv_usec = tp.tv_usec;
1042 }
1043#endif 1050#endif
1044} 1051}
1045 1052
1046#ifdef POINTER_BLANK 1053#ifdef POINTER_BLANK
1047/* INTPROTO */
1048void 1054void
1049rxvt_pointer_blank(pR) 1055rxvt_term::pointer_blank ()
1050{ 1056{
1057 pointer_ev.stop ();
1058
1059 if (!(Options & Opt_pointerBlank))
1060 return;
1061
1051 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052 XFlush(R->Xdisplay); 1063 XFlush (Xdisplay);
1064
1053 R->hidden_pointer = 1; 1065 hidden_pointer = 1;
1066}
1067
1068void
1069rxvt_term::pointer_cb (time_watcher &w)
1070{
1071 SET_R (this);
1072
1073 pointer_blank ();
1054} 1074}
1055#endif 1075#endif
1056 1076
1057/* INTPROTO */ 1077/* INTPROTO */
1058void 1078void
1111 fprintf(stderr, "]: <%d>, %d/%d\n", 1131 fprintf(stderr, "]: <%d>, %d/%d\n",
1112 button_number, 1132 button_number,
1113 x + 1, 1133 x + 1,
1114 y + 1); 1134 y + 1);
1115#else 1135#else
1116 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1136 R->tt_printf("\033[M%c%c%c",
1117 (32 + button_number + key_state), 1137 (32 + button_number + key_state),
1118 (32 + x + 1), 1138 (32 + x + 1),
1119 (32 + y + 1)); 1139 (32 + y + 1));
1120#endif 1140#endif
1121} 1141}
1138{ 1158{
1139 int i, want_timeout; 1159 int i, want_timeout;
1140 Window unused_root, unused_child; 1160 Window unused_root, unused_child;
1141 int unused_root_x, unused_root_y; 1161 int unused_root_x, unused_root_y;
1142 unsigned int unused_mask; 1162 unsigned int unused_mask;
1143 struct timeval tp;
1144 1163
1145#ifdef DEBUG_X 1164#ifdef DEBUG_X
1146 const char *const eventnames[] = 1165 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1166 { /* mason - this matches my system */
1148 "", 1167 "",
1179 "SelectionNotify", 1198 "SelectionNotify",
1180 "ColormapNotify", 1199 "ColormapNotify",
1181 "ClientMessage", 1200 "ClientMessage",
1182 "MappingNotify" 1201 "MappingNotify"
1183 }; 1202 };
1203#endif
1204
1205#ifdef DEBUG_X
1206 struct timeval tp;
1184 struct tm *ltt; 1207 struct tm *ltt;
1185#endif
1186
1187 /*
1188 * check if we need to get the time for any timeouts
1189 */
1190
1191 for (i = NUM_TIMEOUTS; i--; )
1192 if (R->timeout[i].tv_sec) {
1193 want_timeout = 1;
1194 break;
1195 }
1196
1197#ifndef DEBUG_X
1198 if (want_timeout)
1199#endif
1200 (void)gettimeofday(&tp, NULL); 1208 (void)gettimeofday(&tp, NULL);
1201
1202#ifdef DEBUG_X
1203 ltt = localtime(&(tp.tv_sec)); 1209 ltt = localtime(&(tp.tv_sec));
1204 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1210 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1205#endif 1211#endif
1206
1207 /* X event timeouts */
1208 if (want_timeout)
1209 for (i = NUM_TIMEOUTS; i--; ) {
1210 if (R->timeout[i].tv_sec == 0)
1211 continue;
1212 if ((tp.tv_sec < R->timeout[i].tv_sec)
1213 || (tp.tv_sec == R->timeout[i].tv_sec
1214 && tp.tv_usec < R->timeout[i].tv_usec))
1215 continue;
1216 R->timeout[i].tv_sec = 0;
1217 switch(i) {
1218 case TIMEOUT_INCR:
1219 rxvt_print_error("data loss: timeout on INCR selection paste");
1220 R->selection_wait = Sel_none;
1221 break;
1222 default:
1223 break;
1224 }
1225 }
1226 1212
1227 switch (ev->type) { 1213 switch (ev->type) {
1228 case KeyPress: 1214 case KeyPress:
1229 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1215 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1230 break; 1216 break;
1254 break; 1240 break;
1255 1241
1256 case ClientMessage: 1242 case ClientMessage:
1257 if (ev->xclient.format == 32 1243 if (ev->xclient.format == 32
1258 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1244 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259 exit(EXIT_SUCCESS); 1245 R->destroy ();
1260#ifdef OFFIX_DND 1246#ifdef OFFIX_DND
1261 /* OffiX Dnd (drag 'n' drop) protocol */ 1247 /* OffiX Dnd (drag 'n' drop) protocol */
1262 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1248 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263 && (ev->xclient.data.l[0] == DndFile 1249 && (ev->xclient.data.l[0] == DndFile
1264 || ev->xclient.data.l[0] == DndDir 1250 || ev->xclient.data.l[0] == DndDir
1265 || ev->xclient.data.l[0] == DndLink)) { 1251 || ev->xclient.data.l[0] == DndLink)) {
1266 /* Get Dnd data */ 1252 /* Get Dnd data */
1267 Atom ActualType; 1253 Atom ActualType;
1299 * in the GraphicsExpose parts, which means that after each refresh, 1285 * in the GraphicsExpose parts, which means that after each refresh,
1300 * we need to wait for the graphics expose or Noexpose events, 1286 * we need to wait for the graphics expose or Noexpose events,
1301 * which ought to make things real slow! 1287 * which ought to make things real slow!
1302 */ 1288 */
1303 case VisibilityNotify: 1289 case VisibilityNotify:
1304 switch (ev->xvisibility.state) { 1290 switch (ev->xvisibility.state)
1291 {
1305 case VisibilityUnobscured: 1292 case VisibilityUnobscured:
1306 R->refresh_type = FAST_REFRESH; 1293 R->refresh_type = FAST_REFRESH;
1307 break; 1294 break;
1308 case VisibilityPartiallyObscured: 1295 case VisibilityPartiallyObscured:
1309 R->refresh_type = SLOW_REFRESH; 1296 R->refresh_type = SLOW_REFRESH;
1310 break; 1297 break;
1311 default: 1298 default:
1312 R->refresh_type = NO_REFRESH; 1299 R->refresh_type = NO_REFRESH;
1313 break; 1300 break;
1314 } 1301 }
1315 break; 1302 break;
1316 1303
1317 case FocusIn: 1304 case FocusIn:
1318 if (!R->TermWin.focus) { 1305 if (!R->TermWin.focus) {
1319 R->TermWin.focus = 1; 1306 R->TermWin.focus = 1;
1320 R->want_refresh = 1; 1307 R->want_refresh = 1;
1321#ifdef USE_XIM 1308#ifdef USE_XIM
1322 if (R->Input_Context != NULL) 1309 if (R->Input_Context != NULL)
1323 XSetICFocus(R->Input_Context); 1310 XSetICFocus(R->Input_Context);
1324#endif 1311#endif
1312#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink)
1314 R->blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif
1325 } 1316 }
1326 break; 1317 break;
1327 1318
1328 case FocusOut: 1319 case FocusOut:
1329 if (R->TermWin.focus) { 1320 if (R->TermWin.focus) {
1330 R->TermWin.focus = 0; 1321 R->TermWin.focus = 0;
1331 R->want_refresh = 1; 1322 R->want_refresh = 1;
1332#ifdef USE_XIM 1323#ifdef USE_XIM
1333 if (R->Input_Context != NULL) 1324 if (R->Input_Context != NULL)
1334 XUnsetICFocus(R->Input_Context); 1325 XUnsetICFocus(R->Input_Context);
1326#endif
1327#ifdef CURSOR_BLINK
1328 if (R->Options & Opt_cursorBlink)
1329 R->blink_ev.stop ();
1330 R->hidden_cursor = 0;
1335#endif 1331#endif
1336 } 1332 }
1337 break; 1333 break;
1338 1334
1339 case ConfigureNotify: 1335 case ConfigureNotify:
1452 break; 1448 break;
1453 1449
1454 case MotionNotify: 1450 case MotionNotify:
1455#ifdef POINTER_BLANK 1451#ifdef POINTER_BLANK
1456 if (R->hidden_pointer) 1452 if (R->hidden_pointer)
1457 rxvt_pointer_unblank(aR); 1453 R->pointer_unblank ();
1458#endif 1454#endif
1459#if MENUBAR 1455#if MENUBAR
1460 if (isMenuBarWindow(ev->xany.window)) { 1456 if (isMenuBarWindow(ev->xany.window)) {
1461 rxvt_menubar_control(aR_ &(ev->xbutton)); 1457 rxvt_menubar_control(aR_ &(ev->xbutton));
1462 break; 1458 break;
1559 */ 1555 */
1560 if (ev->window == R->TermWin.vt) 1556 if (ev->window == R->TermWin.vt)
1561 { 1557 {
1562#if RXVT_GRAPHICS 1558#if RXVT_GRAPHICS
1563 if (ev->subwindow != None) 1559 if (ev->subwindow != None)
1564 rxvt_Gr_ButtonPress(ev->x, ev->y); 1560 rxvt_Gr_ButtonPress (ev->x, ev->y);
1565 else 1561 else
1566#endif 1562#endif
1567 { 1563 {
1568 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1564 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1569 if (reportmode) 1565 if (reportmode)
1653 */ 1649 */
1654 if ((R->scrollBar.style == R_SB_NEXT 1650 if ((R->scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_upButton(ev->y)) 1651 && scrollbarnext_upButton(ev->y))
1656 || (R->scrollBar.style == R_SB_RXVT 1652 || (R->scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_upButton(ev->y))) 1653 && scrollbarrxvt_upButton(ev->y)))
1658 rxvt_tt_printf(aR_ "\033[A"); 1654 R->tt_printf("\033[A");
1659 else if ((R->scrollBar.style == R_SB_NEXT 1655 else if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_dnButton(ev->y)) 1656 && scrollbarnext_dnButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1657 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_dnButton(ev->y))) 1658 && scrollbarrxvt_dnButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[B"); 1659 R->tt_printf("\033[B");
1664 else 1660 else
1665 switch (ev->button) { 1661 switch (ev->button) {
1666 case Button2: 1662 case Button2:
1667 rxvt_tt_printf(aR_ "\014"); 1663 R->tt_printf("\014");
1668 break; 1664 break;
1669 case Button1: 1665 case Button1:
1670 rxvt_tt_printf(aR_ "\033[6~"); 1666 R->tt_printf("\033[6~");
1671 break; 1667 break;
1672 case Button3: 1668 case Button3:
1673 rxvt_tt_printf(aR_ "\033[5~"); 1669 R->tt_printf("\033[5~");
1674 break; 1670 break;
1675 } 1671 }
1676 } 1672 }
1677 else 1673 else
1678#endif /* NO_SCROLLBAR_REPORT */ 1674#endif /* NO_SCROLLBAR_REPORT */
1834 break; 1830 break;
1835#ifdef MOUSE_WHEEL 1831#ifdef MOUSE_WHEEL
1836 case Button4: 1832 case Button4:
1837 case Button5: 1833 case Button5:
1838 { 1834 {
1839 int i, v; 1835 int i;
1836 page_dirn v;
1840 1837
1841 v = (ev->button == Button4) ? UP : DN; 1838 v = (ev->button == Button4) ? UP : DN;
1842 if (ev->state & ShiftMask) 1839 if (ev->state & ShiftMask)
1843 i = 1; 1840 i = 1;
1844 else if ((R->Options & Opt_mouseWheelScrollPage)) 1841 else if ((R->Options & Opt_mouseWheelScrollPage))
2019 n = 0; 2016 n = 0;
2020 if (pchanged) { 2017 if (pchanged) {
2021 for (; n < (unsigned int)i; n++) { 2018 for (; n < (unsigned int)i; n++) {
2022 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2019 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2023 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2020 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2024 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2021 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2025 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2022 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2026 break; 2023 break;
2027 } 2024 }
2028 } 2025 }
2029 } 2026 }
2079 return stream; 2076 return stream;
2080} 2077}
2081 2078
2082/* EXTPROTO */ 2079/* EXTPROTO */
2083int 2080int
2084rxvt_pclose_printer(FILE *stream) 2081rxvt_pclose_printer (FILE *stream)
2085{ 2082{
2086 fflush(stream); 2083 fflush (stream);
2087/* pclose() reported not to work on SunOS 4.1.3 */ 2084/* pclose() reported not to work on SunOS 4.1.3 */
2088# if defined (__sun__) /* TODO: RESOLVE THIS */ 2085# if defined (__sun__) /* TODO: RESOLVE THIS */
2089/* pclose works provided SIGCHLD handler uses waitpid */ 2086/* pclose works provided SIGCHLD handler uses waitpid */
2090 return pclose(stream); /* return fclose (stream); */ 2087 return pclose (stream); /* return fclose (stream); */
2091# else 2088# else
2092 return pclose(stream); 2089 return pclose (stream);
2093# endif 2090# endif
2094} 2091}
2095 2092
2096/* 2093/*
2097 * simulate attached vt100 printer 2094 * simulate attached vt100 printer
2160rxvt_process_nonprinting(pR_ unsigned char ch) 2157rxvt_process_nonprinting(pR_ unsigned char ch)
2161{ 2158{
2162 switch (ch) { 2159 switch (ch) {
2163 case C0_ENQ: /* terminal Status */ 2160 case C0_ENQ: /* terminal Status */
2164 if (R->rs[Rs_answerbackstring]) 2161 if (R->rs[Rs_answerbackstring])
2165 rxvt_tt_write(aR_ 2162 R->tt_write(
2166 (const unsigned char *)R->rs[Rs_answerbackstring], 2163 (const unsigned char *)R->rs[Rs_answerbackstring],
2167 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2164 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168 else 2165 else
2169 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2166 R->tt_write((unsigned char *)VT100_ANS,
2170 (unsigned int)STRLEN(VT100_ANS)); 2167 (unsigned int)STRLEN(VT100_ANS));
2171 break; 2168 break;
2172 case C0_BEL: /* bell */ 2169 case C0_BEL: /* bell */
2173 rxvt_scr_bell(aR); 2170 rxvt_scr_bell(aR);
2174 break; 2171 break;
2237 row = rxvt_cmd_getc(aR) - ' '; 2234 row = rxvt_cmd_getc(aR) - ' ';
2238 col = rxvt_cmd_getc(aR) - ' '; 2235 col = rxvt_cmd_getc(aR) - ' ';
2239 rxvt_scr_gotorc(aR_ row, col, 0); 2236 rxvt_scr_gotorc(aR_ row, col, 0);
2240 break; 2237 break;
2241 case 'Z': /* identify the terminal type */ 2238 case 'Z': /* identify the terminal type */
2242 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2239 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2243 break; 2240 break;
2244 case '<': /* turn off VT52 mode */ 2241 case '<': /* turn off VT52 mode */
2245 PrivMode(0, PrivMode_vt52); 2242 PrivMode(0, PrivMode_vt52);
2246 break; 2243 break;
2247 case 'F': /* use special graphics character set */ 2244 case 'F': /* use special graphics character set */
2354 rxvt_process_dcs_seq(aR); 2351 rxvt_process_dcs_seq(aR);
2355 break; 2352 break;
2356 2353
2357 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2354 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358 case C1_SCI: /* ESC Z */ 2355 case C1_SCI: /* ESC Z */
2359 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2356 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2357 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361 break; /* steal obsolete ESC [ c */ 2358 break; /* steal obsolete ESC [ c */
2362 2359
2363 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2360 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364 case C1_CSI: /* ESC [ */ 2361 case C1_CSI: /* ESC [ */
2485 */ 2482 */
2486 if (priv) { 2483 if (priv) {
2487 switch (priv) { 2484 switch (priv) {
2488 case '>': 2485 case '>':
2489 if (ch == CSI_DA) /* secondary device attributes */ 2486 if (ch == CSI_DA) /* secondary device attributes */
2490 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2487 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491 break; 2488 break;
2492 case '?': 2489 case '?':
2493 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2490 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2494 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2491 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495 break; 2492 break;
2598 2595
2599 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2596 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2600 arg[0] = -arg[0]; 2597 arg[0] = -arg[0];
2601 /* FALLTHROUGH */ 2598 /* FALLTHROUGH */
2602 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2599 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2600 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2604 break; 2601 break;
2605 2602
2606 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2603 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2604 R->tt_write((const unsigned char *)VT100_ANS,
2608 (unsigned int)(sizeof(VT100_ANS) - 1)); 2605 (unsigned int)(sizeof(VT100_ANS) - 1));
2609 break; 2606 break;
2610 2607
2611 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2608 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612 rxvt_process_sgr_mode(aR_ nargs, arg); 2609 rxvt_process_sgr_mode(aR_ nargs, arg);
2613 break; 2610 break;
2614 2611
2615 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2612 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616 switch (arg[0]) { 2613 switch (arg[0]) {
2617 case 5: /* DSR requested */ 2614 case 5: /* DSR requested */
2618 rxvt_tt_printf(aR_ "\033[0n"); 2615 R->tt_printf("\033[0n");
2619 break; 2616 break;
2620 case 6: /* CPR requested */ 2617 case 6: /* CPR requested */
2621 rxvt_scr_report_position(aR); 2618 rxvt_scr_report_position(aR);
2622 break; 2619 break;
2623#if defined (ENABLE_DISPLAY_ANSWER) 2620#if defined (ENABLE_DISPLAY_ANSWER)
2624 case 7: /* unofficial extension */ 2621 case 7: /* unofficial extension */
2625 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2622 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626 break; 2623 break;
2627#endif 2624#endif
2628 case 8: /* unofficial extension */ 2625 case 8: /* unofficial extension */
2629 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2626 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630 break; 2627 break;
2699 break; 2696 break;
2700#endif 2697#endif
2701 2698
2702 case CSI_78: /* DECREQTPARM */ 2699 case CSI_78: /* DECREQTPARM */
2703 if (arg[0] == 0 || arg[0] == 1) 2700 if (arg[0] == 0 || arg[0] == 1)
2704 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2701 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2705 /* FALLTHROUGH */ 2702 /* FALLTHROUGH */
2706 2703
2707 default: 2704 default:
2708 break; 2705 break;
2709 } 2706 }
2763 /* 2760 /*
2764 * reports - some output format copied from XTerm 2761 * reports - some output format copied from XTerm
2765 */ 2762 */
2766 case 11: /* report window state */ 2763 case 11: /* report window state */
2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2764 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2765 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769 break; 2766 break;
2770 case 13: /* report window position */ 2767 case 13: /* report window position */
2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2768 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2769 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773 -wattr.border_width, -wattr.border_width, 2770 -wattr.border_width, -wattr.border_width,
2774 &x, &y, &wdummy); 2771 &x, &y, &wdummy);
2775 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2772 R->tt_printf("\033[3;%d;%dt", x, y);
2776 break; 2773 break;
2777 case 14: /* report window size (pixels) */ 2774 case 14: /* report window size (pixels) */
2778 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2775 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2776 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780 break; 2777 break;
2781 case 18: /* report window size (chars) */ 2778 case 18: /* report window size (chars) */
2782 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2779 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2783 break; 2780 break;
2784#if 0 /* XXX: currently disabled due to security concerns */ 2781#if 0 /* XXX: currently disabled due to security concerns */
2785 case 20: /* report icon label */ 2782 case 20: /* report icon label */
2786 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2783 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2784 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788 break; 2785 break;
2789 case 21: /* report window title */ 2786 case 21: /* report window title */
2790 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2787 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2788 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792 break; 2789 break;
2793#endif 2790#endif
2794 } 2791 }
2795} 2792}
2796#endif 2793#endif
3339{ 3336{
3340 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3337 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341 3338
3342#ifndef RXVT_GRAPHICS 3339#ifndef RXVT_GRAPHICS
3343 if (cmd == 'Q') { /* query graphics */ 3340 if (cmd == 'Q') { /* query graphics */
3344 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3341 R->tt_printf("\033G0\n"); /* no graphics */
3345 return; 3342 return;
3346 } 3343 }
3347/* swallow other graphics sequences until terminating ':' */ 3344/* swallow other graphics sequences until terminating ':' */
3348 do 3345 do
3349 ch = rxvt_cmd_getc(aR); 3346 ch = rxvt_cmd_getc(aR);
3352 unsigned int nargs; 3349 unsigned int nargs;
3353 int args[NGRX_PTS]; 3350 int args[NGRX_PTS];
3354 unsigned char *text = NULL; 3351 unsigned char *text = NULL;
3355 3352
3356 if (cmd == 'Q') { /* query graphics */ 3353 if (cmd == 'Q') { /* query graphics */
3357 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3354 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358 return; 3355 return;
3359 } 3356 }
3360 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3357 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361 int neg; 3358 int neg;
3362 3359
3377 } 3374 }
3378 3375
3379 if ((cmd == 'T') && (nargs >= 5)) { 3376 if ((cmd == 'T') && (nargs >= 5)) {
3380 int i, len = args[4]; 3377 int i, len = args[4];
3381 3378
3382 text = rxvt_malloc((len + 1) * sizeof(char)); 3379 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3383 3380
3384 if (text != NULL) { 3381 if (text != NULL) {
3385 for (i = 0; i < len; i++) 3382 for (i = 0; i < len; i++)
3386 text[i] = rxvt_cmd_getc(aR); 3383 text[i] = rxvt_cmd_getc(aR);
3387 text[len] = '\0'; 3384 text[len] = '\0';
3392} 3389}
3393/*}}} */ 3390/*}}} */
3394 3391
3395/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3396 3393
3397/*{{{ Read and process output from the application */
3398/* LIBPROTO */
3399void
3400rxvt_main_loop(pR)
3401{
3402 uint32_t ch, *str, buf[BUFSIZ];
3403 int nlines, refreshnow;
3404
3405 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
3406
3407 /* once we know the shell is running, send the screen size. Again! */
3408 ch = rxvt_cmd_getc(aR); /* wait for something */
3409 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid);
3410
3411 refreshnow = 0;
3412 for (;;) {
3413 if (ch == NOCHAR)
3414 ch = rxvt_cmd_getc(aR);
3415
3416 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
3417 {
3418 /* Read a text string from the input buffer */
3419 nlines = 0;
3420 str = buf;
3421 *str++ = ch;
3422 for (;;)
3423 {
3424 ch = next_char (aR);
3425
3426 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
3427 break;
3428 else
3429 {
3430 *str++ = ch;
3431
3432 if (ch == '\n')
3433 {
3434 nlines++;
3435 R->refresh_count++;
3436 if (!(R->Options & Opt_jumpScroll)
3437 || (R->refresh_count >= (R->refresh_limit
3438 * (R->TermWin.nrow - 1))))
3439 {
3440 refreshnow = 1;
3441 ch = NOCHAR;
3442 break;
3443 }
3444 }
3445
3446 if (str >= buf + BUFSIZ)
3447 {
3448 ch = NOCHAR;
3449 break;
3450 }
3451 }
3452 }
3453
3454 rxvt_scr_add_lines(aR_ buf, nlines, str - buf);
3455
3456 /*
3457 * If there have been a lot of new lines, then update the screen
3458 * What the heck I'll cheat and only refresh less than every page-full.
3459 * the number of pages between refreshes is R->refresh_limit, which
3460 * is incremented here because we must be doing flat-out scrolling.
3461 *
3462 * refreshing should be correct for small scrolls, because of the
3463 * time-out
3464 */
3465
3466 //TODO: REFRESH_PERIOD is one, fix it
3467 if (refreshnow)
3468 {
3469 refreshnow = 0;
3470
3471 if ((R->Options & Opt_jumpScroll) && R->refresh_limit < REFRESH_PERIOD)
3472 R->refresh_limit++;
3473
3474 rxvt_scr_refresh(aR_ R->refresh_type);
3475 }
3476
3477 }
3478 else
3479 {
3480 switch (ch)
3481 {
3482 default:
3483 rxvt_process_nonprinting(aR_ ch);
3484 break;
3485 case C0_ESC: /* escape char */
3486 rxvt_process_escape_seq(aR);
3487 break;
3488 /* case 0x9b: */ /* CSI */
3489 /* rxvt_process_csi_seq(aR); */
3490 }
3491
3492 ch = NOCHAR;
3493 }
3494 }
3495/* NOTREACHED */
3496}
3497
3498/* 3394/*
3499 * Send printf() formatted output to the command. 3395 * Send printf() formatted output to the command.
3500 * Only use for small amounts of data. 3396 * Only use for small amounts of data.
3501 */ 3397 */
3502/* EXTPROTO */
3503void 3398void
3504rxvt_tt_printf(pR_ const char *fmt,...) 3399rxvt_term::tt_printf (const char *fmt,...)
3505{ 3400{
3506 va_list arg_ptr; 3401 va_list arg_ptr;
3507 unsigned char buf[256]; 3402 unsigned char buf[256];
3508 3403
3509 va_start(arg_ptr, fmt); 3404 va_start (arg_ptr, fmt);
3510 vsprintf((char *)buf, fmt, arg_ptr); 3405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511 va_end(arg_ptr); 3406 va_end (arg_ptr);
3512 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3407 tt_write (buf, STRLEN (buf));
3513} 3408}
3514 3409
3515/* ---------------------------------------------------------------------- */ 3410/* ---------------------------------------------------------------------- */
3516/* Addresses pasting large amounts of data and rxvt hang
3517 * code pinched from xterm (v_write()) and applied originally to
3518 * rxvt-2.18 - Hops
3519 * Write data to the pty as typed by the user, pasted with the mouse, 3411/* Write data to the pty as typed by the user, pasted with the mouse,
3520 * or generated by us in response to a query ESC sequence. 3412 * or generated by us in response to a query ESC sequence.
3521 */ 3413 */
3522/* EXTPROTO */
3523void 3414void
3524rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3415rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525{ 3416{
3526#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3417 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3527 int riten;
3528 unsigned int p;
3529 unsigned char *v_buffer, /* start of physical buffer */
3530 *v_bufstr, /* start of current buffer pending */
3531 *v_bufptr, /* end of current buffer pending */
3532 *v_bufend; /* end of physical buffer */
3533 3418
3534 if (R->v_bufstr == NULL && len > 0) { 3419 if (len)
3535 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3536 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3537 v_bufend = v_buffer + p;
3538 } else {
3539 v_buffer = R->v_buffer;
3540 v_bufstr = R->v_bufstr;
3541 v_bufptr = R->v_bufptr;
3542 v_bufend = R->v_bufend;
3543 } 3420 {
3421 if (v_buflen == 0)
3422 {
3423 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3424 if (written == len)
3425 return;
3544 3426
3545 /* 3427 data += written;
3546 * Append to the block we already have. Always doing this simplifies the 3428 len -= written;
3547 * code, and isn't too bad, either. If this is a short block, it isn't 3429 }
3548 * too expensive, and if this is a long block, we won't be able to write 3430
3549 * it all anyway. 3431
3550 */ 3432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551 if (len > 0) { 3433
3552 if (v_bufend < v_bufptr + len) { /* run out of room */ 3434 memcpy (v_buffer + v_buflen, data, len);
3553 if (v_bufstr != v_buffer) { 3435 v_buflen += len;
3554 /* there is unused space, move everything down */
3555 MEMMOVE(v_buffer, v_bufstr,
3556 (unsigned int)(v_bufptr - v_bufstr));
3557 v_bufptr -= v_bufstr - v_buffer;
3558 v_bufstr = v_buffer;
3559 } 3436 }
3560 if (v_bufend < v_bufptr + len) {
3561 /* still won't fit: get more space */
3562 /* use most basic realloc because an error is not fatal. */
3563 unsigned int size = v_bufptr - v_buffer;
3564 unsigned int reallocto;
3565 3437
3566 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3438 for (;;)
3567 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3439 {
3568 /* save across realloc */ 3440 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569 if (v_buffer) { 3441
3570 v_bufstr = v_buffer; 3442 if (written > 0)
3571 v_bufptr = v_buffer + size; 3443 {
3572 v_bufend = v_buffer + reallocto; 3444 v_buflen -= written;
3573 } else { /* no memory: ignore entire write request */ 3445
3574 rxvt_print_error("data loss: cannot allocate buffer space"); 3446 if (v_buflen == 0)
3575 v_buffer = v_bufstr; /* restore clobbered pointer */ 3447 {
3576 } 3448 free (v_buffer);
3449 v_buffer = 0;
3450 v_buflen = 0;
3451
3452 pty_ev.set (EVENT_READ);
3453 return;
3454 }
3455
3456 memmove (v_buffer, v_buffer + written, v_buflen);
3457 }
3458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3459 // original code just ignores this...
3460 destroy ();
3461 else
3462 {
3463 pty_ev.set (EVENT_READ | EVENT_WRITE);
3464 return;
3465 }
3577 } 3466 }
3578 }
3579 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3580 MEMCPY(v_bufptr, d, len);
3581 v_bufptr += len;
3582 }
3583 }
3584
3585 /*
3586 * Write out as much of the buffer as we can.
3587 * Be careful not to overflow the pty's input silo.
3588 * We are conservative here and only write a small amount at a time.
3589 *
3590 * If we can't push all the data into the pty yet, we expect write
3591 * to return a non-negative number less than the length requested
3592 * (if some data written) or -1 and set errno to EAGAIN,
3593 * EWOULDBLOCK, or EINTR (if no data written).
3594 *
3595 * (Not all systems do this, sigh, so the code is actually
3596 * a little more forgiving.)
3597 */
3598 if ((p = v_bufptr - v_bufstr) > 0) {
3599 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3600 if (riten < 0)
3601 riten = 0;
3602 v_bufstr += riten;
3603 if (v_bufstr >= v_bufptr) /* we wrote it all */
3604 v_bufstr = v_bufptr = v_buffer;
3605 }
3606 /*
3607 * If we have lots of unused memory allocated, return it
3608 */
3609 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3610 /* save pointers across realloc */
3611 unsigned int start = v_bufstr - v_buffer;
3612 unsigned int size = v_bufptr - v_buffer;
3613 unsigned int reallocto;
3614
3615 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3616 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3617 if (v_buffer) {
3618 v_bufstr = v_buffer + start;
3619 v_bufptr = v_buffer + size;
3620 v_bufend = v_buffer + reallocto;
3621 } else {
3622 /* should we print a warning if couldn't return memory? */
3623 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3624 }
3625 }
3626 R->v_buffer = v_buffer;
3627 R->v_bufstr = v_bufstr;
3628 R->v_bufptr = v_bufptr;
3629 R->v_bufend = v_bufend;
3630} 3467}
3468
3631/*----------------------- end-of-file (C source) -----------------------*/ 3469/*----------------------- end-of-file (C source) -----------------------*/
3632 3470

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines