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.4 by pcg, Tue Nov 25 15:25:16 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.4 2003/11/25 15:25:16 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() */
… …
663 do 663 do
664 { 664 {
665 XEvent xev; 665 XEvent xev;
666 666
667 XNextEvent (Xdisplay, &xev); 667 XNextEvent (Xdisplay, &xev);
668
668#if defined(CURSOR_BLINK) 669#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 670 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) { 671 && xev.type == KeyPress)
672 {
671 if (hidden_cursor) { 673 if (hidden_cursor)
674 {
672 hidden_cursor = 0; 675 hidden_cursor = 0;
673 want_refresh = 1; 676 want_refresh = 1;
674 } 677 }
675 want_keypress_time = 1; 678
679 blink_ev.start (NOW + BLINK_INTERVAL);
676 } 680 }
677#endif 681#endif
678 682
679#if defined(POINTER_BLANK) 683#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 684 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) { 685 && (pointerBlankDelay > 0))
686 {
682 if (xev.type == MotionNotify 687 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 688 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 689 || xev.type == ButtonRelease)
685 if (hidden_pointer) 690 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 691 pointer_unblank ();
687 want_motion_time = 1; 692
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 693 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 694 pointer_blank ();
691 } 695 }
692#endif 696#endif
693 697
694#ifdef USE_XIM 698#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 699 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 700#endif
… …
698 } 702 }
699 while (XPending (Xdisplay)); 703 while (XPending (Xdisplay));
700} 704}
701 705
702void 706void
707rxvt_term::blink_cb (time_watcher &w)
708{
709 SET_R (this);
710
711 w.at += BLINK_INTERVAL;
712 hidden_cursor = !hidden_cursor;
713 want_refresh = 1;
714 flush ();
715}
716
717void
703rxvt_term::x_cb (io_watcher &w, short revents) 718rxvt_term::x_cb (io_watcher &w, short revents)
704{ 719{
720 SET_R (this);
721
705 process_x_events (); 722 process_x_events ();
706 723
707 flush (); 724 flush ();
708} 725}
709 726
… …
761 778
762 return NOCHAR; 779 return NOCHAR;
763} 780}
764 781
765bool 782bool
766rxvt_term::pty_fill (size_t count) 783rxvt_term::pty_fill ()
767{ 784{
768 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 785 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
769 786
770 memmove (cmdbuf_base, cmdbuf_ptr, n); 787 memmove (cmdbuf_base, cmdbuf_ptr, n);
771 cmdbuf_ptr = cmdbuf_base; 788 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp = cmdbuf_ptr + n; 789 cmdbuf_endp = cmdbuf_ptr + n;
773 790
774 n = read (cmd_fd, cmdbuf_endp, count); 791 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
775 792
776 if (n > 0) 793 if (n > 0)
777 { 794 {
778 cmdbuf_endp += n; 795 cmdbuf_endp += n;
779 return true; 796 return true;
780 } 797 }
781 else if (n < 0 && errno == EAGAIN) 798 else if (n < 0 && errno == EAGAIN)
782 return false; 799 return false;
783 800
784 rxvt_clean_exit(); 801 destroy ();
785 exit(EXIT_FAILURE); /* bad order of events? */
786} 802}
787 803
788void 804void
789rxvt_term::pty_cb (io_watcher &w, short revents) 805rxvt_term::pty_cb (io_watcher &w, short revents)
790{ 806{
791 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 (); )
792 { 815 {
816 //TODO:
793 /* 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! */
794 //ch = rxvt_cmd_getc(aR); /* wait for something */ 818 //ch = rxvt_cmd_getc(aR); /* wait for something */
795 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); 819 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
796 820
797 uint32_t ch = NOCHAR; 821 uint32_t ch = NOCHAR;
798 822
799 for (;;) 823 for (;;)
800 { 824 {
801 if (ch == NOCHAR) 825 if (ch == NOCHAR)
802 ch = next_char (); 826 ch = next_char ();
803 827
804 if (ch == NOCHAR) // TODO: improve 828 if (ch == NOCHAR) // TODO: improve
805 break; 829 break;
806 830
807 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 831 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
808 { 832 {
809 /* Read a text string from the input buffer */ 833 /* Read a text string from the input buffer */
810 uint32_t buf[BUFSIZ]; 834 uint32_t buf[BUFSIZ];
811 bool refreshnow = false; 835 bool refreshnow = false;
812 int nlines = 0; 836 int nlines = 0;
813 uint32_t *str = buf; 837 uint32_t *str = buf;
814 838
815 *str++ = ch; 839 *str++ = ch;
816 840
817 for (;;) 841 for (;;)
818 { 842 {
819 ch = next_char (); 843 ch = next_char ();
820 844
821 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 845 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
822 break; 846 break;
823 else 847 else
824 { 848 {
825 *str++ = ch; 849 *str++ = ch;
826 850
827 if (ch == '\n') 851 if (ch == '\n')
828 { 852 {
829 nlines++; 853 nlines++;
830 refresh_count++; 854 refresh_count++;
831 855
832 if (!(Options & Opt_jumpScroll) 856 if (!(Options & Opt_jumpScroll)
833 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
834 { 858 {
835 refreshnow = true; 859 refreshnow = true;
836 ch = NOCHAR; 860 ch = NOCHAR;
837 break; 861 break;
838 } 862 }
839 } 863 }
840 864
841 if (str >= buf + BUFSIZ) 865 if (str >= buf + BUFSIZ)
842 { 866 {
843 ch = NOCHAR; 867 ch = NOCHAR;
844 break; 868 break;
845 } 869 }
846 } 870 }
847 } 871 }
848 872
849 rxvt_scr_add_lines (this, buf, nlines, str - buf); 873 rxvt_scr_add_lines (this, buf, nlines, str - buf);
850 874
851 /* 875 /*
852 * 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
853 * 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.
854 * the number of pages between refreshes is refresh_limit, which 878 * the number of pages between refreshes is refresh_limit, which
855 * is incremented here because we must be doing flat-out scrolling. 879 * is incremented here because we must be doing flat-out scrolling.
856 * 880 *
857 * refreshing should be correct for small scrolls, because of the 881 * refreshing should be correct for small scrolls, because of the
858 * time-out 882 * time-out
859 */ 883 */
860 if (refreshnow) 884 if (refreshnow)
861 { 885 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 886 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++; 887 refresh_limit++;
864 888
865 rxvt_scr_refresh (this, refresh_type); 889 rxvt_scr_refresh (this, refresh_type);
866 } 890 }
867 891
868 } 892 }
869 else 893 else
870 { 894 {
871 switch (ch) 895 switch (ch)
872 { 896 {
873 default: 897 default:
874 rxvt_process_nonprinting (this, ch); 898 rxvt_process_nonprinting (this, ch);
875 break; 899 break;
876 case C0_ESC: /* escape char */ 900 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this); 901 rxvt_process_escape_seq (this);
878 break; 902 break;
879 /*case 0x9b: */ /* CSI */ 903 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */ 904 /* rxvt_process_csi_seq (this); */
881 } 905 }
882 906
883 ch = NOCHAR; 907 ch = NOCHAR;
884 } 908 }
885 } 909 }
886 } 910 }
887 911
888 flush (); 912 flush ();
889} 913}
890 914
891void 915void
… …
908#ifdef USE_XIM 932#ifdef USE_XIM
909 rxvt_IMSendSpot (this); 933 rxvt_IMSendSpot (this);
910#endif 934#endif
911 } 935 }
912 936
937 if (XPending (Xdisplay)) process_x_events ();
913 XFlush (Xdisplay); 938 XFlush (Xdisplay);
939 if (XPending (Xdisplay)) process_x_events ();
914} 940}
915 941
916/* rxvt_cmd_getc() - Return next input character */ 942/* rxvt_cmd_getc() - Return next input character */
917/* 943/*
918 * Return the next input character after first passing any keyboard input 944 * Return the next input character after first passing any keyboard input
… …
929 return c; 955 return c;
930 956
931 // incomplete sequences should occur rarely, still, a better solution 957 // incomplete sequences should occur rarely, still, a better solution
932 // would be preferred. either setjmp/longjmp or better design. 958 // would be preferred. either setjmp/longjmp or better design.
933 fcntl (R->cmd_fd, F_SETFL, 0); 959 fcntl (R->cmd_fd, F_SETFL, 0);
934 R->pty_fill (1); 960 R->pty_fill ();
935 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 961 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936 } 962 }
937 963
964#if 0
938#define TIMEOUT_USEC 5000 965#define TIMEOUT_USEC 5000
939 fd_set readfds; 966 fd_set readfds;
940 int quick_timeout, select_res; 967 int quick_timeout, select_res;
941 int want_motion_time, want_keypress_time; 968 int want_motion_time, want_keypress_time;
942 struct timeval value; 969 struct timeval value;
… …
946 973
947 for (;;) { 974 for (;;) {
948 /* loop until we can return something */ 975 /* loop until we can return something */
949 976
950 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 977 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951 rxvt_tt_write(aR_ NULL, 0); 978 R->tt_write(NULL, 0);
952
953#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
954 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
955#endif
956#if defined(CURSOR_BLINK)
957 want_keypress_time = 0;
958#endif
959#if defined(POINTER_BLANK)
960 want_motion_time = 0;
961#endif
962
963 if (XPending (R->Xdisplay))
964 {
965 R->process_x_events ();
966
967 /* in case button actions pushed chars to cmdbuf */
968 if (R->cmdbuf_ptr < R->cmdbuf_endp)
969 return *R->cmdbuf_ptr++;
970 }
971
972#if defined(CURSOR_BLINK)
973 if (want_keypress_time) {
974 (void)gettimeofday(&tp, NULL);
975 R->lastcursorchange.tv_sec = tp.tv_sec;
976 R->lastcursorchange.tv_usec = tp.tv_usec;
977 }
978#endif
979#if defined(POINTER_BLANK)
980 if (want_motion_time) {
981 if (!tp.tv_sec)
982 (void)gettimeofday(&tp, NULL);
983 R->lastmotion.tv_sec = tp.tv_sec;
984 R->lastmotion.tv_usec = tp.tv_usec;
985 }
986#endif
987
988/*
989 * the command input buffer is empty and we have no pending X events
990 */
991 quick_timeout = 0;
992 979
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 980#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (R->mouse_slip_wheel_speed) { 981 if (R->mouse_slip_wheel_speed) {
995 quick_timeout = 1; 982 quick_timeout = 1;
996 if (!R->mouse_slip_wheel_delay-- 983 if (!R->mouse_slip_wheel_delay--
… …
1026 R->want_refresh = 1; 1013 R->want_refresh = 1;
1027 } 1014 }
1028 } 1015 }
1029#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1016#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030 1017
1031 FD_ZERO(&readfds);
1032 FD_SET(R->cmd_fd, &readfds);
1033 FD_SET(R->Xfd, &readfds);
1034 value.tv_usec = TIMEOUT_USEC;
1035 value.tv_sec = 0;
1036
1037 if (!R->TermWin.mapped)
1038 quick_timeout = 0;
1039 else {
1040 quick_timeout |= R->want_refresh;
1041#ifdef TRANSPARENT 1018#ifdef TRANSPARENT
1042 quick_timeout |= R->want_full_refresh; 1019 quick_timeout |= R->want_full_refresh;
1043#endif 1020#endif
1044 }
1045
1046#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1047 {
1048 int set_quick_timeout = 0;
1049 long csdiff, psdiff;
1050
1051#define BLINK_TIME 500000L
1052 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1053# if defined(CURSOR_BLINK)
1054 if (R->Options & Opt_cursorBlink) {
1055 if (!tp.tv_sec) /* didn't get it before so get it now */
1056 (void)gettimeofday(&tp, NULL);
1057
1058 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1059 + tp.tv_usec - R->lastcursorchange.tv_usec;
1060 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1061 R->lastcursorchange.tv_sec = tp.tv_sec;
1062 R->lastcursorchange.tv_usec = tp.tv_usec;
1063 R->hidden_cursor = !R->hidden_cursor;
1064 csdiff = 0;
1065 } else
1066 csdiff = BLINK_TIME - csdiff;
1067 set_quick_timeout = 1;
1068 }
1069# endif 1021#endif
1070# if defined(POINTER_BLANK)
1071 /*
1072 * If we haven't moved the pointer for a while
1073 */
1074 if ((R->Options & Opt_pointerBlank)
1075 && (R->pointerBlankDelay > 0)
1076 && (R->hidden_pointer == 0)) {
1077 long pdelay;
1078
1079 if (!tp.tv_sec) /* didn't get it before so get it now */
1080 (void)gettimeofday(&tp, NULL);
1081 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1082 + tp.tv_usec - R->lastmotion.tv_usec;
1083 pdelay = R->pointerBlankDelay * 1000000L;
1084 if (psdiff >= pdelay)
1085 rxvt_pointer_blank(aR);
1086 else {
1087 set_quick_timeout = 1;
1088 psdiff = pdelay - psdiff;
1089 }
1090 }
1091# endif
1092 if (!quick_timeout && set_quick_timeout) {
1093 MIN_IT(csdiff, psdiff);
1094 value.tv_sec = csdiff / 1000000L;
1095 value.tv_usec = csdiff % 1000000L;
1096 quick_timeout = 1;
1097 }
1098 }
1099#endif
1100
1101 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1102 (quick_timeout ? &value : NULL))) == 0) {
1103 /* select statement timed out - we're not hard and fast scrolling */
1104 R->refresh_limit = 1;
1105 }
1106#if defined(CURSOR_BLINK)
1107 if (R->Options & Opt_cursorBlink)
1108 R->want_refresh = 1;
1109#endif
1110 }
1111} 1022}
1112 1023
1113/* EXTPROTO */
1114void 1024void
1115rxvt_pointer_unblank(pR) 1025rxvt_term::pointer_unblank ()
1116{ 1026{
1117 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118 rxvt_recolour_cursor(aR); 1028 rxvt_recolour_cursor (this);
1029
1119#ifdef POINTER_BLANK 1030#ifdef POINTER_BLANK
1120 R->hidden_pointer = 0; 1031 hidden_pointer = 0;
1121 if (R->pointerBlankDelay > 0) {
1122 struct timeval tp;
1123 1032
1124 (void)gettimeofday(&tp, NULL); 1033 if (Options & Opt_pointerBlank)
1125 R->lastmotion.tv_sec = tp.tv_sec; 1034 pointer_ev.start (NOW + pointerBlankDelay);
1126 R->lastmotion.tv_usec = tp.tv_usec;
1127 }
1128#endif 1035#endif
1129} 1036}
1130 1037
1131#ifdef POINTER_BLANK 1038#ifdef POINTER_BLANK
1132/* INTPROTO */
1133void 1039void
1134rxvt_pointer_blank(pR) 1040rxvt_term::pointer_blank ()
1135{ 1041{
1042 pointer_ev.stop ();
1043
1044 if (!(Options & Opt_pointerBlank))
1045 return;
1046
1136 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137 XFlush(R->Xdisplay); 1048 XFlush (Xdisplay);
1049
1138 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 ();
1139} 1059}
1140#endif 1060#endif
1141 1061
1142/* INTPROTO */ 1062/* INTPROTO */
1143void 1063void
… …
1196 fprintf(stderr, "]: <%d>, %d/%d\n", 1116 fprintf(stderr, "]: <%d>, %d/%d\n",
1197 button_number, 1117 button_number,
1198 x + 1, 1118 x + 1,
1199 y + 1); 1119 y + 1);
1200#else 1120#else
1201 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1121 R->tt_printf("\033[M%c%c%c",
1202 (32 + button_number + key_state), 1122 (32 + button_number + key_state),
1203 (32 + x + 1), 1123 (32 + x + 1),
1204 (32 + y + 1)); 1124 (32 + y + 1));
1205#endif 1125#endif
1206} 1126}
… …
1339 break; 1259 break;
1340 1260
1341 case ClientMessage: 1261 case ClientMessage:
1342 if (ev->xclient.format == 32 1262 if (ev->xclient.format == 32
1343 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1263 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344 exit(EXIT_SUCCESS); 1264 R->destroy ();
1345#ifdef OFFIX_DND 1265#ifdef OFFIX_DND
1346 /* OffiX Dnd (drag 'n' drop) protocol */ 1266 /* OffiX Dnd (drag 'n' drop) protocol */
1347 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1267 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348 && (ev->xclient.data.l[0] == DndFile 1268 && (ev->xclient.data.l[0] == DndFile
1349 || ev->xclient.data.l[0] == DndDir 1269 || ev->xclient.data.l[0] == DndDir
1350 || ev->xclient.data.l[0] == DndLink)) { 1270 || ev->xclient.data.l[0] == DndLink)) {
1351 /* Get Dnd data */ 1271 /* Get Dnd data */
1352 Atom ActualType; 1272 Atom ActualType;
… …
1384 * in the GraphicsExpose parts, which means that after each refresh, 1304 * in the GraphicsExpose parts, which means that after each refresh,
1385 * we need to wait for the graphics expose or Noexpose events, 1305 * we need to wait for the graphics expose or Noexpose events,
1386 * which ought to make things real slow! 1306 * which ought to make things real slow!
1387 */ 1307 */
1388 case VisibilityNotify: 1308 case VisibilityNotify:
1389 switch (ev->xvisibility.state) { 1309 switch (ev->xvisibility.state)
1310 {
1390 case VisibilityUnobscured: 1311 case VisibilityUnobscured:
1391 R->refresh_type = FAST_REFRESH; 1312 R->refresh_type = FAST_REFRESH;
1392 break; 1313 break;
1393 case VisibilityPartiallyObscured: 1314 case VisibilityPartiallyObscured:
1394 R->refresh_type = SLOW_REFRESH; 1315 R->refresh_type = SLOW_REFRESH;
1395 break; 1316 break;
1396 default: 1317 default:
1397 R->refresh_type = NO_REFRESH; 1318 R->refresh_type = NO_REFRESH;
1398 break; 1319 break;
1399 } 1320 }
1400 break; 1321 break;
1401 1322
1402 case FocusIn: 1323 case FocusIn:
1403 if (!R->TermWin.focus) { 1324 if (!R->TermWin.focus) {
1404 R->TermWin.focus = 1; 1325 R->TermWin.focus = 1;
1405 R->want_refresh = 1; 1326 R->want_refresh = 1;
1406#ifdef USE_XIM 1327#ifdef USE_XIM
1407 if (R->Input_Context != NULL) 1328 if (R->Input_Context != NULL)
1408 XSetICFocus(R->Input_Context); 1329 XSetICFocus(R->Input_Context);
1409#endif 1330#endif
1331#ifdef CURSOR_BLINK
1332 if (R->Options & Opt_cursorBlink)
1333 R->blink_ev.start (NOW + BLINK_INTERVAL);
1334#endif
1410 } 1335 }
1411 break; 1336 break;
1412 1337
1413 case FocusOut: 1338 case FocusOut:
1414 if (R->TermWin.focus) { 1339 if (R->TermWin.focus) {
1415 R->TermWin.focus = 0; 1340 R->TermWin.focus = 0;
1416 R->want_refresh = 1; 1341 R->want_refresh = 1;
1417#ifdef USE_XIM 1342#ifdef USE_XIM
1418 if (R->Input_Context != NULL) 1343 if (R->Input_Context != NULL)
1419 XUnsetICFocus(R->Input_Context); 1344 XUnsetICFocus(R->Input_Context);
1345#endif
1346#ifdef CURSOR_BLINK
1347 if (R->Options & Opt_cursorBlink)
1348 R->blink_ev.stop ();
1349 R->hidden_cursor = 0;
1420#endif 1350#endif
1421 } 1351 }
1422 break; 1352 break;
1423 1353
1424 case ConfigureNotify: 1354 case ConfigureNotify:
… …
1537 break; 1467 break;
1538 1468
1539 case MotionNotify: 1469 case MotionNotify:
1540#ifdef POINTER_BLANK 1470#ifdef POINTER_BLANK
1541 if (R->hidden_pointer) 1471 if (R->hidden_pointer)
1542 rxvt_pointer_unblank(aR); 1472 R->pointer_unblank ();
1543#endif 1473#endif
1544#if MENUBAR 1474#if MENUBAR
1545 if (isMenuBarWindow(ev->xany.window)) { 1475 if (isMenuBarWindow(ev->xany.window)) {
1546 rxvt_menubar_control(aR_ &(ev->xbutton)); 1476 rxvt_menubar_control(aR_ &(ev->xbutton));
1547 break; 1477 break;
… …
1738 */ 1668 */
1739 if ((R->scrollBar.style == R_SB_NEXT 1669 if ((R->scrollBar.style == R_SB_NEXT
1740 && scrollbarnext_upButton(ev->y)) 1670 && scrollbarnext_upButton(ev->y))
1741 || (R->scrollBar.style == R_SB_RXVT 1671 || (R->scrollBar.style == R_SB_RXVT
1742 && scrollbarrxvt_upButton(ev->y))) 1672 && scrollbarrxvt_upButton(ev->y)))
1743 rxvt_tt_printf(aR_ "\033[A"); 1673 R->tt_printf("\033[A");
1744 else if ((R->scrollBar.style == R_SB_NEXT 1674 else if ((R->scrollBar.style == R_SB_NEXT
1745 && scrollbarnext_dnButton(ev->y)) 1675 && scrollbarnext_dnButton(ev->y))
1746 || (R->scrollBar.style == R_SB_RXVT 1676 || (R->scrollBar.style == R_SB_RXVT
1747 && scrollbarrxvt_dnButton(ev->y))) 1677 && scrollbarrxvt_dnButton(ev->y)))
1748 rxvt_tt_printf(aR_ "\033[B"); 1678 R->tt_printf("\033[B");
1749 else 1679 else
1750 switch (ev->button) { 1680 switch (ev->button) {
1751 case Button2: 1681 case Button2:
1752 rxvt_tt_printf(aR_ "\014"); 1682 R->tt_printf("\014");
1753 break; 1683 break;
1754 case Button1: 1684 case Button1:
1755 rxvt_tt_printf(aR_ "\033[6~"); 1685 R->tt_printf("\033[6~");
1756 break; 1686 break;
1757 case Button3: 1687 case Button3:
1758 rxvt_tt_printf(aR_ "\033[5~"); 1688 R->tt_printf("\033[5~");
1759 break; 1689 break;
1760 } 1690 }
1761 } 1691 }
1762 else 1692 else
1763#endif /* NO_SCROLLBAR_REPORT */ 1693#endif /* NO_SCROLLBAR_REPORT */
… …
2245rxvt_process_nonprinting(pR_ unsigned char ch) 2175rxvt_process_nonprinting(pR_ unsigned char ch)
2246{ 2176{
2247 switch (ch) { 2177 switch (ch) {
2248 case C0_ENQ: /* terminal Status */ 2178 case C0_ENQ: /* terminal Status */
2249 if (R->rs[Rs_answerbackstring]) 2179 if (R->rs[Rs_answerbackstring])
2250 rxvt_tt_write(aR_ 2180 R->tt_write(
2251 (const unsigned char *)R->rs[Rs_answerbackstring], 2181 (const unsigned char *)R->rs[Rs_answerbackstring],
2252 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2182 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253 else 2183 else
2254 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2184 R->tt_write((unsigned char *)VT100_ANS,
2255 (unsigned int)STRLEN(VT100_ANS)); 2185 (unsigned int)STRLEN(VT100_ANS));
2256 break; 2186 break;
2257 case C0_BEL: /* bell */ 2187 case C0_BEL: /* bell */
2258 rxvt_scr_bell(aR); 2188 rxvt_scr_bell(aR);
2259 break; 2189 break;
… …
2322 row = rxvt_cmd_getc(aR) - ' '; 2252 row = rxvt_cmd_getc(aR) - ' ';
2323 col = rxvt_cmd_getc(aR) - ' '; 2253 col = rxvt_cmd_getc(aR) - ' ';
2324 rxvt_scr_gotorc(aR_ row, col, 0); 2254 rxvt_scr_gotorc(aR_ row, col, 0);
2325 break; 2255 break;
2326 case 'Z': /* identify the terminal type */ 2256 case 'Z': /* identify the terminal type */
2327 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 */
2328 break; 2258 break;
2329 case '<': /* turn off VT52 mode */ 2259 case '<': /* turn off VT52 mode */
2330 PrivMode(0, PrivMode_vt52); 2260 PrivMode(0, PrivMode_vt52);
2331 break; 2261 break;
2332 case 'F': /* use special graphics character set */ 2262 case 'F': /* use special graphics character set */
… …
2439 rxvt_process_dcs_seq(aR); 2369 rxvt_process_dcs_seq(aR);
2440 break; 2370 break;
2441 2371
2442 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2372 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443 case C1_SCI: /* ESC Z */ 2373 case C1_SCI: /* ESC Z */
2444 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2374 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2375 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446 break; /* steal obsolete ESC [ c */ 2376 break; /* steal obsolete ESC [ c */
2447 2377
2448 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2378 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449 case C1_CSI: /* ESC [ */ 2379 case C1_CSI: /* ESC [ */
… …
2570 */ 2500 */
2571 if (priv) { 2501 if (priv) {
2572 switch (priv) { 2502 switch (priv) {
2573 case '>': 2503 case '>':
2574 if (ch == CSI_DA) /* secondary device attributes */ 2504 if (ch == CSI_DA) /* secondary device attributes */
2575 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2505 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576 break; 2506 break;
2577 case '?': 2507 case '?':
2578 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2508 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2509 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580 break; 2510 break;
… …
2687 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2617 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688 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);
2689 break; 2619 break;
2690 2620
2691 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2621 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2622 R->tt_write((const unsigned char *)VT100_ANS,
2693 (unsigned int)(sizeof(VT100_ANS) - 1)); 2623 (unsigned int)(sizeof(VT100_ANS) - 1));
2694 break; 2624 break;
2695 2625
2696 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2626 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697 rxvt_process_sgr_mode(aR_ nargs, arg); 2627 rxvt_process_sgr_mode(aR_ nargs, arg);
2698 break; 2628 break;
2699 2629
2700 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2630 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701 switch (arg[0]) { 2631 switch (arg[0]) {
2702 case 5: /* DSR requested */ 2632 case 5: /* DSR requested */
2703 rxvt_tt_printf(aR_ "\033[0n"); 2633 R->tt_printf("\033[0n");
2704 break; 2634 break;
2705 case 6: /* CPR requested */ 2635 case 6: /* CPR requested */
2706 rxvt_scr_report_position(aR); 2636 rxvt_scr_report_position(aR);
2707 break; 2637 break;
2708#if defined (ENABLE_DISPLAY_ANSWER) 2638#if defined (ENABLE_DISPLAY_ANSWER)
2709 case 7: /* unofficial extension */ 2639 case 7: /* unofficial extension */
2710 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2640 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711 break; 2641 break;
2712#endif 2642#endif
2713 case 8: /* unofficial extension */ 2643 case 8: /* unofficial extension */
2714 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2644 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715 break; 2645 break;
… …
2784 break; 2714 break;
2785#endif 2715#endif
2786 2716
2787 case CSI_78: /* DECREQTPARM */ 2717 case CSI_78: /* DECREQTPARM */
2788 if (arg[0] == 0 || arg[0] == 1) 2718 if (arg[0] == 0 || arg[0] == 1)
2789 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);
2790 /* FALLTHROUGH */ 2720 /* FALLTHROUGH */
2791 2721
2792 default: 2722 default:
2793 break; 2723 break;
2794 } 2724 }
… …
2848 /* 2778 /*
2849 * reports - some output format copied from XTerm 2779 * reports - some output format copied from XTerm
2850 */ 2780 */
2851 case 11: /* report window state */ 2781 case 11: /* report window state */
2852 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2782 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2783 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854 break; 2784 break;
2855 case 13: /* report window position */ 2785 case 13: /* report window position */
2856 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2786 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2787 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858 -wattr.border_width, -wattr.border_width, 2788 -wattr.border_width, -wattr.border_width,
2859 &x, &y, &wdummy); 2789 &x, &y, &wdummy);
2860 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2790 R->tt_printf("\033[3;%d;%dt", x, y);
2861 break; 2791 break;
2862 case 14: /* report window size (pixels) */ 2792 case 14: /* report window size (pixels) */
2863 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2794 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865 break; 2795 break;
2866 case 18: /* report window size (chars) */ 2796 case 18: /* report window size (chars) */
2867 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);
2868 break; 2798 break;
2869#if 0 /* XXX: currently disabled due to security concerns */ 2799#if 0 /* XXX: currently disabled due to security concerns */
2870 case 20: /* report icon label */ 2800 case 20: /* report icon label */
2871 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2801 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2802 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873 break; 2803 break;
2874 case 21: /* report window title */ 2804 case 21: /* report window title */
2875 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2805 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2806 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877 break; 2807 break;
2878#endif 2808#endif
2879 } 2809 }
2880} 2810}
2881#endif 2811#endif
… …
3424{ 3354{
3425 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3355 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426 3356
3427#ifndef RXVT_GRAPHICS 3357#ifndef RXVT_GRAPHICS
3428 if (cmd == 'Q') { /* query graphics */ 3358 if (cmd == 'Q') { /* query graphics */
3429 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3359 R->tt_printf("\033G0\n"); /* no graphics */
3430 return; 3360 return;
3431 } 3361 }
3432/* swallow other graphics sequences until terminating ':' */ 3362/* swallow other graphics sequences until terminating ':' */
3433 do 3363 do
3434 ch = rxvt_cmd_getc(aR); 3364 ch = rxvt_cmd_getc(aR);
… …
3437 unsigned int nargs; 3367 unsigned int nargs;
3438 int args[NGRX_PTS]; 3368 int args[NGRX_PTS];
3439 unsigned char *text = NULL; 3369 unsigned char *text = NULL;
3440 3370
3441 if (cmd == 'Q') { /* query graphics */ 3371 if (cmd == 'Q') { /* query graphics */
3442 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3372 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443 return; 3373 return;
3444 } 3374 }
3445 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3375 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446 int neg; 3376 int neg;
3447 3377
… …
3481 3411
3482/* 3412/*
3483 * Send printf() formatted output to the command. 3413 * Send printf() formatted output to the command.
3484 * Only use for small amounts of data. 3414 * Only use for small amounts of data.
3485 */ 3415 */
3486/* EXTPROTO */
3487void 3416void
3488rxvt_tt_printf(pR_ const char *fmt,...) 3417rxvt_term::tt_printf (const char *fmt,...)
3489{ 3418{
3490 va_list arg_ptr; 3419 va_list arg_ptr;
3491 unsigned char buf[256]; 3420 unsigned char buf[256];
3492 3421
3493 va_start(arg_ptr, fmt); 3422 va_start (arg_ptr, fmt);
3494 vsprintf((char *)buf, fmt, arg_ptr); 3423 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495 va_end(arg_ptr); 3424 va_end (arg_ptr);
3496 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3425 tt_write (buf, STRLEN (buf));
3497} 3426}
3498 3427
3499/* ---------------------------------------------------------------------- */ 3428/* ---------------------------------------------------------------------- */
3500/* Addresses pasting large amounts of data and rxvt hang
3501 * code pinched from xterm (v_write()) and applied originally to
3502 * rxvt-2.18 - Hops
3503 * 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,
3504 * or generated by us in response to a query ESC sequence. 3430 * or generated by us in response to a query ESC sequence.
3505 */ 3431 */
3506/* EXTPROTO */
3507void 3432void
3508rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3433rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 3434{
3510#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3435 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3511 int riten;
3512 unsigned int p;
3513 unsigned char *v_buffer, /* start of physical buffer */
3514 *v_bufstr, /* start of current buffer pending */
3515 *v_bufptr, /* end of current buffer pending */
3516 *v_bufend; /* end of physical buffer */
3517 3436
3518 if (R->v_bufstr == NULL && len > 0) { 3437 if (len)
3519 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3521 v_bufend = v_buffer + p;
3522 } else {
3523 v_buffer = R->v_buffer;
3524 v_bufstr = R->v_bufstr;
3525 v_bufptr = R->v_bufptr;
3526 v_bufend = R->v_bufend;
3527 } 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;
3528 3444
3529 /* 3445 data += written;
3530 * Append to the block we already have. Always doing this simplifies the 3446 len -= written;
3531 * code, and isn't too bad, either. If this is a short block, it isn't 3447 }
3532 * too expensive, and if this is a long block, we won't be able to write 3448
3533 * it all anyway. 3449
3534 */ 3450 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535 if (len > 0) { 3451
3536 if (v_bufend < v_bufptr + len) { /* run out of room */ 3452 memcpy (v_buffer + v_buflen, data, len);
3537 if (v_bufstr != v_buffer) { 3453 v_buflen += len;
3538 /* there is unused space, move everything down */
3539 MEMMOVE(v_buffer, v_bufstr,
3540 (unsigned int)(v_bufptr - v_bufstr));
3541 v_bufptr -= v_bufstr - v_buffer;
3542 v_bufstr = v_buffer;
3543 } 3454 }
3544 if (v_bufend < v_bufptr + len) {
3545 /* still won't fit: get more space */
3546 /* use most basic realloc because an error is not fatal. */
3547 unsigned int size = v_bufptr - v_buffer;
3548 unsigned int reallocto;
3549 3455
3550 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3456 for (;;)
3551 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3457 {
3552 /* save across realloc */ 3458 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553 if (v_buffer) { 3459
3554 v_bufstr = v_buffer; 3460 if (written > 0)
3555 v_bufptr = v_buffer + size; 3461 {
3556 v_bufend = v_buffer + reallocto; 3462 v_buflen -= written;
3557 } else { /* no memory: ignore entire write request */ 3463
3558 rxvt_print_error("data loss: cannot allocate buffer space"); 3464 if (v_buflen == 0)
3559 v_buffer = v_bufstr; /* restore clobbered pointer */ 3465 {
3560 } 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 }
3561 } 3484 }
3562 }
3563 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3564 MEMCPY(v_bufptr, d, len);
3565 v_bufptr += len;
3566 }
3567 }
3568
3569 /*
3570 * Write out as much of the buffer as we can.
3571 * Be careful not to overflow the pty's input silo.
3572 * We are conservative here and only write a small amount at a time.
3573 *
3574 * If we can't push all the data into the pty yet, we expect write
3575 * to return a non-negative number less than the length requested
3576 * (if some data written) or -1 and set errno to EAGAIN,
3577 * EWOULDBLOCK, or EINTR (if no data written).
3578 *
3579 * (Not all systems do this, sigh, so the code is actually
3580 * a little more forgiving.)
3581 */
3582 if ((p = v_bufptr - v_bufstr) > 0) {
3583 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3584 if (riten < 0)
3585 riten = 0;
3586 v_bufstr += riten;
3587 if (v_bufstr >= v_bufptr) /* we wrote it all */
3588 v_bufstr = v_bufptr = v_buffer;
3589 }
3590 /*
3591 * If we have lots of unused memory allocated, return it
3592 */
3593 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3594 /* save pointers across realloc */
3595 unsigned int start = v_bufstr - v_buffer;
3596 unsigned int size = v_bufptr - v_buffer;
3597 unsigned int reallocto;
3598
3599 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3600 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3601 if (v_buffer) {
3602 v_bufstr = v_buffer + start;
3603 v_bufptr = v_buffer + size;
3604 v_bufend = v_buffer + reallocto;
3605 } else {
3606 /* should we print a warning if couldn't return memory? */
3607 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3608 }
3609 }
3610 R->v_buffer = v_buffer;
3611 R->v_bufstr = v_bufstr;
3612 R->v_bufptr = v_bufptr;
3613 R->v_bufend = v_bufend;
3614} 3485}
3486
3615/*----------------------- end-of-file (C source) -----------------------*/ 3487/*----------------------- end-of-file (C source) -----------------------*/
3616 3488

Diff Legend

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