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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.5 2003/11/25 15:44:38 pcg Exp $ 4 * $Id: command.C,v 1.11 2003/12/02 21:49:46 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>
… …
237 /* escape prefix */ 237 /* escape prefix */
238 if (meta) 238 if (meta)
239# ifdef META8_OPTION 239# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 240 if (R->meta_char == C0_ESC)
241# endif 241# endif
242 rxvt_tt_write(aR_ &ch, 1); 242 R->tt_write(&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 243 R->tt_write(kbuf0, l);
244 return; 244 return;
245 } else 245 } else
246#endif 246#endif
247 { 247 {
248 newlen = 1; 248 newlen = 1;
… …
605 && (R->meta_char == C0_ESC) 605 && (R->meta_char == C0_ESC)
606#endif 606#endif
607 ) { 607 ) {
608 const unsigned char ch = C0_ESC; 608 const unsigned char ch = C0_ESC;
609 609
610 rxvt_tt_write(aR_ &ch, 1); 610 R->tt_write(&ch, 1);
611 } 611 }
612#ifdef DEBUG_CMD 612#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 613 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 614 char *p;
615 int i; 615 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 618 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 620 fprintf(stderr, "'\n");
621 } 621 }
622#endif /* DEBUG_CMD */ 622#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 623 R->tt_write(kbuf, (unsigned int)len);
624} 624}
625/*}}} */ 625/*}}} */
626 626
627#if (MENUBAR_MAX) 627#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
656 return 0; 656 return 0;
657} 657}
658#endif /* MENUBAR_MAX */ 658#endif /* MENUBAR_MAX */
659 659
660void 660void
661rxvt_term::flush ()
662{
663#ifdef TRANSPARENT
664 if (want_full_refresh)
665 {
666 want_full_refresh = 0;
667 rxvt_scr_clear (this);
668 rxvt_scr_touch (this, False);
669 want_refresh = 1;
670 }
671#endif
672
673 if (want_refresh)
674 {
675 rxvt_scr_refresh (this, refresh_type);
676 rxvt_scrollbar_show (this, 1);
677#ifdef USE_XIM
678 rxvt_IMSendSpot (this);
679#endif
680 }
681
682 XFlush (Xdisplay);
683#if 0
684 if (XPending (Xdisplay)) process_x_events ();
685 if (XPending (Xdisplay)) process_x_events ();
686#endif
687}
688
689void
690rxvt_term::check_cb (check_watcher &w)
691{
692 SET_R (this);
693
694 flush ();
695}
696
697void
661rxvt_term::process_x_events () 698rxvt_term::process_x_events ()
662{ 699{
663 do 700 do
664 { 701 {
665 XEvent xev; 702 XEvent xev;
666 703
667 XNextEvent (Xdisplay, &xev); 704 XNextEvent (Xdisplay, &xev);
668 705
669#if defined(CURSOR_BLINK) 706#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink) 707 if ((Options & Opt_cursorBlink)
671 && xev.type == KeyPress) { 708 && xev.type == KeyPress)
709 {
672 if (hidden_cursor) { 710 if (hidden_cursor)
711 {
673 hidden_cursor = 0; 712 hidden_cursor = 0;
674 want_refresh = 1; 713 want_refresh = 1;
675 } 714 }
715
676 blink_ev.start (NOW + BLINK_INTERVAL); 716 blink_ev.start (NOW + BLINK_INTERVAL);
677 } 717 }
678#endif 718#endif
679 719
680#if defined(POINTER_BLANK) 720#if defined(POINTER_BLANK)
681 if ((Options & Opt_pointerBlank) 721 if ((Options & Opt_pointerBlank)
682 && (pointerBlankDelay > 0)) { 722 && (pointerBlankDelay > 0))
723 {
683 if (xev.type == MotionNotify 724 if (xev.type == MotionNotify
684 || xev.type == ButtonPress 725 || xev.type == ButtonPress
685 || xev.type == ButtonRelease) { 726 || xev.type == ButtonRelease)
686 if (hidden_pointer) 727 if (hidden_pointer)
687 rxvt_pointer_unblank(aR); 728 pointer_unblank ();
688 want_motion_time = 1; 729
689 }
690 if (xev.type == KeyPress && hidden_pointer == 0) 730 if (xev.type == KeyPress && hidden_pointer == 0)
691 rxvt_pointer_blank (this); 731 pointer_blank ();
692 } 732 }
693#endif 733#endif
694 734
695#ifdef USE_XIM 735#ifdef USE_XIM
696 if (!XFilterEvent (&xev, xev.xany.window)) 736 if (!XFilterEvent (&xev, xev.xany.window))
697#endif 737#endif
… …
701} 741}
702 742
703void 743void
704rxvt_term::blink_cb (time_watcher &w) 744rxvt_term::blink_cb (time_watcher &w)
705{ 745{
746 SET_R (this);
747
706 w.at += BLINK_INTERVAL; 748 w.at += BLINK_INTERVAL;
707 hidden_cursor = !hidden_cursor; 749 hidden_cursor = !hidden_cursor;
708 want_refresh = 1; 750 want_refresh = 1;
709 flush();
710} 751}
711 752
712void 753void
713rxvt_term::x_cb (io_watcher &w, short revents) 754rxvt_term::x_cb (io_watcher &w, short revents)
714{ 755{
756 SET_R (this);
757
715 process_x_events (); 758 process_x_events ();
759}
716 760
717 flush (); 761bool
762rxvt_term::pty_fill ()
763{
764 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
765
766 memmove (cmdbuf_base, cmdbuf_ptr, n);
767 cmdbuf_ptr = cmdbuf_base;
768 cmdbuf_endp = cmdbuf_ptr + n;
769
770 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
771
772 if (n > 0)
773 {
774 cmdbuf_endp += n;
775 return true;
776 }
777 else if (n < 0 && errno == EAGAIN)
778 return false;
779
780 destroy ();
781}
782
783void
784rxvt_term::pty_cb (io_watcher &w, short revents)
785{
786 SET_R (this);
787
788 if (revents & EVENT_WRITE)
789 tt_write (0, 0);
790 else if (revents & EVENT_READ)
791 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); )
794 {
795 if (!seen_input)
796 {
797 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch ();
800 }
801
802 uint32_t ch = NOCHAR;
803
804 for (;;)
805 {
806 if (ch == NOCHAR)
807 ch = next_char ();
808
809 if (ch == NOCHAR) // TODO: improve
810 break;
811
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 {
814 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ];
816 bool refreshnow = false;
817 int nlines = 0;
818 uint32_t *str = buf;
819
820 *str++ = ch;
821
822 for (;;)
823 {
824 ch = next_char ();
825
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break;
828 else
829 {
830 *str++ = ch;
831
832 if (ch == '\n')
833 {
834 nlines++;
835 refresh_count++;
836
837 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 {
840 refreshnow = true;
841 ch = NOCHAR;
842 break;
843 }
844 }
845
846 if (str >= buf + BUFSIZ)
847 {
848 ch = NOCHAR;
849 break;
850 }
851 }
852 }
853
854 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855
856 /*
857 * If there have been a lot of new lines, then update the screen
858 * What the heck I'll cheat and only refresh less than every page-full.
859 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling.
861 *
862 * refreshing should be correct for small scrolls, because of the
863 * time-out
864 */
865 if (refreshnow)
866 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++;
869
870 rxvt_scr_refresh (this, refresh_type);
871 }
872
873 }
874 else
875 {
876 switch (ch)
877 {
878 default:
879 rxvt_process_nonprinting (this, ch);
880 break;
881 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this);
883 break;
884 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */
886 }
887
888 ch = NOCHAR;
889 }
890 }
891 }
718} 892}
719 893
720// read the next character, currently handles UTF-8 894// read the next character, currently handles UTF-8
721// will probably handle all sorts of other stuff in the future 895// will probably handle all sorts of other stuff in the future
722uint32_t 896uint32_t
… …
770 } 944 }
771 945
772 return NOCHAR; 946 return NOCHAR;
773} 947}
774 948
775bool
776rxvt_term::pty_fill (size_t count)
777{
778 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779
780 memmove (cmdbuf_base, cmdbuf_ptr, n);
781 cmdbuf_ptr = cmdbuf_base;
782 cmdbuf_endp = cmdbuf_ptr + n;
783
784 n = read (cmd_fd, cmdbuf_endp, count);
785
786 if (n > 0)
787 {
788 cmdbuf_endp += n;
789 return true;
790 }
791 else if (n < 0 && errno == EAGAIN)
792 return false;
793
794 rxvt_clean_exit();
795 exit(EXIT_FAILURE); /* bad order of events? */
796}
797
798void
799rxvt_term::pty_cb (io_watcher &w, short revents)
800{
801 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
802 {
803 /* once we know the shell is running, send the screen size. Again! */
804 //ch = rxvt_cmd_getc(aR); /* wait for something */
805 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806
807 uint32_t ch = NOCHAR;
808
809 for (;;)
810 {
811 if (ch == NOCHAR)
812 ch = next_char ();
813
814 if (ch == NOCHAR) // TODO: improve
815 break;
816
817 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818 {
819 /* Read a text string from the input buffer */
820 uint32_t buf[BUFSIZ];
821 bool refreshnow = false;
822 int nlines = 0;
823 uint32_t *str = buf;
824
825 *str++ = ch;
826
827 for (;;)
828 {
829 ch = next_char ();
830
831 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832 break;
833 else
834 {
835 *str++ = ch;
836
837 if (ch == '\n')
838 {
839 nlines++;
840 refresh_count++;
841
842 if (!(Options & Opt_jumpScroll)
843 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844 {
845 refreshnow = true;
846 ch = NOCHAR;
847 break;
848 }
849 }
850
851 if (str >= buf + BUFSIZ)
852 {
853 ch = NOCHAR;
854 break;
855 }
856 }
857 }
858
859 rxvt_scr_add_lines (this, buf, nlines, str - buf);
860
861 /*
862 * If there have been a lot of new lines, then update the screen
863 * What the heck I'll cheat and only refresh less than every page-full.
864 * the number of pages between refreshes is refresh_limit, which
865 * is incremented here because we must be doing flat-out scrolling.
866 *
867 * refreshing should be correct for small scrolls, because of the
868 * time-out
869 */
870 if (refreshnow)
871 {
872 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873 refresh_limit++;
874
875 rxvt_scr_refresh (this, refresh_type);
876 }
877
878 }
879 else
880 {
881 switch (ch)
882 {
883 default:
884 rxvt_process_nonprinting (this, ch);
885 break;
886 case C0_ESC: /* escape char */
887 rxvt_process_escape_seq (this);
888 break;
889 /*case 0x9b: */ /* CSI */
890 /* rxvt_process_csi_seq (this); */
891 }
892
893 ch = NOCHAR;
894 }
895 }
896 }
897
898 flush ();
899}
900
901void
902rxvt_term::flush ()
903{
904#ifdef TRANSPARENT
905 if (want_full_refresh)
906 {
907 want_full_refresh = 0;
908 rxvt_scr_clear (this);
909 rxvt_scr_touch (this, False);
910 want_refresh = 1;
911 }
912#endif
913
914 if (want_refresh)
915 {
916 rxvt_scr_refresh (this, refresh_type);
917 rxvt_scrollbar_show (this, 1);
918#ifdef USE_XIM
919 rxvt_IMSendSpot (this);
920#endif
921 }
922
923 XFlush (Xdisplay);
924}
925
926/* rxvt_cmd_getc() - Return next input character */ 949/* rxvt_cmd_getc() - Return next input character */
927/* 950/*
928 * Return the next input character after first passing any keyboard input 951 * Return the next input character after first passing any keyboard input
929 * to the command. 952 * to the command.
930 */ 953 */
… …
939 return c; 962 return c;
940 963
941 // incomplete sequences should occur rarely, still, a better solution 964 // incomplete sequences should occur rarely, still, a better solution
942 // would be preferred. either setjmp/longjmp or better design. 965 // would be preferred. either setjmp/longjmp or better design.
943 fcntl (R->cmd_fd, F_SETFL, 0); 966 fcntl (R->cmd_fd, F_SETFL, 0);
944 R->pty_fill (1); 967 R->pty_fill ();
945 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 968 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946 } 969 }
947 970
971#if 0
948#define TIMEOUT_USEC 5000 972#define TIMEOUT_USEC 5000
949 fd_set readfds; 973 fd_set readfds;
950 int quick_timeout, select_res; 974 int quick_timeout, select_res;
951 int want_motion_time, want_keypress_time; 975 int want_motion_time, want_keypress_time;
952 struct timeval value; 976 struct timeval value;
… …
956 980
957 for (;;) { 981 for (;;) {
958 /* loop until we can return something */ 982 /* loop until we can return something */
959 983
960 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 984 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961 rxvt_tt_write(aR_ NULL, 0); 985 R->tt_write(NULL, 0);
962
963#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
964 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
965#endif
966#if defined(CURSOR_BLINK)
967 want_keypress_time = 0;
968#endif
969#if defined(POINTER_BLANK)
970 want_motion_time = 0;
971#endif
972
973 if (XPending (R->Xdisplay))
974 {
975 R->process_x_events ();
976
977 /* in case button actions pushed chars to cmdbuf */
978 if (R->cmdbuf_ptr < R->cmdbuf_endp)
979 return *R->cmdbuf_ptr++;
980 }
981
982#if defined(CURSOR_BLINK)
983 if (want_keypress_time) {
984 (void)gettimeofday(&tp, NULL);
985 R->lastcursorchange.tv_sec = tp.tv_sec;
986 R->lastcursorchange.tv_usec = tp.tv_usec;
987 }
988#endif
989#if defined(POINTER_BLANK)
990 if (want_motion_time) {
991 if (!tp.tv_sec)
992 (void)gettimeofday(&tp, NULL);
993 R->lastmotion.tv_sec = tp.tv_sec;
994 R->lastmotion.tv_usec = tp.tv_usec;
995 }
996#endif
997
998/*
999 * the command input buffer is empty and we have no pending X events
1000 */
1001 quick_timeout = 0;
1002 986
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 987#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004 if (R->mouse_slip_wheel_speed) { 988 if (R->mouse_slip_wheel_speed) {
1005 quick_timeout = 1; 989 quick_timeout = 1;
1006 if (!R->mouse_slip_wheel_delay-- 990 if (!R->mouse_slip_wheel_delay--
… …
1036 R->want_refresh = 1; 1020 R->want_refresh = 1;
1037 } 1021 }
1038 } 1022 }
1039#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1023#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040 1024
1041 FD_ZERO(&readfds);
1042 FD_SET(R->cmd_fd, &readfds);
1043 FD_SET(R->Xfd, &readfds);
1044 value.tv_usec = TIMEOUT_USEC;
1045 value.tv_sec = 0;
1046
1047 if (!R->TermWin.mapped)
1048 quick_timeout = 0;
1049 else {
1050 quick_timeout |= R->want_refresh;
1051#ifdef TRANSPARENT 1025#ifdef TRANSPARENT
1052 quick_timeout |= R->want_full_refresh; 1026 quick_timeout |= R->want_full_refresh;
1053#endif 1027#endif
1054 }
1055
1056#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1057 {
1058 int set_quick_timeout = 0;
1059 long csdiff, psdiff;
1060
1061#define BLINK_TIME 500000L
1062 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1063# if defined(CURSOR_BLINK)
1064 if (R->Options & Opt_cursorBlink) {
1065 if (!tp.tv_sec) /* didn't get it before so get it now */
1066 (void)gettimeofday(&tp, NULL);
1067
1068 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1069 + tp.tv_usec - R->lastcursorchange.tv_usec;
1070 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1071 R->lastcursorchange.tv_sec = tp.tv_sec;
1072 R->lastcursorchange.tv_usec = tp.tv_usec;
1073 R->hidden_cursor = !R->hidden_cursor;
1074 csdiff = 0;
1075 } else
1076 csdiff = BLINK_TIME - csdiff;
1077 set_quick_timeout = 1;
1078 }
1079# endif 1028#endif
1080# if defined(POINTER_BLANK)
1081 /*
1082 * If we haven't moved the pointer for a while
1083 */
1084 if ((R->Options & Opt_pointerBlank)
1085 && (R->pointerBlankDelay > 0)
1086 && (R->hidden_pointer == 0)) {
1087 long pdelay;
1088
1089 if (!tp.tv_sec) /* didn't get it before so get it now */
1090 (void)gettimeofday(&tp, NULL);
1091 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1092 + tp.tv_usec - R->lastmotion.tv_usec;
1093 pdelay = R->pointerBlankDelay * 1000000L;
1094 if (psdiff >= pdelay)
1095 rxvt_pointer_blank(aR);
1096 else {
1097 set_quick_timeout = 1;
1098 psdiff = pdelay - psdiff;
1099 }
1100 }
1101# endif
1102 if (!quick_timeout && set_quick_timeout) {
1103 MIN_IT(csdiff, psdiff);
1104 value.tv_sec = csdiff / 1000000L;
1105 value.tv_usec = csdiff % 1000000L;
1106 quick_timeout = 1;
1107 }
1108 }
1109#endif
1110
1111 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1112 (quick_timeout ? &value : NULL))) == 0) {
1113 /* select statement timed out - we're not hard and fast scrolling */
1114 R->refresh_limit = 1;
1115 }
1116#if defined(CURSOR_BLINK)
1117 if (R->Options & Opt_cursorBlink)
1118 R->want_refresh = 1;
1119#endif
1120 }
1121} 1029}
1122 1030
1123/* EXTPROTO */
1124void 1031void
1125rxvt_pointer_unblank(pR) 1032rxvt_term::pointer_unblank ()
1126{ 1033{
1127 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1034 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128 rxvt_recolour_cursor(aR); 1035 rxvt_recolour_cursor (this);
1036
1129#ifdef POINTER_BLANK 1037#ifdef POINTER_BLANK
1130 R->hidden_pointer = 0; 1038 hidden_pointer = 0;
1131 if (R->pointerBlankDelay > 0) {
1132 struct timeval tp;
1133 1039
1134 (void)gettimeofday(&tp, NULL); 1040 if (Options & Opt_pointerBlank)
1135 R->lastmotion.tv_sec = tp.tv_sec; 1041 pointer_ev.start (NOW + pointerBlankDelay);
1136 R->lastmotion.tv_usec = tp.tv_usec;
1137 }
1138#endif 1042#endif
1139} 1043}
1140 1044
1141#ifdef POINTER_BLANK 1045#ifdef POINTER_BLANK
1142/* INTPROTO */
1143void 1046void
1144rxvt_pointer_blank(pR) 1047rxvt_term::pointer_blank ()
1145{ 1048{
1049 pointer_ev.stop ();
1050
1051 if (!(Options & Opt_pointerBlank))
1052 return;
1053
1146 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147 XFlush(R->Xdisplay); 1055 XFlush (Xdisplay);
1056
1148 R->hidden_pointer = 1; 1057 hidden_pointer = 1;
1058}
1059
1060void
1061rxvt_term::pointer_cb (time_watcher &w)
1062{
1063 SET_R (this);
1064
1065 pointer_blank ();
1149} 1066}
1150#endif 1067#endif
1151 1068
1152/* INTPROTO */ 1069/* INTPROTO */
1153void 1070void
… …
1206 fprintf(stderr, "]: <%d>, %d/%d\n", 1123 fprintf(stderr, "]: <%d>, %d/%d\n",
1207 button_number, 1124 button_number,
1208 x + 1, 1125 x + 1,
1209 y + 1); 1126 y + 1);
1210#else 1127#else
1211 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1128 R->tt_printf("\033[M%c%c%c",
1212 (32 + button_number + key_state), 1129 (32 + button_number + key_state),
1213 (32 + x + 1), 1130 (32 + x + 1),
1214 (32 + y + 1)); 1131 (32 + y + 1));
1215#endif 1132#endif
1216} 1133}
… …
1349 break; 1266 break;
1350 1267
1351 case ClientMessage: 1268 case ClientMessage:
1352 if (ev->xclient.format == 32 1269 if (ev->xclient.format == 32
1353 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1270 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354 exit(EXIT_SUCCESS); 1271 R->destroy ();
1355#ifdef OFFIX_DND 1272#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */ 1273 /* OffiX Dnd (drag 'n' drop) protocol */
1357 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1274 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358 && (ev->xclient.data.l[0] == DndFile 1275 && (ev->xclient.data.l[0] == DndFile
1359 || ev->xclient.data.l[0] == DndDir 1276 || ev->xclient.data.l[0] == DndDir
1360 || ev->xclient.data.l[0] == DndLink)) { 1277 || ev->xclient.data.l[0] == DndLink)) {
1361 /* Get Dnd data */ 1278 /* Get Dnd data */
1362 Atom ActualType; 1279 Atom ActualType;
… …
1394 * in the GraphicsExpose parts, which means that after each refresh, 1311 * in the GraphicsExpose parts, which means that after each refresh,
1395 * we need to wait for the graphics expose or Noexpose events, 1312 * we need to wait for the graphics expose or Noexpose events,
1396 * which ought to make things real slow! 1313 * which ought to make things real slow!
1397 */ 1314 */
1398 case VisibilityNotify: 1315 case VisibilityNotify:
1399 switch (ev->xvisibility.state) { 1316 switch (ev->xvisibility.state)
1317 {
1400 case VisibilityUnobscured: 1318 case VisibilityUnobscured:
1401 R->refresh_type = FAST_REFRESH; 1319 R->refresh_type = FAST_REFRESH;
1402 break; 1320 break;
1403 case VisibilityPartiallyObscured: 1321 case VisibilityPartiallyObscured:
1404 R->refresh_type = SLOW_REFRESH; 1322 R->refresh_type = SLOW_REFRESH;
1405 break; 1323 break;
1406 default: 1324 default:
1407 R->refresh_type = NO_REFRESH; 1325 R->refresh_type = NO_REFRESH;
1408 break; 1326 break;
1409 } 1327 }
1410 break; 1328 break;
1411 1329
1412 case FocusIn: 1330 case FocusIn:
1413 if (!R->TermWin.focus) { 1331 if (!R->TermWin.focus) {
1414 R->TermWin.focus = 1; 1332 R->TermWin.focus = 1;
… …
1556 break; 1474 break;
1557 1475
1558 case MotionNotify: 1476 case MotionNotify:
1559#ifdef POINTER_BLANK 1477#ifdef POINTER_BLANK
1560 if (R->hidden_pointer) 1478 if (R->hidden_pointer)
1561 rxvt_pointer_unblank(aR); 1479 R->pointer_unblank ();
1562#endif 1480#endif
1563#if MENUBAR 1481#if MENUBAR
1564 if (isMenuBarWindow(ev->xany.window)) { 1482 if (isMenuBarWindow(ev->xany.window)) {
1565 rxvt_menubar_control(aR_ &(ev->xbutton)); 1483 rxvt_menubar_control(aR_ &(ev->xbutton));
1566 break; 1484 break;
… …
1757 */ 1675 */
1758 if ((R->scrollBar.style == R_SB_NEXT 1676 if ((R->scrollBar.style == R_SB_NEXT
1759 && scrollbarnext_upButton(ev->y)) 1677 && scrollbarnext_upButton(ev->y))
1760 || (R->scrollBar.style == R_SB_RXVT 1678 || (R->scrollBar.style == R_SB_RXVT
1761 && scrollbarrxvt_upButton(ev->y))) 1679 && scrollbarrxvt_upButton(ev->y)))
1762 rxvt_tt_printf(aR_ "\033[A"); 1680 R->tt_printf("\033[A");
1763 else if ((R->scrollBar.style == R_SB_NEXT 1681 else if ((R->scrollBar.style == R_SB_NEXT
1764 && scrollbarnext_dnButton(ev->y)) 1682 && scrollbarnext_dnButton(ev->y))
1765 || (R->scrollBar.style == R_SB_RXVT 1683 || (R->scrollBar.style == R_SB_RXVT
1766 && scrollbarrxvt_dnButton(ev->y))) 1684 && scrollbarrxvt_dnButton(ev->y)))
1767 rxvt_tt_printf(aR_ "\033[B"); 1685 R->tt_printf("\033[B");
1768 else 1686 else
1769 switch (ev->button) { 1687 switch (ev->button) {
1770 case Button2: 1688 case Button2:
1771 rxvt_tt_printf(aR_ "\014"); 1689 R->tt_printf("\014");
1772 break; 1690 break;
1773 case Button1: 1691 case Button1:
1774 rxvt_tt_printf(aR_ "\033[6~"); 1692 R->tt_printf("\033[6~");
1775 break; 1693 break;
1776 case Button3: 1694 case Button3:
1777 rxvt_tt_printf(aR_ "\033[5~"); 1695 R->tt_printf("\033[5~");
1778 break; 1696 break;
1779 } 1697 }
1780 } 1698 }
1781 else 1699 else
1782#endif /* NO_SCROLLBAR_REPORT */ 1700#endif /* NO_SCROLLBAR_REPORT */
… …
2183 return stream; 2101 return stream;
2184} 2102}
2185 2103
2186/* EXTPROTO */ 2104/* EXTPROTO */
2187int 2105int
2188rxvt_pclose_printer(FILE *stream) 2106rxvt_pclose_printer (FILE *stream)
2189{ 2107{
2190 fflush(stream); 2108 fflush (stream);
2191/* pclose() reported not to work on SunOS 4.1.3 */ 2109/* pclose() reported not to work on SunOS 4.1.3 */
2192# if defined (__sun__) /* TODO: RESOLVE THIS */ 2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2193/* pclose works provided SIGCHLD handler uses waitpid */ 2111/* pclose works provided SIGCHLD handler uses waitpid */
2194 return pclose(stream); /* return fclose (stream); */ 2112 return pclose (stream); /* return fclose (stream); */
2195# else 2113# else
2196 return pclose(stream); 2114 return pclose (stream);
2197# endif 2115# endif
2198} 2116}
2199 2117
2200/* 2118/*
2201 * simulate attached vt100 printer 2119 * simulate attached vt100 printer
… …
2264rxvt_process_nonprinting(pR_ unsigned char ch) 2182rxvt_process_nonprinting(pR_ unsigned char ch)
2265{ 2183{
2266 switch (ch) { 2184 switch (ch) {
2267 case C0_ENQ: /* terminal Status */ 2185 case C0_ENQ: /* terminal Status */
2268 if (R->rs[Rs_answerbackstring]) 2186 if (R->rs[Rs_answerbackstring])
2269 rxvt_tt_write(aR_ 2187 R->tt_write(
2270 (const unsigned char *)R->rs[Rs_answerbackstring], 2188 (const unsigned char *)R->rs[Rs_answerbackstring],
2271 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2189 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272 else 2190 else
2273 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2191 R->tt_write((unsigned char *)VT100_ANS,
2274 (unsigned int)STRLEN(VT100_ANS)); 2192 (unsigned int)STRLEN(VT100_ANS));
2275 break; 2193 break;
2276 case C0_BEL: /* bell */ 2194 case C0_BEL: /* bell */
2277 rxvt_scr_bell(aR); 2195 rxvt_scr_bell(aR);
2278 break; 2196 break;
… …
2341 row = rxvt_cmd_getc(aR) - ' '; 2259 row = rxvt_cmd_getc(aR) - ' ';
2342 col = rxvt_cmd_getc(aR) - ' '; 2260 col = rxvt_cmd_getc(aR) - ' ';
2343 rxvt_scr_gotorc(aR_ row, col, 0); 2261 rxvt_scr_gotorc(aR_ row, col, 0);
2344 break; 2262 break;
2345 case 'Z': /* identify the terminal type */ 2263 case 'Z': /* identify the terminal type */
2346 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2264 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2347 break; 2265 break;
2348 case '<': /* turn off VT52 mode */ 2266 case '<': /* turn off VT52 mode */
2349 PrivMode(0, PrivMode_vt52); 2267 PrivMode(0, PrivMode_vt52);
2350 break; 2268 break;
2351 case 'F': /* use special graphics character set */ 2269 case 'F': /* use special graphics character set */
… …
2458 rxvt_process_dcs_seq(aR); 2376 rxvt_process_dcs_seq(aR);
2459 break; 2377 break;
2460 2378
2461 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2379 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462 case C1_SCI: /* ESC Z */ 2380 case C1_SCI: /* ESC Z */
2463 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2381 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2382 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465 break; /* steal obsolete ESC [ c */ 2383 break; /* steal obsolete ESC [ c */
2466 2384
2467 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2385 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468 case C1_CSI: /* ESC [ */ 2386 case C1_CSI: /* ESC [ */
… …
2589 */ 2507 */
2590 if (priv) { 2508 if (priv) {
2591 switch (priv) { 2509 switch (priv) {
2592 case '>': 2510 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2511 if (ch == CSI_DA) /* secondary device attributes */
2594 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2512 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2513 break;
2596 case '?': 2514 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2515 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2516 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599 break; 2517 break;
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2625 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2708 break; 2626 break;
2709 2627
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2629 R->tt_write((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2630 (unsigned int)(sizeof(VT100_ANS) - 1));
2713 break; 2631 break;
2714 2632
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2633 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 rxvt_process_sgr_mode(aR_ nargs, arg); 2634 rxvt_process_sgr_mode(aR_ nargs, arg);
2717 break; 2635 break;
2718 2636
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2637 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) { 2638 switch (arg[0]) {
2721 case 5: /* DSR requested */ 2639 case 5: /* DSR requested */
2722 rxvt_tt_printf(aR_ "\033[0n"); 2640 R->tt_printf("\033[0n");
2723 break; 2641 break;
2724 case 6: /* CPR requested */ 2642 case 6: /* CPR requested */
2725 rxvt_scr_report_position(aR); 2643 rxvt_scr_report_position(aR);
2726 break; 2644 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2645#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2646 case 7: /* unofficial extension */
2729 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2647 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730 break; 2648 break;
2731#endif 2649#endif
2732 case 8: /* unofficial extension */ 2650 case 8: /* unofficial extension */
2733 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2651 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2652 break;
… …
2803 break; 2721 break;
2804#endif 2722#endif
2805 2723
2806 case CSI_78: /* DECREQTPARM */ 2724 case CSI_78: /* DECREQTPARM */
2807 if (arg[0] == 0 || arg[0] == 1) 2725 if (arg[0] == 0 || arg[0] == 1)
2808 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2726 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2809 /* FALLTHROUGH */ 2727 /* FALLTHROUGH */
2810 2728
2811 default: 2729 default:
2812 break; 2730 break;
2813 } 2731 }
… …
2867 /* 2785 /*
2868 * reports - some output format copied from XTerm 2786 * reports - some output format copied from XTerm
2869 */ 2787 */
2870 case 11: /* report window state */ 2788 case 11: /* report window state */
2871 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2790 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873 break; 2791 break;
2874 case 13: /* report window position */ 2792 case 13: /* report window position */
2875 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2794 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877 -wattr.border_width, -wattr.border_width, 2795 -wattr.border_width, -wattr.border_width,
2878 &x, &y, &wdummy); 2796 &x, &y, &wdummy);
2879 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2797 R->tt_printf("\033[3;%d;%dt", x, y);
2880 break; 2798 break;
2881 case 14: /* report window size (pixels) */ 2799 case 14: /* report window size (pixels) */
2882 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2800 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2801 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884 break; 2802 break;
2885 case 18: /* report window size (chars) */ 2803 case 18: /* report window size (chars) */
2886 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2804 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2887 break; 2805 break;
2888#if 0 /* XXX: currently disabled due to security concerns */ 2806#if 0 /* XXX: currently disabled due to security concerns */
2889 case 20: /* report icon label */ 2807 case 20: /* report icon label */
2890 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2808 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2809 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892 break; 2810 break;
2893 case 21: /* report window title */ 2811 case 21: /* report window title */
2894 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2812 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2813 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896 break; 2814 break;
2897#endif 2815#endif
2898 } 2816 }
2899} 2817}
2900#endif 2818#endif
… …
3443{ 3361{
3444 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3362 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445 3363
3446#ifndef RXVT_GRAPHICS 3364#ifndef RXVT_GRAPHICS
3447 if (cmd == 'Q') { /* query graphics */ 3365 if (cmd == 'Q') { /* query graphics */
3448 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3366 R->tt_printf("\033G0\n"); /* no graphics */
3449 return; 3367 return;
3450 } 3368 }
3451/* swallow other graphics sequences until terminating ':' */ 3369/* swallow other graphics sequences until terminating ':' */
3452 do 3370 do
3453 ch = rxvt_cmd_getc(aR); 3371 ch = rxvt_cmd_getc(aR);
… …
3456 unsigned int nargs; 3374 unsigned int nargs;
3457 int args[NGRX_PTS]; 3375 int args[NGRX_PTS];
3458 unsigned char *text = NULL; 3376 unsigned char *text = NULL;
3459 3377
3460 if (cmd == 'Q') { /* query graphics */ 3378 if (cmd == 'Q') { /* query graphics */
3461 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3379 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462 return; 3380 return;
3463 } 3381 }
3464 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3382 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465 int neg; 3383 int neg;
3466 3384
… …
3500 3418
3501/* 3419/*
3502 * Send printf() formatted output to the command. 3420 * Send printf() formatted output to the command.
3503 * Only use for small amounts of data. 3421 * Only use for small amounts of data.
3504 */ 3422 */
3505/* EXTPROTO */
3506void 3423void
3507rxvt_tt_printf(pR_ const char *fmt,...) 3424rxvt_term::tt_printf (const char *fmt,...)
3508{ 3425{
3509 va_list arg_ptr; 3426 va_list arg_ptr;
3510 unsigned char buf[256]; 3427 unsigned char buf[256];
3511 3428
3512 va_start(arg_ptr, fmt); 3429 va_start (arg_ptr, fmt);
3513 vsprintf((char *)buf, fmt, arg_ptr); 3430 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514 va_end(arg_ptr); 3431 va_end (arg_ptr);
3515 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3432 tt_write (buf, STRLEN (buf));
3516} 3433}
3517 3434
3518/* ---------------------------------------------------------------------- */ 3435/* ---------------------------------------------------------------------- */
3519/* Addresses pasting large amounts of data and rxvt hang
3520 * code pinched from xterm (v_write()) and applied originally to
3521 * rxvt-2.18 - Hops
3522 * Write data to the pty as typed by the user, pasted with the mouse, 3436/* Write data to the pty as typed by the user, pasted with the mouse,
3523 * or generated by us in response to a query ESC sequence. 3437 * or generated by us in response to a query ESC sequence.
3524 */ 3438 */
3525/* EXTPROTO */
3526void 3439void
3527rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3440rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528{ 3441{
3529#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3442 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3530 int riten;
3531 unsigned int p;
3532 unsigned char *v_buffer, /* start of physical buffer */
3533 *v_bufstr, /* start of current buffer pending */
3534 *v_bufptr, /* end of current buffer pending */
3535 *v_bufend; /* end of physical buffer */
3536 3443
3537 if (R->v_bufstr == NULL && len > 0) { 3444 if (len)
3538 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3539 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3540 v_bufend = v_buffer + p;
3541 } else {
3542 v_buffer = R->v_buffer;
3543 v_bufstr = R->v_bufstr;
3544 v_bufptr = R->v_bufptr;
3545 v_bufend = R->v_bufend;
3546 } 3445 {
3446 if (v_buflen == 0)
3447 {
3448 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3449 if (written == len)
3450 return;
3547 3451
3548 /* 3452 data += written;
3549 * Append to the block we already have. Always doing this simplifies the 3453 len -= written;
3550 * code, and isn't too bad, either. If this is a short block, it isn't 3454 }
3551 * too expensive, and if this is a long block, we won't be able to write 3455
3552 * it all anyway. 3456
3553 */ 3457 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554 if (len > 0) { 3458
3555 if (v_bufend < v_bufptr + len) { /* run out of room */ 3459 memcpy (v_buffer + v_buflen, data, len);
3556 if (v_bufstr != v_buffer) { 3460 v_buflen += len;
3557 /* there is unused space, move everything down */
3558 MEMMOVE(v_buffer, v_bufstr,
3559 (unsigned int)(v_bufptr - v_bufstr));
3560 v_bufptr -= v_bufstr - v_buffer;
3561 v_bufstr = v_buffer;
3562 } 3461 }
3563 if (v_bufend < v_bufptr + len) {
3564 /* still won't fit: get more space */
3565 /* use most basic realloc because an error is not fatal. */
3566 unsigned int size = v_bufptr - v_buffer;
3567 unsigned int reallocto;
3568 3462
3569 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3463 for (;;)
3570 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3464 {
3571 /* save across realloc */ 3465 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572 if (v_buffer) { 3466
3573 v_bufstr = v_buffer; 3467 if (written > 0)
3574 v_bufptr = v_buffer + size; 3468 {
3575 v_bufend = v_buffer + reallocto; 3469 v_buflen -= written;
3576 } else { /* no memory: ignore entire write request */ 3470
3577 rxvt_print_error("data loss: cannot allocate buffer space"); 3471 if (v_buflen == 0)
3578 v_buffer = v_bufstr; /* restore clobbered pointer */ 3472 {
3579 } 3473 free (v_buffer);
3474 v_buffer = 0;
3475 v_buflen = 0;
3476
3477 pty_ev.set (EVENT_READ);
3478 return;
3479 }
3480
3481 memmove (v_buffer, v_buffer + written, v_buflen);
3482 }
3483 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3484 // original code just ignores this...
3485 destroy ();
3486 else
3487 {
3488 pty_ev.set (EVENT_READ | EVENT_WRITE);
3489 return;
3490 }
3580 } 3491 }
3581 }
3582 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3583 MEMCPY(v_bufptr, d, len);
3584 v_bufptr += len;
3585 }
3586 }
3587
3588 /*
3589 * Write out as much of the buffer as we can.
3590 * Be careful not to overflow the pty's input silo.
3591 * We are conservative here and only write a small amount at a time.
3592 *
3593 * If we can't push all the data into the pty yet, we expect write
3594 * to return a non-negative number less than the length requested
3595 * (if some data written) or -1 and set errno to EAGAIN,
3596 * EWOULDBLOCK, or EINTR (if no data written).
3597 *
3598 * (Not all systems do this, sigh, so the code is actually
3599 * a little more forgiving.)
3600 */
3601 if ((p = v_bufptr - v_bufstr) > 0) {
3602 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3603 if (riten < 0)
3604 riten = 0;
3605 v_bufstr += riten;
3606 if (v_bufstr >= v_bufptr) /* we wrote it all */
3607 v_bufstr = v_bufptr = v_buffer;
3608 }
3609 /*
3610 * If we have lots of unused memory allocated, return it
3611 */
3612 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3613 /* save pointers across realloc */
3614 unsigned int start = v_bufstr - v_buffer;
3615 unsigned int size = v_bufptr - v_buffer;
3616 unsigned int reallocto;
3617
3618 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3619 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3620 if (v_buffer) {
3621 v_bufstr = v_buffer + start;
3622 v_bufptr = v_buffer + size;
3623 v_bufend = v_buffer + reallocto;
3624 } else {
3625 /* should we print a warning if couldn't return memory? */
3626 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3627 }
3628 }
3629 R->v_buffer = v_buffer;
3630 R->v_bufstr = v_bufstr;
3631 R->v_bufptr = v_bufptr;
3632 R->v_bufend = v_bufend;
3633} 3492}
3493
3634/*----------------------- end-of-file (C source) -----------------------*/ 3494/*----------------------- end-of-file (C source) -----------------------*/
3635 3495

Diff Legend

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