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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.13 by pcg, Fri Dec 5 04:27:20 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.6 2003/11/25 17:11:33 pcg Exp $ 4 * $Id: command.C,v 1.13 2003/12/05 04:27:20 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() */
… …
654 R->cmdbuf_ptr = cmdbuf_ptr; 654 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->cmdbuf_endp = cmdbuf_endp; 655 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 656 return 0;
657} 657}
658#endif /* MENUBAR_MAX */ 658#endif /* MENUBAR_MAX */
659
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}
659 696
660void 697void
661rxvt_term::process_x_events () 698rxvt_term::process_x_events ()
662{ 699{
663 do 700 do
… …
704} 741}
705 742
706void 743void
707rxvt_term::blink_cb (time_watcher &w) 744rxvt_term::blink_cb (time_watcher &w)
708{ 745{
746 SET_R (this);
747
709 w.at += BLINK_INTERVAL; 748 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 749 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 750 want_refresh = 1;
712 flush();
713} 751}
714 752
715void 753void
716rxvt_term::x_cb (io_watcher &w, short revents) 754rxvt_term::x_cb (io_watcher &w, short revents)
717{ 755{
756 SET_R (this);
757
718 process_x_events (); 758 process_x_events ();
759}
719 760
720 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 destroy ();
779
780 return false;
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 {
792 bool flag = true;
793
794 // loop, but don't allow a single term to monopolize us
795 // the number of loops is fully arbitrary, and thus wrong
796 while (flag && pty_fill ())
797 {
798 if (!seen_input)
799 {
800 seen_input = 1;
801 /* once we know the shell is running, send the screen size. Again! */
802 tt_winch ();
803 }
804
805 uint32_t ch = NOCHAR;
806
807 for (;;)
808 {
809 if (ch == NOCHAR)
810 ch = next_char ();
811
812 if (ch == NOCHAR) // TODO: improve
813 break;
814
815 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
816 {
817 /* Read a text string from the input buffer */
818 uint32_t buf[BUFSIZ];
819 bool refreshnow = false;
820 int nlines = 0;
821 uint32_t *str = buf;
822
823 *str++ = ch;
824
825 for (;;)
826 {
827 ch = next_char ();
828
829 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
830 break;
831 else
832 {
833 *str++ = ch;
834
835 if (ch == '\n')
836 {
837 nlines++;
838 refresh_count++;
839
840 if (!(Options & Opt_jumpScroll)
841 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
842 {
843 refreshnow = true;
844 flag = false;
845 ch = NOCHAR;
846 break;
847 }
848 }
849
850 if (str >= buf + BUFSIZ)
851 {
852 ch = NOCHAR;
853 break;
854 }
855 }
856 }
857
858 rxvt_scr_add_lines (this, buf, nlines, str - buf);
859
860 /*
861 * If there have been a lot of new lines, then update the screen
862 * What the heck I'll cheat and only refresh less than every page-full.
863 * the number of pages between refreshes is refresh_limit, which
864 * is incremented here because we must be doing flat-out scrolling.
865 *
866 * refreshing should be correct for small scrolls, because of the
867 * time-out
868 */
869 if (refreshnow)
870 {
871 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
872 refresh_limit++;
873
874 rxvt_scr_refresh (this, refresh_type);
875 }
876
877 }
878 else
879 {
880 switch (ch)
881 {
882 default:
883 rxvt_process_nonprinting (this, ch);
884 break;
885 case C0_ESC: /* escape char */
886 rxvt_process_escape_seq (this);
887 break;
888 /*case 0x9b: */ /* CSI */
889 /* rxvt_process_csi_seq (this); */
890 }
891
892 ch = NOCHAR;
893 }
894 }
895 }
896 }
721} 897}
722 898
723// read the next character, currently handles UTF-8 899// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future 900// will probably handle all sorts of other stuff in the future
725uint32_t 901uint32_t
… …
773 } 949 }
774 950
775 return NOCHAR; 951 return NOCHAR;
776} 952}
777 953
778bool
779rxvt_term::pty_fill (size_t count)
780{
781 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
782
783 memmove (cmdbuf_base, cmdbuf_ptr, n);
784 cmdbuf_ptr = cmdbuf_base;
785 cmdbuf_endp = cmdbuf_ptr + n;
786
787 n = read (cmd_fd, cmdbuf_endp, count);
788
789 if (n > 0)
790 {
791 cmdbuf_endp += n;
792 return true;
793 }
794 else if (n < 0 && errno == EAGAIN)
795 return false;
796
797 rxvt_clean_exit();
798 exit(EXIT_FAILURE); /* bad order of events? */
799}
800
801void
802rxvt_term::pty_cb (io_watcher &w, short revents)
803{
804 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
805 {
806 /* once we know the shell is running, send the screen size. Again! */
807 //ch = rxvt_cmd_getc(aR); /* wait for something */
808 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
809
810 uint32_t ch = NOCHAR;
811
812 for (;;)
813 {
814 if (ch == NOCHAR)
815 ch = next_char ();
816
817 if (ch == NOCHAR) // TODO: improve
818 break;
819
820 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
821 {
822 /* Read a text string from the input buffer */
823 uint32_t buf[BUFSIZ];
824 bool refreshnow = false;
825 int nlines = 0;
826 uint32_t *str = buf;
827
828 *str++ = ch;
829
830 for (;;)
831 {
832 ch = next_char ();
833
834 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
835 break;
836 else
837 {
838 *str++ = ch;
839
840 if (ch == '\n')
841 {
842 nlines++;
843 refresh_count++;
844
845 if (!(Options & Opt_jumpScroll)
846 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
847 {
848 refreshnow = true;
849 ch = NOCHAR;
850 break;
851 }
852 }
853
854 if (str >= buf + BUFSIZ)
855 {
856 ch = NOCHAR;
857 break;
858 }
859 }
860 }
861
862 rxvt_scr_add_lines (this, buf, nlines, str - buf);
863
864 /*
865 * If there have been a lot of new lines, then update the screen
866 * What the heck I'll cheat and only refresh less than every page-full.
867 * the number of pages between refreshes is refresh_limit, which
868 * is incremented here because we must be doing flat-out scrolling.
869 *
870 * refreshing should be correct for small scrolls, because of the
871 * time-out
872 */
873 if (refreshnow)
874 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++;
877
878 rxvt_scr_refresh (this, refresh_type);
879 }
880
881 }
882 else
883 {
884 switch (ch)
885 {
886 default:
887 rxvt_process_nonprinting (this, ch);
888 break;
889 case C0_ESC: /* escape char */
890 rxvt_process_escape_seq (this);
891 break;
892 /*case 0x9b: */ /* CSI */
893 /* rxvt_process_csi_seq (this); */
894 }
895
896 ch = NOCHAR;
897 }
898 }
899 }
900
901 flush ();
902}
903
904void
905rxvt_term::flush ()
906{
907#ifdef TRANSPARENT
908 if (want_full_refresh)
909 {
910 want_full_refresh = 0;
911 rxvt_scr_clear (this);
912 rxvt_scr_touch (this, False);
913 want_refresh = 1;
914 }
915#endif
916
917 if (want_refresh)
918 {
919 rxvt_scr_refresh (this, refresh_type);
920 rxvt_scrollbar_show (this, 1);
921#ifdef USE_XIM
922 rxvt_IMSendSpot (this);
923#endif
924 }
925
926 XFlush (Xdisplay);
927}
928
929/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
930/* 955/*
931 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
932 * to the command. 957 * to the command.
933 */ 958 */
… …
942 return c; 967 return c;
943 968
944 // incomplete sequences should occur rarely, still, a better solution 969 // incomplete sequences should occur rarely, still, a better solution
945 // would be preferred. either setjmp/longjmp or better design. 970 // would be preferred. either setjmp/longjmp or better design.
946 fcntl (R->cmd_fd, F_SETFL, 0); 971 fcntl (R->cmd_fd, F_SETFL, 0);
947 R->pty_fill (1); 972 R->pty_fill ();
948 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
949 } 974 }
950 975
951#if 0 976#if 0
952#define TIMEOUT_USEC 5000 977#define TIMEOUT_USEC 5000
… …
960 985
961 for (;;) { 986 for (;;) {
962 /* loop until we can return something */ 987 /* loop until we can return something */
963 988
964 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
965 rxvt_tt_write(aR_ NULL, 0); 990 R->tt_write(NULL, 0);
966 991
967#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
968 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
969 quick_timeout = 1; 994 quick_timeout = 1;
970 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
… …
1006 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1007#endif 1032#endif
1008#endif 1033#endif
1009} 1034}
1010 1035
1036void
1037rxvt_term::pointer_unblank ()
1038{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1040 rxvt_recolour_cursor (this);
1041
1042#ifdef POINTER_BLANK
1043 hidden_pointer = 0;
1044
1045 if (Options & Opt_pointerBlank)
1046 pointer_ev.start (NOW + pointerBlankDelay);
1047#endif
1048}
1049
1011#ifdef POINTER_BLANK 1050#ifdef POINTER_BLANK
1012void 1051void
1013rxvt_term::pointer_unblank () 1052rxvt_term::pointer_blank ()
1014{ 1053{
1054 pointer_ev.stop ();
1055
1015 if (!(Options & Opt_pointerBlank)) 1056 if (!(Options & Opt_pointerBlank))
1016 return; 1057 return;
1017 1058
1018 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1019 rxvt_recolour_cursor (this);
1020 hidden_pointer = 0;
1021
1022 pointer_ev.start (NOW + pointerBlankDelay);
1023}
1024
1025void
1026rxvt_term::pointer_blank ()
1027{
1028 pointer_ev.stop ();
1029
1030 if (!(Options & Opt_pointerBlank))
1031 return;
1032
1033 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1059 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1034 XFlush (Xdisplay); 1060 XFlush (Xdisplay);
1035 1061
1036 hidden_pointer = 1; 1062 hidden_pointer = 1;
1037} 1063}
1038 1064
1039void 1065void
1040rxvt_term::pointer_cb (time_watcher &w) 1066rxvt_term::pointer_cb (time_watcher &w)
1041{ 1067{
1068 SET_R (this);
1069
1042 pointer_blank (); 1070 pointer_blank ();
1043} 1071}
1044#endif 1072#endif
1045 1073
1046/* INTPROTO */ 1074/* INTPROTO */
… …
1100 fprintf(stderr, "]: <%d>, %d/%d\n", 1128 fprintf(stderr, "]: <%d>, %d/%d\n",
1101 button_number, 1129 button_number,
1102 x + 1, 1130 x + 1,
1103 y + 1); 1131 y + 1);
1104#else 1132#else
1105 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1133 R->tt_printf("\033[M%c%c%c",
1106 (32 + button_number + key_state), 1134 (32 + button_number + key_state),
1107 (32 + x + 1), 1135 (32 + x + 1),
1108 (32 + y + 1)); 1136 (32 + y + 1));
1109#endif 1137#endif
1110} 1138}
… …
1243 break; 1271 break;
1244 1272
1245 case ClientMessage: 1273 case ClientMessage:
1246 if (ev->xclient.format == 32 1274 if (ev->xclient.format == 32
1247 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1275 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1248 exit(EXIT_SUCCESS); 1276 R->destroy ();
1249#ifdef OFFIX_DND 1277#ifdef OFFIX_DND
1250 /* OffiX Dnd (drag 'n' drop) protocol */ 1278 /* OffiX Dnd (drag 'n' drop) protocol */
1251 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1279 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1252 && (ev->xclient.data.l[0] == DndFile 1280 && (ev->xclient.data.l[0] == DndFile
1253 || ev->xclient.data.l[0] == DndDir 1281 || ev->xclient.data.l[0] == DndDir
1254 || ev->xclient.data.l[0] == DndLink)) { 1282 || ev->xclient.data.l[0] == DndLink)) {
1255 /* Get Dnd data */ 1283 /* Get Dnd data */
1256 Atom ActualType; 1284 Atom ActualType;
… …
1288 * in the GraphicsExpose parts, which means that after each refresh, 1316 * in the GraphicsExpose parts, which means that after each refresh,
1289 * we need to wait for the graphics expose or Noexpose events, 1317 * we need to wait for the graphics expose or Noexpose events,
1290 * which ought to make things real slow! 1318 * which ought to make things real slow!
1291 */ 1319 */
1292 case VisibilityNotify: 1320 case VisibilityNotify:
1293 switch (ev->xvisibility.state) { 1321 switch (ev->xvisibility.state)
1322 {
1294 case VisibilityUnobscured: 1323 case VisibilityUnobscured:
1295 R->refresh_type = FAST_REFRESH; 1324 R->refresh_type = FAST_REFRESH;
1296 break; 1325 break;
1297 case VisibilityPartiallyObscured: 1326 case VisibilityPartiallyObscured:
1298 R->refresh_type = SLOW_REFRESH; 1327 R->refresh_type = SLOW_REFRESH;
1299 break; 1328 break;
1300 default: 1329 default:
1301 R->refresh_type = NO_REFRESH; 1330 R->refresh_type = NO_REFRESH;
1302 break; 1331 break;
1303 } 1332 }
1304 break; 1333 break;
1305 1334
1306 case FocusIn: 1335 case FocusIn:
1307 if (!R->TermWin.focus) { 1336 if (!R->TermWin.focus) {
1308 R->TermWin.focus = 1; 1337 R->TermWin.focus = 1;
… …
1651 */ 1680 */
1652 if ((R->scrollBar.style == R_SB_NEXT 1681 if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_upButton(ev->y)) 1682 && scrollbarnext_upButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT 1683 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_upButton(ev->y))) 1684 && scrollbarrxvt_upButton(ev->y)))
1656 rxvt_tt_printf(aR_ "\033[A"); 1685 R->tt_printf("\033[A");
1657 else if ((R->scrollBar.style == R_SB_NEXT 1686 else if ((R->scrollBar.style == R_SB_NEXT
1658 && scrollbarnext_dnButton(ev->y)) 1687 && scrollbarnext_dnButton(ev->y))
1659 || (R->scrollBar.style == R_SB_RXVT 1688 || (R->scrollBar.style == R_SB_RXVT
1660 && scrollbarrxvt_dnButton(ev->y))) 1689 && scrollbarrxvt_dnButton(ev->y)))
1661 rxvt_tt_printf(aR_ "\033[B"); 1690 R->tt_printf("\033[B");
1662 else 1691 else
1663 switch (ev->button) { 1692 switch (ev->button) {
1664 case Button2: 1693 case Button2:
1665 rxvt_tt_printf(aR_ "\014"); 1694 R->tt_printf("\014");
1666 break; 1695 break;
1667 case Button1: 1696 case Button1:
1668 rxvt_tt_printf(aR_ "\033[6~"); 1697 R->tt_printf("\033[6~");
1669 break; 1698 break;
1670 case Button3: 1699 case Button3:
1671 rxvt_tt_printf(aR_ "\033[5~"); 1700 R->tt_printf("\033[5~");
1672 break; 1701 break;
1673 } 1702 }
1674 } 1703 }
1675 else 1704 else
1676#endif /* NO_SCROLLBAR_REPORT */ 1705#endif /* NO_SCROLLBAR_REPORT */
… …
2077 return stream; 2106 return stream;
2078} 2107}
2079 2108
2080/* EXTPROTO */ 2109/* EXTPROTO */
2081int 2110int
2082rxvt_pclose_printer(FILE *stream) 2111rxvt_pclose_printer (FILE *stream)
2083{ 2112{
2084 fflush(stream); 2113 fflush (stream);
2085/* pclose() reported not to work on SunOS 4.1.3 */ 2114/* pclose() reported not to work on SunOS 4.1.3 */
2086# if defined (__sun__) /* TODO: RESOLVE THIS */ 2115# if defined (__sun__) /* TODO: RESOLVE THIS */
2087/* pclose works provided SIGCHLD handler uses waitpid */ 2116/* pclose works provided SIGCHLD handler uses waitpid */
2088 return pclose(stream); /* return fclose (stream); */ 2117 return pclose (stream); /* return fclose (stream); */
2089# else 2118# else
2090 return pclose(stream); 2119 return pclose (stream);
2091# endif 2120# endif
2092} 2121}
2093 2122
2094/* 2123/*
2095 * simulate attached vt100 printer 2124 * simulate attached vt100 printer
… …
2158rxvt_process_nonprinting(pR_ unsigned char ch) 2187rxvt_process_nonprinting(pR_ unsigned char ch)
2159{ 2188{
2160 switch (ch) { 2189 switch (ch) {
2161 case C0_ENQ: /* terminal Status */ 2190 case C0_ENQ: /* terminal Status */
2162 if (R->rs[Rs_answerbackstring]) 2191 if (R->rs[Rs_answerbackstring])
2163 rxvt_tt_write(aR_ 2192 R->tt_write(
2164 (const unsigned char *)R->rs[Rs_answerbackstring], 2193 (const unsigned char *)R->rs[Rs_answerbackstring],
2165 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2194 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2166 else 2195 else
2167 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2196 R->tt_write((unsigned char *)VT100_ANS,
2168 (unsigned int)STRLEN(VT100_ANS)); 2197 (unsigned int)STRLEN(VT100_ANS));
2169 break; 2198 break;
2170 case C0_BEL: /* bell */ 2199 case C0_BEL: /* bell */
2171 rxvt_scr_bell(aR); 2200 rxvt_scr_bell(aR);
2172 break; 2201 break;
… …
2235 row = rxvt_cmd_getc(aR) - ' '; 2264 row = rxvt_cmd_getc(aR) - ' ';
2236 col = rxvt_cmd_getc(aR) - ' '; 2265 col = rxvt_cmd_getc(aR) - ' ';
2237 rxvt_scr_gotorc(aR_ row, col, 0); 2266 rxvt_scr_gotorc(aR_ row, col, 0);
2238 break; 2267 break;
2239 case 'Z': /* identify the terminal type */ 2268 case 'Z': /* identify the terminal type */
2240 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2269 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2241 break; 2270 break;
2242 case '<': /* turn off VT52 mode */ 2271 case '<': /* turn off VT52 mode */
2243 PrivMode(0, PrivMode_vt52); 2272 PrivMode(0, PrivMode_vt52);
2244 break; 2273 break;
2245 case 'F': /* use special graphics character set */ 2274 case 'F': /* use special graphics character set */
… …
2352 rxvt_process_dcs_seq(aR); 2381 rxvt_process_dcs_seq(aR);
2353 break; 2382 break;
2354 2383
2355 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2384 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2356 case C1_SCI: /* ESC Z */ 2385 case C1_SCI: /* ESC Z */
2357 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2386 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2358 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2387 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2359 break; /* steal obsolete ESC [ c */ 2388 break; /* steal obsolete ESC [ c */
2360 2389
2361 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2390 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2362 case C1_CSI: /* ESC [ */ 2391 case C1_CSI: /* ESC [ */
… …
2483 */ 2512 */
2484 if (priv) { 2513 if (priv) {
2485 switch (priv) { 2514 switch (priv) {
2486 case '>': 2515 case '>':
2487 if (ch == CSI_DA) /* secondary device attributes */ 2516 if (ch == CSI_DA) /* secondary device attributes */
2488 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2517 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2489 break; 2518 break;
2490 case '?': 2519 case '?':
2491 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2520 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2492 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2521 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2493 break; 2522 break;
… …
2600 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2601 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2630 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2602 break; 2631 break;
2603 2632
2604 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2605 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2634 R->tt_write((const unsigned char *)VT100_ANS,
2606 (unsigned int)(sizeof(VT100_ANS) - 1)); 2635 (unsigned int)(sizeof(VT100_ANS) - 1));
2607 break; 2636 break;
2608 2637
2609 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2610 rxvt_process_sgr_mode(aR_ nargs, arg); 2639 rxvt_process_sgr_mode(aR_ nargs, arg);
2611 break; 2640 break;
2612 2641
2613 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2642 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2614 switch (arg[0]) { 2643 switch (arg[0]) {
2615 case 5: /* DSR requested */ 2644 case 5: /* DSR requested */
2616 rxvt_tt_printf(aR_ "\033[0n"); 2645 R->tt_printf("\033[0n");
2617 break; 2646 break;
2618 case 6: /* CPR requested */ 2647 case 6: /* CPR requested */
2619 rxvt_scr_report_position(aR); 2648 rxvt_scr_report_position(aR);
2620 break; 2649 break;
2621#if defined (ENABLE_DISPLAY_ANSWER) 2650#if defined (ENABLE_DISPLAY_ANSWER)
2622 case 7: /* unofficial extension */ 2651 case 7: /* unofficial extension */
2623 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2652 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2624 break; 2653 break;
2625#endif 2654#endif
2626 case 8: /* unofficial extension */ 2655 case 8: /* unofficial extension */
2627 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2656 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2628 break; 2657 break;
… …
2697 break; 2726 break;
2698#endif 2727#endif
2699 2728
2700 case CSI_78: /* DECREQTPARM */ 2729 case CSI_78: /* DECREQTPARM */
2701 if (arg[0] == 0 || arg[0] == 1) 2730 if (arg[0] == 0 || arg[0] == 1)
2702 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2731 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2703 /* FALLTHROUGH */ 2732 /* FALLTHROUGH */
2704 2733
2705 default: 2734 default:
2706 break; 2735 break;
2707 } 2736 }
… …
2761 /* 2790 /*
2762 * reports - some output format copied from XTerm 2791 * reports - some output format copied from XTerm
2763 */ 2792 */
2764 case 11: /* report window state */ 2793 case 11: /* report window state */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2794 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2766 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2795 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2767 break; 2796 break;
2768 case 13: /* report window position */ 2797 case 13: /* report window position */
2769 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2798 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2770 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2799 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2771 -wattr.border_width, -wattr.border_width, 2800 -wattr.border_width, -wattr.border_width,
2772 &x, &y, &wdummy); 2801 &x, &y, &wdummy);
2773 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2802 R->tt_printf("\033[3;%d;%dt", x, y);
2774 break; 2803 break;
2775 case 14: /* report window size (pixels) */ 2804 case 14: /* report window size (pixels) */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2805 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2777 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2806 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2778 break; 2807 break;
2779 case 18: /* report window size (chars) */ 2808 case 18: /* report window size (chars) */
2780 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2809 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2781 break; 2810 break;
2782#if 0 /* XXX: currently disabled due to security concerns */ 2811#if 0 /* XXX: currently disabled due to security concerns */
2783 case 20: /* report icon label */ 2812 case 20: /* report icon label */
2784 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2813 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2785 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2814 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2815 break;
2787 case 21: /* report window title */ 2816 case 21: /* report window title */
2788 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2817 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2789 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2818 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2790 break; 2819 break;
2791#endif 2820#endif
2792 } 2821 }
2793} 2822}
2794#endif 2823#endif
… …
3337{ 3366{
3338 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3367 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3339 3368
3340#ifndef RXVT_GRAPHICS 3369#ifndef RXVT_GRAPHICS
3341 if (cmd == 'Q') { /* query graphics */ 3370 if (cmd == 'Q') { /* query graphics */
3342 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3371 R->tt_printf("\033G0\n"); /* no graphics */
3343 return; 3372 return;
3344 } 3373 }
3345/* swallow other graphics sequences until terminating ':' */ 3374/* swallow other graphics sequences until terminating ':' */
3346 do 3375 do
3347 ch = rxvt_cmd_getc(aR); 3376 ch = rxvt_cmd_getc(aR);
… …
3350 unsigned int nargs; 3379 unsigned int nargs;
3351 int args[NGRX_PTS]; 3380 int args[NGRX_PTS];
3352 unsigned char *text = NULL; 3381 unsigned char *text = NULL;
3353 3382
3354 if (cmd == 'Q') { /* query graphics */ 3383 if (cmd == 'Q') { /* query graphics */
3355 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3384 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3356 return; 3385 return;
3357 } 3386 }
3358 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3387 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3359 int neg; 3388 int neg;
3360 3389
… …
3394 3423
3395/* 3424/*
3396 * Send printf() formatted output to the command. 3425 * Send printf() formatted output to the command.
3397 * Only use for small amounts of data. 3426 * Only use for small amounts of data.
3398 */ 3427 */
3399/* EXTPROTO */
3400void 3428void
3401rxvt_tt_printf(pR_ const char *fmt,...) 3429rxvt_term::tt_printf (const char *fmt,...)
3402{ 3430{
3403 va_list arg_ptr; 3431 va_list arg_ptr;
3404 unsigned char buf[256]; 3432 unsigned char buf[256];
3405 3433
3406 va_start(arg_ptr, fmt); 3434 va_start (arg_ptr, fmt);
3407 vsprintf((char *)buf, fmt, arg_ptr); 3435 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3408 va_end(arg_ptr); 3436 va_end (arg_ptr);
3409 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3437 tt_write (buf, STRLEN (buf));
3410} 3438}
3411 3439
3412/* ---------------------------------------------------------------------- */ 3440/* ---------------------------------------------------------------------- */
3413/* Addresses pasting large amounts of data and rxvt hang
3414 * code pinched from xterm (v_write()) and applied originally to
3415 * rxvt-2.18 - Hops
3416 * Write data to the pty as typed by the user, pasted with the mouse, 3441/* Write data to the pty as typed by the user, pasted with the mouse,
3417 * or generated by us in response to a query ESC sequence. 3442 * or generated by us in response to a query ESC sequence.
3418 */ 3443 */
3419/* EXTPROTO */
3420void 3444void
3421rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3445rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3422{ 3446{
3423#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3447 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3424 int riten;
3425 unsigned int p;
3426 unsigned char *v_buffer, /* start of physical buffer */
3427 *v_bufstr, /* start of current buffer pending */
3428 *v_bufptr, /* end of current buffer pending */
3429 *v_bufend; /* end of physical buffer */
3430 3448
3431 if (R->v_bufstr == NULL && len > 0) { 3449 if (len)
3432 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3433 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3434 v_bufend = v_buffer + p;
3435 } else {
3436 v_buffer = R->v_buffer;
3437 v_bufstr = R->v_bufstr;
3438 v_bufptr = R->v_bufptr;
3439 v_bufend = R->v_bufend;
3440 } 3450 {
3451 if (v_buflen == 0)
3452 {
3453 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3454 if (written == len)
3455 return;
3441 3456
3442 /* 3457 data += written;
3443 * Append to the block we already have. Always doing this simplifies the 3458 len -= written;
3444 * code, and isn't too bad, either. If this is a short block, it isn't 3459 }
3445 * too expensive, and if this is a long block, we won't be able to write 3460
3446 * it all anyway. 3461
3447 */ 3462 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3448 if (len > 0) { 3463
3449 if (v_bufend < v_bufptr + len) { /* run out of room */ 3464 memcpy (v_buffer + v_buflen, data, len);
3450 if (v_bufstr != v_buffer) { 3465 v_buflen += len;
3451 /* there is unused space, move everything down */
3452 MEMMOVE(v_buffer, v_bufstr,
3453 (unsigned int)(v_bufptr - v_bufstr));
3454 v_bufptr -= v_bufstr - v_buffer;
3455 v_bufstr = v_buffer;
3456 } 3466 }
3457 if (v_bufend < v_bufptr + len) {
3458 /* still won't fit: get more space */
3459 /* use most basic realloc because an error is not fatal. */
3460 unsigned int size = v_bufptr - v_buffer;
3461 unsigned int reallocto;
3462 3467
3463 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3468 for (;;)
3464 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3469 {
3465 /* save across realloc */ 3470 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3466 if (v_buffer) { 3471
3467 v_bufstr = v_buffer; 3472 if (written > 0)
3468 v_bufptr = v_buffer + size; 3473 {
3469 v_bufend = v_buffer + reallocto; 3474 v_buflen -= written;
3470 } else { /* no memory: ignore entire write request */ 3475
3471 rxvt_print_error("data loss: cannot allocate buffer space"); 3476 if (v_buflen == 0)
3472 v_buffer = v_bufstr; /* restore clobbered pointer */ 3477 {
3473 } 3478 free (v_buffer);
3479 v_buffer = 0;
3480 v_buflen = 0;
3481
3482 pty_ev.set (EVENT_READ);
3483 return;
3484 }
3485
3486 memmove (v_buffer, v_buffer + written, v_buflen);
3487 }
3488 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3489 // original code just ignores this...
3490 destroy ();
3491 else
3492 {
3493 pty_ev.set (EVENT_READ | EVENT_WRITE);
3494 return;
3495 }
3474 } 3496 }
3475 }
3476 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3477 MEMCPY(v_bufptr, d, len);
3478 v_bufptr += len;
3479 }
3480 }
3481
3482 /*
3483 * Write out as much of the buffer as we can.
3484 * Be careful not to overflow the pty's input silo.
3485 * We are conservative here and only write a small amount at a time.
3486 *
3487 * If we can't push all the data into the pty yet, we expect write
3488 * to return a non-negative number less than the length requested
3489 * (if some data written) or -1 and set errno to EAGAIN,
3490 * EWOULDBLOCK, or EINTR (if no data written).
3491 *
3492 * (Not all systems do this, sigh, so the code is actually
3493 * a little more forgiving.)
3494 */
3495 if ((p = v_bufptr - v_bufstr) > 0) {
3496 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3497 if (riten < 0)
3498 riten = 0;
3499 v_bufstr += riten;
3500 if (v_bufstr >= v_bufptr) /* we wrote it all */
3501 v_bufstr = v_bufptr = v_buffer;
3502 }
3503 /*
3504 * If we have lots of unused memory allocated, return it
3505 */
3506 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3507 /* save pointers across realloc */
3508 unsigned int start = v_bufstr - v_buffer;
3509 unsigned int size = v_bufptr - v_buffer;
3510 unsigned int reallocto;
3511
3512 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3513 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3514 if (v_buffer) {
3515 v_bufstr = v_buffer + start;
3516 v_bufptr = v_buffer + size;
3517 v_bufend = v_buffer + reallocto;
3518 } else {
3519 /* should we print a warning if couldn't return memory? */
3520 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3521 }
3522 }
3523 R->v_buffer = v_buffer;
3524 R->v_bufstr = v_bufstr;
3525 R->v_bufptr = v_bufptr;
3526 R->v_bufend = v_bufend;
3527} 3497}
3498
3528/*----------------------- end-of-file (C source) -----------------------*/ 3499/*----------------------- end-of-file (C source) -----------------------*/
3529 3500

Diff Legend

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