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.10 by pcg, Thu Nov 27 16:49:45 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.10 2003/11/27 16:49:45 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() */
… …
666 666
667 XNextEvent (Xdisplay, &xev); 667 XNextEvent (Xdisplay, &xev);
668 668
669#if defined(CURSOR_BLINK) 669#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink) 670 if ((Options & Opt_cursorBlink)
671 && xev.type == KeyPress) { 671 && xev.type == KeyPress)
672 {
672 if (hidden_cursor) { 673 if (hidden_cursor)
674 {
673 hidden_cursor = 0; 675 hidden_cursor = 0;
674 want_refresh = 1; 676 want_refresh = 1;
675 } 677 }
678
676 blink_ev.start (NOW + BLINK_INTERVAL); 679 blink_ev.start (NOW + BLINK_INTERVAL);
677 } 680 }
678#endif 681#endif
679 682
680#if defined(POINTER_BLANK) 683#if defined(POINTER_BLANK)
681 if ((Options & Opt_pointerBlank) 684 if ((Options & Opt_pointerBlank)
682 && (pointerBlankDelay > 0)) { 685 && (pointerBlankDelay > 0))
686 {
683 if (xev.type == MotionNotify 687 if (xev.type == MotionNotify
684 || xev.type == ButtonPress 688 || xev.type == ButtonPress
685 || xev.type == ButtonRelease) { 689 || xev.type == ButtonRelease)
686 if (hidden_pointer) 690 if (hidden_pointer)
687 rxvt_pointer_unblank(aR); 691 pointer_unblank ();
688 want_motion_time = 1; 692
689 }
690 if (xev.type == KeyPress && hidden_pointer == 0) 693 if (xev.type == KeyPress && hidden_pointer == 0)
691 rxvt_pointer_blank (this); 694 pointer_blank ();
692 } 695 }
693#endif 696#endif
694 697
695#ifdef USE_XIM 698#ifdef USE_XIM
696 if (!XFilterEvent (&xev, xev.xany.window)) 699 if (!XFilterEvent (&xev, xev.xany.window))
697#endif 700#endif
… …
701} 704}
702 705
703void 706void
704rxvt_term::blink_cb (time_watcher &w) 707rxvt_term::blink_cb (time_watcher &w)
705{ 708{
709 SET_R (this);
710
706 w.at += BLINK_INTERVAL; 711 w.at += BLINK_INTERVAL;
707 hidden_cursor = !hidden_cursor; 712 hidden_cursor = !hidden_cursor;
708 want_refresh = 1; 713 want_refresh = 1;
709 flush(); 714 flush ();
710} 715}
711 716
712void 717void
713rxvt_term::x_cb (io_watcher &w, short revents) 718rxvt_term::x_cb (io_watcher &w, short revents)
714{ 719{
720 SET_R (this);
721
715 process_x_events (); 722 process_x_events ();
716 723
717 flush (); 724 flush ();
718} 725}
719 726
… …
771 778
772 return NOCHAR; 779 return NOCHAR;
773} 780}
774 781
775bool 782bool
776rxvt_term::pty_fill (size_t count) 783rxvt_term::pty_fill ()
777{ 784{
778 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 785 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779 786
780 memmove (cmdbuf_base, cmdbuf_ptr, n); 787 memmove (cmdbuf_base, cmdbuf_ptr, n);
781 cmdbuf_ptr = cmdbuf_base; 788 cmdbuf_ptr = cmdbuf_base;
782 cmdbuf_endp = cmdbuf_ptr + n; 789 cmdbuf_endp = cmdbuf_ptr + n;
783 790
784 n = read (cmd_fd, cmdbuf_endp, count); 791 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
785 792
786 if (n > 0) 793 if (n > 0)
787 { 794 {
788 cmdbuf_endp += n; 795 cmdbuf_endp += n;
789 return true; 796 return true;
790 } 797 }
791 else if (n < 0 && errno == EAGAIN) 798 else if (n < 0 && errno == EAGAIN)
792 return false; 799 return false;
793 800
794 rxvt_clean_exit(); 801 destroy ();
795 exit(EXIT_FAILURE); /* bad order of events? */
796} 802}
797 803
798void 804void
799rxvt_term::pty_cb (io_watcher &w, short revents) 805rxvt_term::pty_cb (io_watcher &w, short revents)
800{ 806{
801 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr))) 807 SET_R (this);
808
809 if (revents & EVENT_WRITE)
810 tt_write (0, 0);
811 else if (revents & EVENT_READ)
812 // loop, but don't allow a single term to monopolize us
813 // the number of loops is fully arbitrary, and thus wrong
814 for (int i = 7; i-- && pty_fill (); )
802 { 815 {
816 //TODO:
803 /* once we know the shell is running, send the screen size. Again! */ 817 /* once we know the shell is running, send the screen size. Again! */
804 //ch = rxvt_cmd_getc(aR); /* wait for something */ 818 //ch = rxvt_cmd_getc(aR); /* wait for something */
805 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); 819 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806 820
807 uint32_t ch = NOCHAR; 821 uint32_t ch = NOCHAR;
808 822
809 for (;;) 823 for (;;)
810 { 824 {
811 if (ch == NOCHAR) 825 if (ch == NOCHAR)
812 ch = next_char (); 826 ch = next_char ();
813 827
814 if (ch == NOCHAR) // TODO: improve 828 if (ch == NOCHAR) // TODO: improve
815 break; 829 break;
816 830
817 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 831 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818 { 832 {
819 /* Read a text string from the input buffer */ 833 /* Read a text string from the input buffer */
820 uint32_t buf[BUFSIZ]; 834 uint32_t buf[BUFSIZ];
821 bool refreshnow = false; 835 bool refreshnow = false;
822 int nlines = 0; 836 int nlines = 0;
823 uint32_t *str = buf; 837 uint32_t *str = buf;
824 838
825 *str++ = ch; 839 *str++ = ch;
826 840
827 for (;;) 841 for (;;)
828 { 842 {
829 ch = next_char (); 843 ch = next_char ();
830 844
831 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 845 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832 break; 846 break;
833 else 847 else
834 { 848 {
835 *str++ = ch; 849 *str++ = ch;
836 850
837 if (ch == '\n') 851 if (ch == '\n')
838 { 852 {
839 nlines++; 853 nlines++;
840 refresh_count++; 854 refresh_count++;
841 855
842 if (!(Options & Opt_jumpScroll) 856 if (!(Options & Opt_jumpScroll)
843 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844 { 858 {
845 refreshnow = true; 859 refreshnow = true;
846 ch = NOCHAR; 860 ch = NOCHAR;
847 break; 861 break;
848 } 862 }
849 } 863 }
850 864
851 if (str >= buf + BUFSIZ) 865 if (str >= buf + BUFSIZ)
852 { 866 {
853 ch = NOCHAR; 867 ch = NOCHAR;
854 break; 868 break;
855 } 869 }
856 } 870 }
857 } 871 }
858 872
859 rxvt_scr_add_lines (this, buf, nlines, str - buf); 873 rxvt_scr_add_lines (this, buf, nlines, str - buf);
860 874
861 /* 875 /*
862 * If there have been a lot of new lines, then update the screen 876 * 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. 877 * 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 878 * the number of pages between refreshes is refresh_limit, which
865 * is incremented here because we must be doing flat-out scrolling. 879 * is incremented here because we must be doing flat-out scrolling.
866 * 880 *
867 * refreshing should be correct for small scrolls, because of the 881 * refreshing should be correct for small scrolls, because of the
868 * time-out 882 * time-out
869 */ 883 */
870 if (refreshnow) 884 if (refreshnow)
871 { 885 {
872 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 886 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873 refresh_limit++; 887 refresh_limit++;
874 888
875 rxvt_scr_refresh (this, refresh_type); 889 rxvt_scr_refresh (this, refresh_type);
876 } 890 }
877 891
878 } 892 }
879 else 893 else
880 { 894 {
881 switch (ch) 895 switch (ch)
882 { 896 {
883 default: 897 default:
884 rxvt_process_nonprinting (this, ch); 898 rxvt_process_nonprinting (this, ch);
885 break; 899 break;
886 case C0_ESC: /* escape char */ 900 case C0_ESC: /* escape char */
887 rxvt_process_escape_seq (this); 901 rxvt_process_escape_seq (this);
888 break; 902 break;
889 /*case 0x9b: */ /* CSI */ 903 /*case 0x9b: */ /* CSI */
890 /* rxvt_process_csi_seq (this); */ 904 /* rxvt_process_csi_seq (this); */
891 } 905 }
892 906
893 ch = NOCHAR; 907 ch = NOCHAR;
894 } 908 }
895 } 909 }
896 } 910 }
897 911
898 flush (); 912 flush ();
899} 913}
900 914
901void 915void
… …
918#ifdef USE_XIM 932#ifdef USE_XIM
919 rxvt_IMSendSpot (this); 933 rxvt_IMSendSpot (this);
920#endif 934#endif
921 } 935 }
922 936
937 if (XPending (Xdisplay)) process_x_events ();
923 XFlush (Xdisplay); 938 XFlush (Xdisplay);
939 if (XPending (Xdisplay)) process_x_events ();
924} 940}
925 941
926/* rxvt_cmd_getc() - Return next input character */ 942/* rxvt_cmd_getc() - Return next input character */
927/* 943/*
928 * Return the next input character after first passing any keyboard input 944 * Return the next input character after first passing any keyboard input
… …
939 return c; 955 return c;
940 956
941 // incomplete sequences should occur rarely, still, a better solution 957 // incomplete sequences should occur rarely, still, a better solution
942 // would be preferred. either setjmp/longjmp or better design. 958 // would be preferred. either setjmp/longjmp or better design.
943 fcntl (R->cmd_fd, F_SETFL, 0); 959 fcntl (R->cmd_fd, F_SETFL, 0);
944 R->pty_fill (1); 960 R->pty_fill ();
945 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 961 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946 } 962 }
947 963
964#if 0
948#define TIMEOUT_USEC 5000 965#define TIMEOUT_USEC 5000
949 fd_set readfds; 966 fd_set readfds;
950 int quick_timeout, select_res; 967 int quick_timeout, select_res;
951 int want_motion_time, want_keypress_time; 968 int want_motion_time, want_keypress_time;
952 struct timeval value; 969 struct timeval value;
… …
956 973
957 for (;;) { 974 for (;;) {
958 /* loop until we can return something */ 975 /* loop until we can return something */
959 976
960 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 977 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961 rxvt_tt_write(aR_ NULL, 0); 978 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 979
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 980#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004 if (R->mouse_slip_wheel_speed) { 981 if (R->mouse_slip_wheel_speed) {
1005 quick_timeout = 1; 982 quick_timeout = 1;
1006 if (!R->mouse_slip_wheel_delay-- 983 if (!R->mouse_slip_wheel_delay--
… …
1036 R->want_refresh = 1; 1013 R->want_refresh = 1;
1037 } 1014 }
1038 } 1015 }
1039#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1016#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040 1017
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 1018#ifdef TRANSPARENT
1052 quick_timeout |= R->want_full_refresh; 1019 quick_timeout |= R->want_full_refresh;
1053#endif 1020#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 1021#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} 1022}
1122 1023
1123/* EXTPROTO */
1124void 1024void
1125rxvt_pointer_unblank(pR) 1025rxvt_term::pointer_unblank ()
1126{ 1026{
1127 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128 rxvt_recolour_cursor(aR); 1028 rxvt_recolour_cursor (this);
1029
1129#ifdef POINTER_BLANK 1030#ifdef POINTER_BLANK
1130 R->hidden_pointer = 0; 1031 hidden_pointer = 0;
1131 if (R->pointerBlankDelay > 0) {
1132 struct timeval tp;
1133 1032
1134 (void)gettimeofday(&tp, NULL); 1033 if (Options & Opt_pointerBlank)
1135 R->lastmotion.tv_sec = tp.tv_sec; 1034 pointer_ev.start (NOW + pointerBlankDelay);
1136 R->lastmotion.tv_usec = tp.tv_usec;
1137 }
1138#endif 1035#endif
1139} 1036}
1140 1037
1141#ifdef POINTER_BLANK 1038#ifdef POINTER_BLANK
1142/* INTPROTO */
1143void 1039void
1144rxvt_pointer_blank(pR) 1040rxvt_term::pointer_blank ()
1145{ 1041{
1042 pointer_ev.stop ();
1043
1044 if (!(Options & Opt_pointerBlank))
1045 return;
1046
1146 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147 XFlush(R->Xdisplay); 1048 XFlush (Xdisplay);
1049
1148 R->hidden_pointer = 1; 1050 hidden_pointer = 1;
1051}
1052
1053void
1054rxvt_term::pointer_cb (time_watcher &w)
1055{
1056 SET_R (this);
1057
1058 pointer_blank ();
1149} 1059}
1150#endif 1060#endif
1151 1061
1152/* INTPROTO */ 1062/* INTPROTO */
1153void 1063void
… …
1206 fprintf(stderr, "]: <%d>, %d/%d\n", 1116 fprintf(stderr, "]: <%d>, %d/%d\n",
1207 button_number, 1117 button_number,
1208 x + 1, 1118 x + 1,
1209 y + 1); 1119 y + 1);
1210#else 1120#else
1211 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1121 R->tt_printf("\033[M%c%c%c",
1212 (32 + button_number + key_state), 1122 (32 + button_number + key_state),
1213 (32 + x + 1), 1123 (32 + x + 1),
1214 (32 + y + 1)); 1124 (32 + y + 1));
1215#endif 1125#endif
1216} 1126}
… …
1349 break; 1259 break;
1350 1260
1351 case ClientMessage: 1261 case ClientMessage:
1352 if (ev->xclient.format == 32 1262 if (ev->xclient.format == 32
1353 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1263 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354 exit(EXIT_SUCCESS); 1264 R->destroy ();
1355#ifdef OFFIX_DND 1265#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */ 1266 /* OffiX Dnd (drag 'n' drop) protocol */
1357 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1267 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358 && (ev->xclient.data.l[0] == DndFile 1268 && (ev->xclient.data.l[0] == DndFile
1359 || ev->xclient.data.l[0] == DndDir 1269 || ev->xclient.data.l[0] == DndDir
1360 || ev->xclient.data.l[0] == DndLink)) { 1270 || ev->xclient.data.l[0] == DndLink)) {
1361 /* Get Dnd data */ 1271 /* Get Dnd data */
1362 Atom ActualType; 1272 Atom ActualType;
… …
1394 * in the GraphicsExpose parts, which means that after each refresh, 1304 * in the GraphicsExpose parts, which means that after each refresh,
1395 * we need to wait for the graphics expose or Noexpose events, 1305 * we need to wait for the graphics expose or Noexpose events,
1396 * which ought to make things real slow! 1306 * which ought to make things real slow!
1397 */ 1307 */
1398 case VisibilityNotify: 1308 case VisibilityNotify:
1399 switch (ev->xvisibility.state) { 1309 switch (ev->xvisibility.state)
1310 {
1400 case VisibilityUnobscured: 1311 case VisibilityUnobscured:
1401 R->refresh_type = FAST_REFRESH; 1312 R->refresh_type = FAST_REFRESH;
1402 break; 1313 break;
1403 case VisibilityPartiallyObscured: 1314 case VisibilityPartiallyObscured:
1404 R->refresh_type = SLOW_REFRESH; 1315 R->refresh_type = SLOW_REFRESH;
1405 break; 1316 break;
1406 default: 1317 default:
1407 R->refresh_type = NO_REFRESH; 1318 R->refresh_type = NO_REFRESH;
1408 break; 1319 break;
1409 } 1320 }
1410 break; 1321 break;
1411 1322
1412 case FocusIn: 1323 case FocusIn:
1413 if (!R->TermWin.focus) { 1324 if (!R->TermWin.focus) {
1414 R->TermWin.focus = 1; 1325 R->TermWin.focus = 1;
… …
1556 break; 1467 break;
1557 1468
1558 case MotionNotify: 1469 case MotionNotify:
1559#ifdef POINTER_BLANK 1470#ifdef POINTER_BLANK
1560 if (R->hidden_pointer) 1471 if (R->hidden_pointer)
1561 rxvt_pointer_unblank(aR); 1472 R->pointer_unblank ();
1562#endif 1473#endif
1563#if MENUBAR 1474#if MENUBAR
1564 if (isMenuBarWindow(ev->xany.window)) { 1475 if (isMenuBarWindow(ev->xany.window)) {
1565 rxvt_menubar_control(aR_ &(ev->xbutton)); 1476 rxvt_menubar_control(aR_ &(ev->xbutton));
1566 break; 1477 break;
… …
1757 */ 1668 */
1758 if ((R->scrollBar.style == R_SB_NEXT 1669 if ((R->scrollBar.style == R_SB_NEXT
1759 && scrollbarnext_upButton(ev->y)) 1670 && scrollbarnext_upButton(ev->y))
1760 || (R->scrollBar.style == R_SB_RXVT 1671 || (R->scrollBar.style == R_SB_RXVT
1761 && scrollbarrxvt_upButton(ev->y))) 1672 && scrollbarrxvt_upButton(ev->y)))
1762 rxvt_tt_printf(aR_ "\033[A"); 1673 R->tt_printf("\033[A");
1763 else if ((R->scrollBar.style == R_SB_NEXT 1674 else if ((R->scrollBar.style == R_SB_NEXT
1764 && scrollbarnext_dnButton(ev->y)) 1675 && scrollbarnext_dnButton(ev->y))
1765 || (R->scrollBar.style == R_SB_RXVT 1676 || (R->scrollBar.style == R_SB_RXVT
1766 && scrollbarrxvt_dnButton(ev->y))) 1677 && scrollbarrxvt_dnButton(ev->y)))
1767 rxvt_tt_printf(aR_ "\033[B"); 1678 R->tt_printf("\033[B");
1768 else 1679 else
1769 switch (ev->button) { 1680 switch (ev->button) {
1770 case Button2: 1681 case Button2:
1771 rxvt_tt_printf(aR_ "\014"); 1682 R->tt_printf("\014");
1772 break; 1683 break;
1773 case Button1: 1684 case Button1:
1774 rxvt_tt_printf(aR_ "\033[6~"); 1685 R->tt_printf("\033[6~");
1775 break; 1686 break;
1776 case Button3: 1687 case Button3:
1777 rxvt_tt_printf(aR_ "\033[5~"); 1688 R->tt_printf("\033[5~");
1778 break; 1689 break;
1779 } 1690 }
1780 } 1691 }
1781 else 1692 else
1782#endif /* NO_SCROLLBAR_REPORT */ 1693#endif /* NO_SCROLLBAR_REPORT */
… …
2264rxvt_process_nonprinting(pR_ unsigned char ch) 2175rxvt_process_nonprinting(pR_ unsigned char ch)
2265{ 2176{
2266 switch (ch) { 2177 switch (ch) {
2267 case C0_ENQ: /* terminal Status */ 2178 case C0_ENQ: /* terminal Status */
2268 if (R->rs[Rs_answerbackstring]) 2179 if (R->rs[Rs_answerbackstring])
2269 rxvt_tt_write(aR_ 2180 R->tt_write(
2270 (const unsigned char *)R->rs[Rs_answerbackstring], 2181 (const unsigned char *)R->rs[Rs_answerbackstring],
2271 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2182 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272 else 2183 else
2273 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2184 R->tt_write((unsigned char *)VT100_ANS,
2274 (unsigned int)STRLEN(VT100_ANS)); 2185 (unsigned int)STRLEN(VT100_ANS));
2275 break; 2186 break;
2276 case C0_BEL: /* bell */ 2187 case C0_BEL: /* bell */
2277 rxvt_scr_bell(aR); 2188 rxvt_scr_bell(aR);
2278 break; 2189 break;
… …
2341 row = rxvt_cmd_getc(aR) - ' '; 2252 row = rxvt_cmd_getc(aR) - ' ';
2342 col = rxvt_cmd_getc(aR) - ' '; 2253 col = rxvt_cmd_getc(aR) - ' ';
2343 rxvt_scr_gotorc(aR_ row, col, 0); 2254 rxvt_scr_gotorc(aR_ row, col, 0);
2344 break; 2255 break;
2345 case 'Z': /* identify the terminal type */ 2256 case 'Z': /* identify the terminal type */
2346 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2257 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2347 break; 2258 break;
2348 case '<': /* turn off VT52 mode */ 2259 case '<': /* turn off VT52 mode */
2349 PrivMode(0, PrivMode_vt52); 2260 PrivMode(0, PrivMode_vt52);
2350 break; 2261 break;
2351 case 'F': /* use special graphics character set */ 2262 case 'F': /* use special graphics character set */
… …
2458 rxvt_process_dcs_seq(aR); 2369 rxvt_process_dcs_seq(aR);
2459 break; 2370 break;
2460 2371
2461 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2372 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462 case C1_SCI: /* ESC Z */ 2373 case C1_SCI: /* ESC Z */
2463 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2374 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2375 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465 break; /* steal obsolete ESC [ c */ 2376 break; /* steal obsolete ESC [ c */
2466 2377
2467 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2378 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468 case C1_CSI: /* ESC [ */ 2379 case C1_CSI: /* ESC [ */
… …
2589 */ 2500 */
2590 if (priv) { 2501 if (priv) {
2591 switch (priv) { 2502 switch (priv) {
2592 case '>': 2503 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2504 if (ch == CSI_DA) /* secondary device attributes */
2594 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2505 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2506 break;
2596 case '?': 2507 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2508 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2509 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599 break; 2510 break;
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2617 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2618 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2708 break; 2619 break;
2709 2620
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2621 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2622 R->tt_write((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2623 (unsigned int)(sizeof(VT100_ANS) - 1));
2713 break; 2624 break;
2714 2625
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2626 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 rxvt_process_sgr_mode(aR_ nargs, arg); 2627 rxvt_process_sgr_mode(aR_ nargs, arg);
2717 break; 2628 break;
2718 2629
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2630 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) { 2631 switch (arg[0]) {
2721 case 5: /* DSR requested */ 2632 case 5: /* DSR requested */
2722 rxvt_tt_printf(aR_ "\033[0n"); 2633 R->tt_printf("\033[0n");
2723 break; 2634 break;
2724 case 6: /* CPR requested */ 2635 case 6: /* CPR requested */
2725 rxvt_scr_report_position(aR); 2636 rxvt_scr_report_position(aR);
2726 break; 2637 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2638#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2639 case 7: /* unofficial extension */
2729 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2640 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730 break; 2641 break;
2731#endif 2642#endif
2732 case 8: /* unofficial extension */ 2643 case 8: /* unofficial extension */
2733 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2644 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2645 break;
… …
2803 break; 2714 break;
2804#endif 2715#endif
2805 2716
2806 case CSI_78: /* DECREQTPARM */ 2717 case CSI_78: /* DECREQTPARM */
2807 if (arg[0] == 0 || arg[0] == 1) 2718 if (arg[0] == 0 || arg[0] == 1)
2808 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2719 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2809 /* FALLTHROUGH */ 2720 /* FALLTHROUGH */
2810 2721
2811 default: 2722 default:
2812 break; 2723 break;
2813 } 2724 }
… …
2867 /* 2778 /*
2868 * reports - some output format copied from XTerm 2779 * reports - some output format copied from XTerm
2869 */ 2780 */
2870 case 11: /* report window state */ 2781 case 11: /* report window state */
2871 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2782 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2783 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873 break; 2784 break;
2874 case 13: /* report window position */ 2785 case 13: /* report window position */
2875 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2786 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2787 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877 -wattr.border_width, -wattr.border_width, 2788 -wattr.border_width, -wattr.border_width,
2878 &x, &y, &wdummy); 2789 &x, &y, &wdummy);
2879 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2790 R->tt_printf("\033[3;%d;%dt", x, y);
2880 break; 2791 break;
2881 case 14: /* report window size (pixels) */ 2792 case 14: /* report window size (pixels) */
2882 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2794 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884 break; 2795 break;
2885 case 18: /* report window size (chars) */ 2796 case 18: /* report window size (chars) */
2886 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2797 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2887 break; 2798 break;
2888#if 0 /* XXX: currently disabled due to security concerns */ 2799#if 0 /* XXX: currently disabled due to security concerns */
2889 case 20: /* report icon label */ 2800 case 20: /* report icon label */
2890 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2801 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2802 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892 break; 2803 break;
2893 case 21: /* report window title */ 2804 case 21: /* report window title */
2894 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2805 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2806 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896 break; 2807 break;
2897#endif 2808#endif
2898 } 2809 }
2899} 2810}
2900#endif 2811#endif
… …
3443{ 3354{
3444 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3355 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445 3356
3446#ifndef RXVT_GRAPHICS 3357#ifndef RXVT_GRAPHICS
3447 if (cmd == 'Q') { /* query graphics */ 3358 if (cmd == 'Q') { /* query graphics */
3448 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3359 R->tt_printf("\033G0\n"); /* no graphics */
3449 return; 3360 return;
3450 } 3361 }
3451/* swallow other graphics sequences until terminating ':' */ 3362/* swallow other graphics sequences until terminating ':' */
3452 do 3363 do
3453 ch = rxvt_cmd_getc(aR); 3364 ch = rxvt_cmd_getc(aR);
… …
3456 unsigned int nargs; 3367 unsigned int nargs;
3457 int args[NGRX_PTS]; 3368 int args[NGRX_PTS];
3458 unsigned char *text = NULL; 3369 unsigned char *text = NULL;
3459 3370
3460 if (cmd == 'Q') { /* query graphics */ 3371 if (cmd == 'Q') { /* query graphics */
3461 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3372 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462 return; 3373 return;
3463 } 3374 }
3464 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3375 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465 int neg; 3376 int neg;
3466 3377
… …
3500 3411
3501/* 3412/*
3502 * Send printf() formatted output to the command. 3413 * Send printf() formatted output to the command.
3503 * Only use for small amounts of data. 3414 * Only use for small amounts of data.
3504 */ 3415 */
3505/* EXTPROTO */
3506void 3416void
3507rxvt_tt_printf(pR_ const char *fmt,...) 3417rxvt_term::tt_printf (const char *fmt,...)
3508{ 3418{
3509 va_list arg_ptr; 3419 va_list arg_ptr;
3510 unsigned char buf[256]; 3420 unsigned char buf[256];
3511 3421
3512 va_start(arg_ptr, fmt); 3422 va_start (arg_ptr, fmt);
3513 vsprintf((char *)buf, fmt, arg_ptr); 3423 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514 va_end(arg_ptr); 3424 va_end (arg_ptr);
3515 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3425 tt_write (buf, STRLEN (buf));
3516} 3426}
3517 3427
3518/* ---------------------------------------------------------------------- */ 3428/* ---------------------------------------------------------------------- */
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, 3429/* 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. 3430 * or generated by us in response to a query ESC sequence.
3524 */ 3431 */
3525/* EXTPROTO */
3526void 3432void
3527rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3433rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528{ 3434{
3529#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3435 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 3436
3537 if (R->v_bufstr == NULL && len > 0) { 3437 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 } 3438 {
3439 if (v_buflen == 0)
3440 {
3441 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3442 if (written == len)
3443 return;
3547 3444
3548 /* 3445 data += written;
3549 * Append to the block we already have. Always doing this simplifies the 3446 len -= written;
3550 * code, and isn't too bad, either. If this is a short block, it isn't 3447 }
3551 * too expensive, and if this is a long block, we won't be able to write 3448
3552 * it all anyway. 3449
3553 */ 3450 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554 if (len > 0) { 3451
3555 if (v_bufend < v_bufptr + len) { /* run out of room */ 3452 memcpy (v_buffer + v_buflen, data, len);
3556 if (v_bufstr != v_buffer) { 3453 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 } 3454 }
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 3455
3569 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3456 for (;;)
3570 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3457 {
3571 /* save across realloc */ 3458 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572 if (v_buffer) { 3459
3573 v_bufstr = v_buffer; 3460 if (written > 0)
3574 v_bufptr = v_buffer + size; 3461 {
3575 v_bufend = v_buffer + reallocto; 3462 v_buflen -= written;
3576 } else { /* no memory: ignore entire write request */ 3463
3577 rxvt_print_error("data loss: cannot allocate buffer space"); 3464 if (v_buflen == 0)
3578 v_buffer = v_bufstr; /* restore clobbered pointer */ 3465 {
3579 } 3466 free (v_buffer);
3467 v_buffer = 0;
3468 v_buflen = 0;
3469
3470 pty_ev.set (EVENT_READ);
3471 return;
3472 }
3473
3474 memmove (v_buffer, v_buffer + written, v_buflen);
3475 }
3476 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3477 // original code just ignores this...
3478 destroy ();
3479 else
3480 {
3481 pty_ev.set (EVENT_READ | EVENT_WRITE);
3482 return;
3483 }
3580 } 3484 }
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} 3485}
3486
3634/*----------------------- end-of-file (C source) -----------------------*/ 3487/*----------------------- end-of-file (C source) -----------------------*/
3635 3488

Diff Legend

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