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.9 by pcg, Thu Nov 27 10:12:10 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.9 2003/11/27 10:12:10 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
… …
709 SET_R (this); 746 SET_R (this);
710 747
711 w.at += BLINK_INTERVAL; 748 w.at += BLINK_INTERVAL;
712 hidden_cursor = !hidden_cursor; 749 hidden_cursor = !hidden_cursor;
713 want_refresh = 1; 750 want_refresh = 1;
714 flush ();
715} 751}
716 752
717void 753void
718rxvt_term::x_cb (io_watcher &w, short revents) 754rxvt_term::x_cb (io_watcher &w, short revents)
719{ 755{
720 SET_R (this); 756 SET_R (this);
721 757
722 process_x_events (); 758 process_x_events ();
759}
723 760
724 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 }
725} 897}
726 898
727// read the next character, currently handles UTF-8 899// read the next character, currently handles UTF-8
728// will probably handle all sorts of other stuff in the future 900// will probably handle all sorts of other stuff in the future
729uint32_t 901uint32_t
… …
777 } 949 }
778 950
779 return NOCHAR; 951 return NOCHAR;
780} 952}
781 953
782bool
783rxvt_term::pty_fill ()
784{
785 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
786
787 memmove (cmdbuf_base, cmdbuf_ptr, n);
788 cmdbuf_ptr = cmdbuf_base;
789 cmdbuf_endp = cmdbuf_ptr + n;
790
791 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
792
793 if (n > 0)
794 {
795 cmdbuf_endp += n;
796 return true;
797 }
798 else if (n < 0 && errno == EAGAIN)
799 return false;
800
801 destroy ();
802}
803
804void
805rxvt_term::pty_cb (io_watcher &w, short revents)
806{
807 SET_R (this);
808
809 // loop, but don't allow a single term to monopolize us
810 // the number of loops is fully arbitrary, and thus wrong
811 for (int i = 7; i-- && pty_fill (); )
812 {
813 //TODO:
814 /* once we know the shell is running, send the screen size. Again! */
815 //ch = rxvt_cmd_getc(aR); /* wait for something */
816 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
817
818 uint32_t ch = NOCHAR;
819
820 for (;;)
821 {
822 if (ch == NOCHAR)
823 ch = next_char ();
824
825 if (ch == NOCHAR) // TODO: improve
826 break;
827
828 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
829 {
830 /* Read a text string from the input buffer */
831 uint32_t buf[BUFSIZ];
832 bool refreshnow = false;
833 int nlines = 0;
834 uint32_t *str = buf;
835
836 *str++ = ch;
837
838 for (;;)
839 {
840 ch = next_char ();
841
842 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
843 break;
844 else
845 {
846 *str++ = ch;
847
848 if (ch == '\n')
849 {
850 nlines++;
851 refresh_count++;
852
853 if (!(Options & Opt_jumpScroll)
854 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
855 {
856 refreshnow = true;
857 ch = NOCHAR;
858 break;
859 }
860 }
861
862 if (str >= buf + BUFSIZ)
863 {
864 ch = NOCHAR;
865 break;
866 }
867 }
868 }
869
870 rxvt_scr_add_lines (this, buf, nlines, str - buf);
871
872 /*
873 * If there have been a lot of new lines, then update the screen
874 * What the heck I'll cheat and only refresh less than every page-full.
875 * the number of pages between refreshes is refresh_limit, which
876 * is incremented here because we must be doing flat-out scrolling.
877 *
878 * refreshing should be correct for small scrolls, because of the
879 * time-out
880 */
881 if (refreshnow)
882 {
883 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
884 refresh_limit++;
885
886 rxvt_scr_refresh (this, refresh_type);
887 }
888
889 }
890 else
891 {
892 switch (ch)
893 {
894 default:
895 rxvt_process_nonprinting (this, ch);
896 break;
897 case C0_ESC: /* escape char */
898 rxvt_process_escape_seq (this);
899 break;
900 /*case 0x9b: */ /* CSI */
901 /* rxvt_process_csi_seq (this); */
902 }
903
904 ch = NOCHAR;
905 }
906 }
907 }
908
909 flush ();
910}
911
912void
913rxvt_term::flush ()
914{
915#ifdef TRANSPARENT
916 if (want_full_refresh)
917 {
918 want_full_refresh = 0;
919 rxvt_scr_clear (this);
920 rxvt_scr_touch (this, False);
921 want_refresh = 1;
922 }
923#endif
924
925 if (want_refresh)
926 {
927 rxvt_scr_refresh (this, refresh_type);
928 rxvt_scrollbar_show (this, 1);
929#ifdef USE_XIM
930 rxvt_IMSendSpot (this);
931#endif
932 }
933
934 if (XPending (Xdisplay)) process_x_events ();
935 XFlush (Xdisplay);
936 if (XPending (Xdisplay)) process_x_events ();
937}
938
939/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
940/* 955/*
941 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
942 * to the command. 957 * to the command.
943 */ 958 */
… …
970 985
971 for (;;) { 986 for (;;) {
972 /* loop until we can return something */ 987 /* loop until we can return something */
973 988
974 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
975 rxvt_tt_write(aR_ NULL, 0); 990 R->tt_write(NULL, 0);
976 991
977#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
978 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
979 quick_timeout = 1; 994 quick_timeout = 1;
980 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
… …
1113 fprintf(stderr, "]: <%d>, %d/%d\n", 1128 fprintf(stderr, "]: <%d>, %d/%d\n",
1114 button_number, 1129 button_number,
1115 x + 1, 1130 x + 1,
1116 y + 1); 1131 y + 1);
1117#else 1132#else
1118 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1133 R->tt_printf("\033[M%c%c%c",
1119 (32 + button_number + key_state), 1134 (32 + button_number + key_state),
1120 (32 + x + 1), 1135 (32 + x + 1),
1121 (32 + y + 1)); 1136 (32 + y + 1));
1122#endif 1137#endif
1123} 1138}
… …
1665 */ 1680 */
1666 if ((R->scrollBar.style == R_SB_NEXT 1681 if ((R->scrollBar.style == R_SB_NEXT
1667 && scrollbarnext_upButton(ev->y)) 1682 && scrollbarnext_upButton(ev->y))
1668 || (R->scrollBar.style == R_SB_RXVT 1683 || (R->scrollBar.style == R_SB_RXVT
1669 && scrollbarrxvt_upButton(ev->y))) 1684 && scrollbarrxvt_upButton(ev->y)))
1670 rxvt_tt_printf(aR_ "\033[A"); 1685 R->tt_printf("\033[A");
1671 else if ((R->scrollBar.style == R_SB_NEXT 1686 else if ((R->scrollBar.style == R_SB_NEXT
1672 && scrollbarnext_dnButton(ev->y)) 1687 && scrollbarnext_dnButton(ev->y))
1673 || (R->scrollBar.style == R_SB_RXVT 1688 || (R->scrollBar.style == R_SB_RXVT
1674 && scrollbarrxvt_dnButton(ev->y))) 1689 && scrollbarrxvt_dnButton(ev->y)))
1675 rxvt_tt_printf(aR_ "\033[B"); 1690 R->tt_printf("\033[B");
1676 else 1691 else
1677 switch (ev->button) { 1692 switch (ev->button) {
1678 case Button2: 1693 case Button2:
1679 rxvt_tt_printf(aR_ "\014"); 1694 R->tt_printf("\014");
1680 break; 1695 break;
1681 case Button1: 1696 case Button1:
1682 rxvt_tt_printf(aR_ "\033[6~"); 1697 R->tt_printf("\033[6~");
1683 break; 1698 break;
1684 case Button3: 1699 case Button3:
1685 rxvt_tt_printf(aR_ "\033[5~"); 1700 R->tt_printf("\033[5~");
1686 break; 1701 break;
1687 } 1702 }
1688 } 1703 }
1689 else 1704 else
1690#endif /* NO_SCROLLBAR_REPORT */ 1705#endif /* NO_SCROLLBAR_REPORT */
… …
2091 return stream; 2106 return stream;
2092} 2107}
2093 2108
2094/* EXTPROTO */ 2109/* EXTPROTO */
2095int 2110int
2096rxvt_pclose_printer(FILE *stream) 2111rxvt_pclose_printer (FILE *stream)
2097{ 2112{
2098 fflush(stream); 2113 fflush (stream);
2099/* pclose() reported not to work on SunOS 4.1.3 */ 2114/* pclose() reported not to work on SunOS 4.1.3 */
2100# if defined (__sun__) /* TODO: RESOLVE THIS */ 2115# if defined (__sun__) /* TODO: RESOLVE THIS */
2101/* pclose works provided SIGCHLD handler uses waitpid */ 2116/* pclose works provided SIGCHLD handler uses waitpid */
2102 return pclose(stream); /* return fclose (stream); */ 2117 return pclose (stream); /* return fclose (stream); */
2103# else 2118# else
2104 return pclose(stream); 2119 return pclose (stream);
2105# endif 2120# endif
2106} 2121}
2107 2122
2108/* 2123/*
2109 * simulate attached vt100 printer 2124 * simulate attached vt100 printer
… …
2172rxvt_process_nonprinting(pR_ unsigned char ch) 2187rxvt_process_nonprinting(pR_ unsigned char ch)
2173{ 2188{
2174 switch (ch) { 2189 switch (ch) {
2175 case C0_ENQ: /* terminal Status */ 2190 case C0_ENQ: /* terminal Status */
2176 if (R->rs[Rs_answerbackstring]) 2191 if (R->rs[Rs_answerbackstring])
2177 rxvt_tt_write(aR_ 2192 R->tt_write(
2178 (const unsigned char *)R->rs[Rs_answerbackstring], 2193 (const unsigned char *)R->rs[Rs_answerbackstring],
2179 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2194 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2180 else 2195 else
2181 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2196 R->tt_write((unsigned char *)VT100_ANS,
2182 (unsigned int)STRLEN(VT100_ANS)); 2197 (unsigned int)STRLEN(VT100_ANS));
2183 break; 2198 break;
2184 case C0_BEL: /* bell */ 2199 case C0_BEL: /* bell */
2185 rxvt_scr_bell(aR); 2200 rxvt_scr_bell(aR);
2186 break; 2201 break;
… …
2249 row = rxvt_cmd_getc(aR) - ' '; 2264 row = rxvt_cmd_getc(aR) - ' ';
2250 col = rxvt_cmd_getc(aR) - ' '; 2265 col = rxvt_cmd_getc(aR) - ' ';
2251 rxvt_scr_gotorc(aR_ row, col, 0); 2266 rxvt_scr_gotorc(aR_ row, col, 0);
2252 break; 2267 break;
2253 case 'Z': /* identify the terminal type */ 2268 case 'Z': /* identify the terminal type */
2254 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 */
2255 break; 2270 break;
2256 case '<': /* turn off VT52 mode */ 2271 case '<': /* turn off VT52 mode */
2257 PrivMode(0, PrivMode_vt52); 2272 PrivMode(0, PrivMode_vt52);
2258 break; 2273 break;
2259 case 'F': /* use special graphics character set */ 2274 case 'F': /* use special graphics character set */
… …
2366 rxvt_process_dcs_seq(aR); 2381 rxvt_process_dcs_seq(aR);
2367 break; 2382 break;
2368 2383
2369 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2384 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2370 case C1_SCI: /* ESC Z */ 2385 case C1_SCI: /* ESC Z */
2371 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2386 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2372 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2387 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2373 break; /* steal obsolete ESC [ c */ 2388 break; /* steal obsolete ESC [ c */
2374 2389
2375 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2390 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2376 case C1_CSI: /* ESC [ */ 2391 case C1_CSI: /* ESC [ */
… …
2497 */ 2512 */
2498 if (priv) { 2513 if (priv) {
2499 switch (priv) { 2514 switch (priv) {
2500 case '>': 2515 case '>':
2501 if (ch == CSI_DA) /* secondary device attributes */ 2516 if (ch == CSI_DA) /* secondary device attributes */
2502 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2517 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2503 break; 2518 break;
2504 case '?': 2519 case '?':
2505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2520 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2506 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2521 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2507 break; 2522 break;
… …
2614 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2615 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);
2616 break; 2631 break;
2617 2632
2618 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2619 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2634 R->tt_write((const unsigned char *)VT100_ANS,
2620 (unsigned int)(sizeof(VT100_ANS) - 1)); 2635 (unsigned int)(sizeof(VT100_ANS) - 1));
2621 break; 2636 break;
2622 2637
2623 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2624 rxvt_process_sgr_mode(aR_ nargs, arg); 2639 rxvt_process_sgr_mode(aR_ nargs, arg);
2625 break; 2640 break;
2626 2641
2627 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2642 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2628 switch (arg[0]) { 2643 switch (arg[0]) {
2629 case 5: /* DSR requested */ 2644 case 5: /* DSR requested */
2630 rxvt_tt_printf(aR_ "\033[0n"); 2645 R->tt_printf("\033[0n");
2631 break; 2646 break;
2632 case 6: /* CPR requested */ 2647 case 6: /* CPR requested */
2633 rxvt_scr_report_position(aR); 2648 rxvt_scr_report_position(aR);
2634 break; 2649 break;
2635#if defined (ENABLE_DISPLAY_ANSWER) 2650#if defined (ENABLE_DISPLAY_ANSWER)
2636 case 7: /* unofficial extension */ 2651 case 7: /* unofficial extension */
2637 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2652 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2638 break; 2653 break;
2639#endif 2654#endif
2640 case 8: /* unofficial extension */ 2655 case 8: /* unofficial extension */
2641 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2656 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2642 break; 2657 break;
… …
2711 break; 2726 break;
2712#endif 2727#endif
2713 2728
2714 case CSI_78: /* DECREQTPARM */ 2729 case CSI_78: /* DECREQTPARM */
2715 if (arg[0] == 0 || arg[0] == 1) 2730 if (arg[0] == 0 || arg[0] == 1)
2716 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);
2717 /* FALLTHROUGH */ 2732 /* FALLTHROUGH */
2718 2733
2719 default: 2734 default:
2720 break; 2735 break;
2721 } 2736 }
… …
2775 /* 2790 /*
2776 * reports - some output format copied from XTerm 2791 * reports - some output format copied from XTerm
2777 */ 2792 */
2778 case 11: /* report window state */ 2793 case 11: /* report window state */
2779 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2794 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2780 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2795 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2781 break; 2796 break;
2782 case 13: /* report window position */ 2797 case 13: /* report window position */
2783 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2798 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2784 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2799 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2785 -wattr.border_width, -wattr.border_width, 2800 -wattr.border_width, -wattr.border_width,
2786 &x, &y, &wdummy); 2801 &x, &y, &wdummy);
2787 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2802 R->tt_printf("\033[3;%d;%dt", x, y);
2788 break; 2803 break;
2789 case 14: /* report window size (pixels) */ 2804 case 14: /* report window size (pixels) */
2790 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2805 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2791 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2806 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2792 break; 2807 break;
2793 case 18: /* report window size (chars) */ 2808 case 18: /* report window size (chars) */
2794 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);
2795 break; 2810 break;
2796#if 0 /* XXX: currently disabled due to security concerns */ 2811#if 0 /* XXX: currently disabled due to security concerns */
2797 case 20: /* report icon label */ 2812 case 20: /* report icon label */
2798 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2813 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2799 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2814 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2800 break; 2815 break;
2801 case 21: /* report window title */ 2816 case 21: /* report window title */
2802 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2817 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2803 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2818 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2804 break; 2819 break;
2805#endif 2820#endif
2806 } 2821 }
2807} 2822}
2808#endif 2823#endif
… …
3351{ 3366{
3352 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3367 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3353 3368
3354#ifndef RXVT_GRAPHICS 3369#ifndef RXVT_GRAPHICS
3355 if (cmd == 'Q') { /* query graphics */ 3370 if (cmd == 'Q') { /* query graphics */
3356 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3371 R->tt_printf("\033G0\n"); /* no graphics */
3357 return; 3372 return;
3358 } 3373 }
3359/* swallow other graphics sequences until terminating ':' */ 3374/* swallow other graphics sequences until terminating ':' */
3360 do 3375 do
3361 ch = rxvt_cmd_getc(aR); 3376 ch = rxvt_cmd_getc(aR);
… …
3364 unsigned int nargs; 3379 unsigned int nargs;
3365 int args[NGRX_PTS]; 3380 int args[NGRX_PTS];
3366 unsigned char *text = NULL; 3381 unsigned char *text = NULL;
3367 3382
3368 if (cmd == 'Q') { /* query graphics */ 3383 if (cmd == 'Q') { /* query graphics */
3369 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3384 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3370 return; 3385 return;
3371 } 3386 }
3372 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3387 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3373 int neg; 3388 int neg;
3374 3389
… …
3408 3423
3409/* 3424/*
3410 * Send printf() formatted output to the command. 3425 * Send printf() formatted output to the command.
3411 * Only use for small amounts of data. 3426 * Only use for small amounts of data.
3412 */ 3427 */
3413/* EXTPROTO */
3414void 3428void
3415rxvt_tt_printf(pR_ const char *fmt,...) 3429rxvt_term::tt_printf (const char *fmt,...)
3416{ 3430{
3417 va_list arg_ptr; 3431 va_list arg_ptr;
3418 unsigned char buf[256]; 3432 unsigned char buf[256];
3419 3433
3420 va_start(arg_ptr, fmt); 3434 va_start (arg_ptr, fmt);
3421 vsprintf((char *)buf, fmt, arg_ptr); 3435 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3422 va_end(arg_ptr); 3436 va_end (arg_ptr);
3423 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3437 tt_write (buf, STRLEN (buf));
3424} 3438}
3425 3439
3426/* ---------------------------------------------------------------------- */ 3440/* ---------------------------------------------------------------------- */
3427/* Addresses pasting large amounts of data and rxvt hang
3428 * code pinched from xterm (v_write()) and applied originally to
3429 * rxvt-2.18 - Hops
3430 * 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,
3431 * or generated by us in response to a query ESC sequence. 3442 * or generated by us in response to a query ESC sequence.
3432 */ 3443 */
3433/* EXTPROTO */
3434void 3444void
3435rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3445rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3436{ 3446{
3437#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3447 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3438 int riten;
3439 unsigned int p;
3440 unsigned char *v_buffer, /* start of physical buffer */
3441 *v_bufstr, /* start of current buffer pending */
3442 *v_bufptr, /* end of current buffer pending */
3443 *v_bufend; /* end of physical buffer */
3444 3448
3445 if (R->v_bufstr == NULL && len > 0) { 3449 if (len)
3446 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3447 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3448 v_bufend = v_buffer + p;
3449 } else {
3450 v_buffer = R->v_buffer;
3451 v_bufstr = R->v_bufstr;
3452 v_bufptr = R->v_bufptr;
3453 v_bufend = R->v_bufend;
3454 } 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;
3455 3456
3456 /* 3457 data += written;
3457 * Append to the block we already have. Always doing this simplifies the 3458 len -= written;
3458 * code, and isn't too bad, either. If this is a short block, it isn't 3459 }
3459 * too expensive, and if this is a long block, we won't be able to write 3460
3460 * it all anyway. 3461
3461 */ 3462 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3462 if (len > 0) { 3463
3463 if (v_bufend < v_bufptr + len) { /* run out of room */ 3464 memcpy (v_buffer + v_buflen, data, len);
3464 if (v_bufstr != v_buffer) { 3465 v_buflen += len;
3465 /* there is unused space, move everything down */
3466 MEMMOVE(v_buffer, v_bufstr,
3467 (unsigned int)(v_bufptr - v_bufstr));
3468 v_bufptr -= v_bufstr - v_buffer;
3469 v_bufstr = v_buffer;
3470 } 3466 }
3471 if (v_bufend < v_bufptr + len) {
3472 /* still won't fit: get more space */
3473 /* use most basic realloc because an error is not fatal. */
3474 unsigned int size = v_bufptr - v_buffer;
3475 unsigned int reallocto;
3476 3467
3477 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3468 for (;;)
3478 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3469 {
3479 /* save across realloc */ 3470 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3480 if (v_buffer) { 3471
3481 v_bufstr = v_buffer; 3472 if (written > 0)
3482 v_bufptr = v_buffer + size; 3473 {
3483 v_bufend = v_buffer + reallocto; 3474 v_buflen -= written;
3484 } else { /* no memory: ignore entire write request */ 3475
3485 rxvt_print_error("data loss: cannot allocate buffer space"); 3476 if (v_buflen == 0)
3486 v_buffer = v_bufstr; /* restore clobbered pointer */ 3477 {
3487 } 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 }
3488 } 3496 }
3489 }
3490 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3491 MEMCPY(v_bufptr, d, len);
3492 v_bufptr += len;
3493 }
3494 }
3495
3496 /*
3497 * Write out as much of the buffer as we can.
3498 * Be careful not to overflow the pty's input silo.
3499 * We are conservative here and only write a small amount at a time.
3500 *
3501 * If we can't push all the data into the pty yet, we expect write
3502 * to return a non-negative number less than the length requested
3503 * (if some data written) or -1 and set errno to EAGAIN,
3504 * EWOULDBLOCK, or EINTR (if no data written).
3505 *
3506 * (Not all systems do this, sigh, so the code is actually
3507 * a little more forgiving.)
3508 */
3509 if ((p = v_bufptr - v_bufstr) > 0) {
3510 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3511 if (riten < 0)
3512 riten = 0;
3513 v_bufstr += riten;
3514 if (v_bufstr >= v_bufptr) /* we wrote it all */
3515 v_bufstr = v_bufptr = v_buffer;
3516 }
3517 /*
3518 * If we have lots of unused memory allocated, return it
3519 */
3520 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3521 /* save pointers across realloc */
3522 unsigned int start = v_bufstr - v_buffer;
3523 unsigned int size = v_bufptr - v_buffer;
3524 unsigned int reallocto;
3525
3526 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3527 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3528 if (v_buffer) {
3529 v_bufstr = v_buffer + start;
3530 v_bufptr = v_buffer + size;
3531 v_bufend = v_buffer + reallocto;
3532 } else {
3533 /* should we print a warning if couldn't return memory? */
3534 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3535 }
3536 }
3537 R->v_buffer = v_buffer;
3538 R->v_bufstr = v_bufstr;
3539 R->v_bufptr = v_bufptr;
3540 R->v_bufend = v_bufend;
3541} 3497}
3498
3542/*----------------------- end-of-file (C source) -----------------------*/ 3499/*----------------------- end-of-file (C source) -----------------------*/
3543 3500

Diff Legend

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