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.8 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.8 2003/11/26 10:42:34 pcg Exp $ 4 * $Id: command.C,v 1.11 2003/12/02 21:49:46 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
237 /* escape prefix */ 237 /* escape prefix */
238 if (meta) 238 if (meta)
239# ifdef META8_OPTION 239# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 240 if (R->meta_char == C0_ESC)
241# endif 241# endif
242 rxvt_tt_write(aR_ &ch, 1); 242 R->tt_write(&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 243 R->tt_write(kbuf0, l);
244 return; 244 return;
245 } else 245 } else
246#endif 246#endif
247 { 247 {
248 newlen = 1; 248 newlen = 1;
… …
605 && (R->meta_char == C0_ESC) 605 && (R->meta_char == C0_ESC)
606#endif 606#endif
607 ) { 607 ) {
608 const unsigned char ch = C0_ESC; 608 const unsigned char ch = C0_ESC;
609 609
610 rxvt_tt_write(aR_ &ch, 1); 610 R->tt_write(&ch, 1);
611 } 611 }
612#ifdef DEBUG_CMD 612#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 613 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 614 char *p;
615 int i; 615 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 618 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 620 fprintf(stderr, "'\n");
621 } 621 }
622#endif /* DEBUG_CMD */ 622#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 623 R->tt_write(kbuf, (unsigned int)len);
624} 624}
625/*}}} */ 625/*}}} */
626 626
627#if (MENUBAR_MAX) 627#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
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 return false;
779
780 destroy ();
781}
782
783void
784rxvt_term::pty_cb (io_watcher &w, short revents)
785{
786 SET_R (this);
787
788 if (revents & EVENT_WRITE)
789 tt_write (0, 0);
790 else if (revents & EVENT_READ)
791 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); )
794 {
795 if (!seen_input)
796 {
797 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch ();
800 }
801
802 uint32_t ch = NOCHAR;
803
804 for (;;)
805 {
806 if (ch == NOCHAR)
807 ch = next_char ();
808
809 if (ch == NOCHAR) // TODO: improve
810 break;
811
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 {
814 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ];
816 bool refreshnow = false;
817 int nlines = 0;
818 uint32_t *str = buf;
819
820 *str++ = ch;
821
822 for (;;)
823 {
824 ch = next_char ();
825
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break;
828 else
829 {
830 *str++ = ch;
831
832 if (ch == '\n')
833 {
834 nlines++;
835 refresh_count++;
836
837 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 {
840 refreshnow = true;
841 ch = NOCHAR;
842 break;
843 }
844 }
845
846 if (str >= buf + BUFSIZ)
847 {
848 ch = NOCHAR;
849 break;
850 }
851 }
852 }
853
854 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855
856 /*
857 * If there have been a lot of new lines, then update the screen
858 * What the heck I'll cheat and only refresh less than every page-full.
859 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling.
861 *
862 * refreshing should be correct for small scrolls, because of the
863 * time-out
864 */
865 if (refreshnow)
866 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++;
869
870 rxvt_scr_refresh (this, refresh_type);
871 }
872
873 }
874 else
875 {
876 switch (ch)
877 {
878 default:
879 rxvt_process_nonprinting (this, ch);
880 break;
881 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this);
883 break;
884 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */
886 }
887
888 ch = NOCHAR;
889 }
890 }
891 }
721} 892}
722 893
723// read the next character, currently handles UTF-8 894// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future 895// will probably handle all sorts of other stuff in the future
725uint32_t 896uint32_t
… …
773 } 944 }
774 945
775 return NOCHAR; 946 return NOCHAR;
776} 947}
777 948
778bool
779rxvt_term::pty_fill ()
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, BUFSIZ - n);
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 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 for (int i = 7; i-- && pty_fill (); )
807 {
808 //TODO:
809 /* once we know the shell is running, send the screen size. Again! */
810 //ch = rxvt_cmd_getc(aR); /* wait for something */
811 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
812
813 uint32_t ch = NOCHAR;
814
815 for (;;)
816 {
817 if (ch == NOCHAR)
818 ch = next_char ();
819
820 if (ch == NOCHAR) // TODO: improve
821 break;
822
823 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
824 {
825 /* Read a text string from the input buffer */
826 uint32_t buf[BUFSIZ];
827 bool refreshnow = false;
828 int nlines = 0;
829 uint32_t *str = buf;
830
831 *str++ = ch;
832
833 for (;;)
834 {
835 ch = next_char ();
836
837 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
838 break;
839 else
840 {
841 *str++ = ch;
842
843 if (ch == '\n')
844 {
845 nlines++;
846 refresh_count++;
847
848 if (!(Options & Opt_jumpScroll)
849 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
850 {
851 refreshnow = true;
852 ch = NOCHAR;
853 break;
854 }
855 }
856
857 if (str >= buf + BUFSIZ)
858 {
859 ch = NOCHAR;
860 break;
861 }
862 }
863 }
864
865 rxvt_scr_add_lines (this, buf, nlines, str - buf);
866
867 /*
868 * If there have been a lot of new lines, then update the screen
869 * What the heck I'll cheat and only refresh less than every page-full.
870 * the number of pages between refreshes is refresh_limit, which
871 * is incremented here because we must be doing flat-out scrolling.
872 *
873 * refreshing should be correct for small scrolls, because of the
874 * time-out
875 */
876 if (refreshnow)
877 {
878 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
879 refresh_limit++;
880
881 rxvt_scr_refresh (this, refresh_type);
882 }
883
884 }
885 else
886 {
887 switch (ch)
888 {
889 default:
890 rxvt_process_nonprinting (this, ch);
891 break;
892 case C0_ESC: /* escape char */
893 rxvt_process_escape_seq (this);
894 break;
895 /*case 0x9b: */ /* CSI */
896 /* rxvt_process_csi_seq (this); */
897 }
898
899 ch = NOCHAR;
900 }
901 }
902 }
903
904 flush ();
905}
906
907void
908rxvt_term::flush ()
909{
910#ifdef TRANSPARENT
911 if (want_full_refresh)
912 {
913 want_full_refresh = 0;
914 rxvt_scr_clear (this);
915 rxvt_scr_touch (this, False);
916 want_refresh = 1;
917 }
918#endif
919
920 if (want_refresh)
921 {
922 rxvt_scr_refresh (this, refresh_type);
923 rxvt_scrollbar_show (this, 1);
924#ifdef USE_XIM
925 rxvt_IMSendSpot (this);
926#endif
927 }
928
929 if (XPending (Xdisplay)) process_x_events ();
930 XFlush (Xdisplay);
931 if (XPending (Xdisplay)) process_x_events ();
932}
933
934/* rxvt_cmd_getc() - Return next input character */ 949/* rxvt_cmd_getc() - Return next input character */
935/* 950/*
936 * Return the next input character after first passing any keyboard input 951 * Return the next input character after first passing any keyboard input
937 * to the command. 952 * to the command.
938 */ 953 */
… …
965 980
966 for (;;) { 981 for (;;) {
967 /* loop until we can return something */ 982 /* loop until we can return something */
968 983
969 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 984 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
970 rxvt_tt_write(aR_ NULL, 0); 985 R->tt_write(NULL, 0);
971 986
972#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 987#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
973 if (R->mouse_slip_wheel_speed) { 988 if (R->mouse_slip_wheel_speed) {
974 quick_timeout = 1; 989 quick_timeout = 1;
975 if (!R->mouse_slip_wheel_delay-- 990 if (!R->mouse_slip_wheel_delay--
… …
1043} 1058}
1044 1059
1045void 1060void
1046rxvt_term::pointer_cb (time_watcher &w) 1061rxvt_term::pointer_cb (time_watcher &w)
1047{ 1062{
1063 SET_R (this);
1064
1048 pointer_blank (); 1065 pointer_blank ();
1049} 1066}
1050#endif 1067#endif
1051 1068
1052/* INTPROTO */ 1069/* INTPROTO */
… …
1106 fprintf(stderr, "]: <%d>, %d/%d\n", 1123 fprintf(stderr, "]: <%d>, %d/%d\n",
1107 button_number, 1124 button_number,
1108 x + 1, 1125 x + 1,
1109 y + 1); 1126 y + 1);
1110#else 1127#else
1111 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1128 R->tt_printf("\033[M%c%c%c",
1112 (32 + button_number + key_state), 1129 (32 + button_number + key_state),
1113 (32 + x + 1), 1130 (32 + x + 1),
1114 (32 + y + 1)); 1131 (32 + y + 1));
1115#endif 1132#endif
1116} 1133}
… …
1249 break; 1266 break;
1250 1267
1251 case ClientMessage: 1268 case ClientMessage:
1252 if (ev->xclient.format == 32 1269 if (ev->xclient.format == 32
1253 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1270 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1254 exit(EXIT_SUCCESS); 1271 R->destroy ();
1255#ifdef OFFIX_DND 1272#ifdef OFFIX_DND
1256 /* OffiX Dnd (drag 'n' drop) protocol */ 1273 /* OffiX Dnd (drag 'n' drop) protocol */
1257 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1274 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1258 && (ev->xclient.data.l[0] == DndFile 1275 && (ev->xclient.data.l[0] == DndFile
1259 || ev->xclient.data.l[0] == DndDir 1276 || ev->xclient.data.l[0] == DndDir
1260 || ev->xclient.data.l[0] == DndLink)) { 1277 || ev->xclient.data.l[0] == DndLink)) {
1261 /* Get Dnd data */ 1278 /* Get Dnd data */
1262 Atom ActualType; 1279 Atom ActualType;
… …
1658 */ 1675 */
1659 if ((R->scrollBar.style == R_SB_NEXT 1676 if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_upButton(ev->y)) 1677 && scrollbarnext_upButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1678 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_upButton(ev->y))) 1679 && scrollbarrxvt_upButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[A"); 1680 R->tt_printf("\033[A");
1664 else if ((R->scrollBar.style == R_SB_NEXT 1681 else if ((R->scrollBar.style == R_SB_NEXT
1665 && scrollbarnext_dnButton(ev->y)) 1682 && scrollbarnext_dnButton(ev->y))
1666 || (R->scrollBar.style == R_SB_RXVT 1683 || (R->scrollBar.style == R_SB_RXVT
1667 && scrollbarrxvt_dnButton(ev->y))) 1684 && scrollbarrxvt_dnButton(ev->y)))
1668 rxvt_tt_printf(aR_ "\033[B"); 1685 R->tt_printf("\033[B");
1669 else 1686 else
1670 switch (ev->button) { 1687 switch (ev->button) {
1671 case Button2: 1688 case Button2:
1672 rxvt_tt_printf(aR_ "\014"); 1689 R->tt_printf("\014");
1673 break; 1690 break;
1674 case Button1: 1691 case Button1:
1675 rxvt_tt_printf(aR_ "\033[6~"); 1692 R->tt_printf("\033[6~");
1676 break; 1693 break;
1677 case Button3: 1694 case Button3:
1678 rxvt_tt_printf(aR_ "\033[5~"); 1695 R->tt_printf("\033[5~");
1679 break; 1696 break;
1680 } 1697 }
1681 } 1698 }
1682 else 1699 else
1683#endif /* NO_SCROLLBAR_REPORT */ 1700#endif /* NO_SCROLLBAR_REPORT */
… …
2084 return stream; 2101 return stream;
2085} 2102}
2086 2103
2087/* EXTPROTO */ 2104/* EXTPROTO */
2088int 2105int
2089rxvt_pclose_printer(FILE *stream) 2106rxvt_pclose_printer (FILE *stream)
2090{ 2107{
2091 fflush(stream); 2108 fflush (stream);
2092/* pclose() reported not to work on SunOS 4.1.3 */ 2109/* pclose() reported not to work on SunOS 4.1.3 */
2093# if defined (__sun__) /* TODO: RESOLVE THIS */ 2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2094/* pclose works provided SIGCHLD handler uses waitpid */ 2111/* pclose works provided SIGCHLD handler uses waitpid */
2095 return pclose(stream); /* return fclose (stream); */ 2112 return pclose (stream); /* return fclose (stream); */
2096# else 2113# else
2097 return pclose(stream); 2114 return pclose (stream);
2098# endif 2115# endif
2099} 2116}
2100 2117
2101/* 2118/*
2102 * simulate attached vt100 printer 2119 * simulate attached vt100 printer
… …
2165rxvt_process_nonprinting(pR_ unsigned char ch) 2182rxvt_process_nonprinting(pR_ unsigned char ch)
2166{ 2183{
2167 switch (ch) { 2184 switch (ch) {
2168 case C0_ENQ: /* terminal Status */ 2185 case C0_ENQ: /* terminal Status */
2169 if (R->rs[Rs_answerbackstring]) 2186 if (R->rs[Rs_answerbackstring])
2170 rxvt_tt_write(aR_ 2187 R->tt_write(
2171 (const unsigned char *)R->rs[Rs_answerbackstring], 2188 (const unsigned char *)R->rs[Rs_answerbackstring],
2172 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2189 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2173 else 2190 else
2174 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2191 R->tt_write((unsigned char *)VT100_ANS,
2175 (unsigned int)STRLEN(VT100_ANS)); 2192 (unsigned int)STRLEN(VT100_ANS));
2176 break; 2193 break;
2177 case C0_BEL: /* bell */ 2194 case C0_BEL: /* bell */
2178 rxvt_scr_bell(aR); 2195 rxvt_scr_bell(aR);
2179 break; 2196 break;
… …
2242 row = rxvt_cmd_getc(aR) - ' '; 2259 row = rxvt_cmd_getc(aR) - ' ';
2243 col = rxvt_cmd_getc(aR) - ' '; 2260 col = rxvt_cmd_getc(aR) - ' ';
2244 rxvt_scr_gotorc(aR_ row, col, 0); 2261 rxvt_scr_gotorc(aR_ row, col, 0);
2245 break; 2262 break;
2246 case 'Z': /* identify the terminal type */ 2263 case 'Z': /* identify the terminal type */
2247 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2264 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2248 break; 2265 break;
2249 case '<': /* turn off VT52 mode */ 2266 case '<': /* turn off VT52 mode */
2250 PrivMode(0, PrivMode_vt52); 2267 PrivMode(0, PrivMode_vt52);
2251 break; 2268 break;
2252 case 'F': /* use special graphics character set */ 2269 case 'F': /* use special graphics character set */
… …
2359 rxvt_process_dcs_seq(aR); 2376 rxvt_process_dcs_seq(aR);
2360 break; 2377 break;
2361 2378
2362 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2379 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2363 case C1_SCI: /* ESC Z */ 2380 case C1_SCI: /* ESC Z */
2364 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2381 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2365 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2382 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2366 break; /* steal obsolete ESC [ c */ 2383 break; /* steal obsolete ESC [ c */
2367 2384
2368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2385 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2369 case C1_CSI: /* ESC [ */ 2386 case C1_CSI: /* ESC [ */
… …
2490 */ 2507 */
2491 if (priv) { 2508 if (priv) {
2492 switch (priv) { 2509 switch (priv) {
2493 case '>': 2510 case '>':
2494 if (ch == CSI_DA) /* secondary device attributes */ 2511 if (ch == CSI_DA) /* secondary device attributes */
2495 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2512 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2496 break; 2513 break;
2497 case '?': 2514 case '?':
2498 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2515 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2499 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2516 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2500 break; 2517 break;
… …
2607 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2608 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2625 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2609 break; 2626 break;
2610 2627
2611 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2612 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2629 R->tt_write((const unsigned char *)VT100_ANS,
2613 (unsigned int)(sizeof(VT100_ANS) - 1)); 2630 (unsigned int)(sizeof(VT100_ANS) - 1));
2614 break; 2631 break;
2615 2632
2616 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2633 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2617 rxvt_process_sgr_mode(aR_ nargs, arg); 2634 rxvt_process_sgr_mode(aR_ nargs, arg);
2618 break; 2635 break;
2619 2636
2620 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2637 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2621 switch (arg[0]) { 2638 switch (arg[0]) {
2622 case 5: /* DSR requested */ 2639 case 5: /* DSR requested */
2623 rxvt_tt_printf(aR_ "\033[0n"); 2640 R->tt_printf("\033[0n");
2624 break; 2641 break;
2625 case 6: /* CPR requested */ 2642 case 6: /* CPR requested */
2626 rxvt_scr_report_position(aR); 2643 rxvt_scr_report_position(aR);
2627 break; 2644 break;
2628#if defined (ENABLE_DISPLAY_ANSWER) 2645#if defined (ENABLE_DISPLAY_ANSWER)
2629 case 7: /* unofficial extension */ 2646 case 7: /* unofficial extension */
2630 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2647 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2631 break; 2648 break;
2632#endif 2649#endif
2633 case 8: /* unofficial extension */ 2650 case 8: /* unofficial extension */
2634 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2651 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2635 break; 2652 break;
… …
2704 break; 2721 break;
2705#endif 2722#endif
2706 2723
2707 case CSI_78: /* DECREQTPARM */ 2724 case CSI_78: /* DECREQTPARM */
2708 if (arg[0] == 0 || arg[0] == 1) 2725 if (arg[0] == 0 || arg[0] == 1)
2709 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2726 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2710 /* FALLTHROUGH */ 2727 /* FALLTHROUGH */
2711 2728
2712 default: 2729 default:
2713 break; 2730 break;
2714 } 2731 }
… …
2768 /* 2785 /*
2769 * reports - some output format copied from XTerm 2786 * reports - some output format copied from XTerm
2770 */ 2787 */
2771 case 11: /* report window state */ 2788 case 11: /* report window state */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2773 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2790 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2774 break; 2791 break;
2775 case 13: /* report window position */ 2792 case 13: /* report window position */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2777 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2794 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2778 -wattr.border_width, -wattr.border_width, 2795 -wattr.border_width, -wattr.border_width,
2779 &x, &y, &wdummy); 2796 &x, &y, &wdummy);
2780 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2797 R->tt_printf("\033[3;%d;%dt", x, y);
2781 break; 2798 break;
2782 case 14: /* report window size (pixels) */ 2799 case 14: /* report window size (pixels) */
2783 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2800 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2784 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2801 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2785 break; 2802 break;
2786 case 18: /* report window size (chars) */ 2803 case 18: /* report window size (chars) */
2787 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2804 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2788 break; 2805 break;
2789#if 0 /* XXX: currently disabled due to security concerns */ 2806#if 0 /* XXX: currently disabled due to security concerns */
2790 case 20: /* report icon label */ 2807 case 20: /* report icon label */
2791 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2808 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2792 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2809 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2793 break; 2810 break;
2794 case 21: /* report window title */ 2811 case 21: /* report window title */
2795 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2812 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2796 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2813 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2814 break;
2798#endif 2815#endif
2799 } 2816 }
2800} 2817}
2801#endif 2818#endif
… …
3344{ 3361{
3345 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3362 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3346 3363
3347#ifndef RXVT_GRAPHICS 3364#ifndef RXVT_GRAPHICS
3348 if (cmd == 'Q') { /* query graphics */ 3365 if (cmd == 'Q') { /* query graphics */
3349 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3366 R->tt_printf("\033G0\n"); /* no graphics */
3350 return; 3367 return;
3351 } 3368 }
3352/* swallow other graphics sequences until terminating ':' */ 3369/* swallow other graphics sequences until terminating ':' */
3353 do 3370 do
3354 ch = rxvt_cmd_getc(aR); 3371 ch = rxvt_cmd_getc(aR);
… …
3357 unsigned int nargs; 3374 unsigned int nargs;
3358 int args[NGRX_PTS]; 3375 int args[NGRX_PTS];
3359 unsigned char *text = NULL; 3376 unsigned char *text = NULL;
3360 3377
3361 if (cmd == 'Q') { /* query graphics */ 3378 if (cmd == 'Q') { /* query graphics */
3362 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3379 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3363 return; 3380 return;
3364 } 3381 }
3365 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3382 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3366 int neg; 3383 int neg;
3367 3384
… …
3401 3418
3402/* 3419/*
3403 * Send printf() formatted output to the command. 3420 * Send printf() formatted output to the command.
3404 * Only use for small amounts of data. 3421 * Only use for small amounts of data.
3405 */ 3422 */
3406/* EXTPROTO */
3407void 3423void
3408rxvt_tt_printf(pR_ const char *fmt,...) 3424rxvt_term::tt_printf (const char *fmt,...)
3409{ 3425{
3410 va_list arg_ptr; 3426 va_list arg_ptr;
3411 unsigned char buf[256]; 3427 unsigned char buf[256];
3412 3428
3413 va_start(arg_ptr, fmt); 3429 va_start (arg_ptr, fmt);
3414 vsprintf((char *)buf, fmt, arg_ptr); 3430 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3415 va_end(arg_ptr); 3431 va_end (arg_ptr);
3416 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3432 tt_write (buf, STRLEN (buf));
3417} 3433}
3418 3434
3419/* ---------------------------------------------------------------------- */ 3435/* ---------------------------------------------------------------------- */
3420/* Addresses pasting large amounts of data and rxvt hang
3421 * code pinched from xterm (v_write()) and applied originally to
3422 * rxvt-2.18 - Hops
3423 * Write data to the pty as typed by the user, pasted with the mouse, 3436/* Write data to the pty as typed by the user, pasted with the mouse,
3424 * or generated by us in response to a query ESC sequence. 3437 * or generated by us in response to a query ESC sequence.
3425 */ 3438 */
3426/* EXTPROTO */
3427void 3439void
3428rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3440rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3429{ 3441{
3430#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3442 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3431 int riten;
3432 unsigned int p;
3433 unsigned char *v_buffer, /* start of physical buffer */
3434 *v_bufstr, /* start of current buffer pending */
3435 *v_bufptr, /* end of current buffer pending */
3436 *v_bufend; /* end of physical buffer */
3437 3443
3438 if (R->v_bufstr == NULL && len > 0) { 3444 if (len)
3439 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3440 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3441 v_bufend = v_buffer + p;
3442 } else {
3443 v_buffer = R->v_buffer;
3444 v_bufstr = R->v_bufstr;
3445 v_bufptr = R->v_bufptr;
3446 v_bufend = R->v_bufend;
3447 } 3445 {
3446 if (v_buflen == 0)
3447 {
3448 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3449 if (written == len)
3450 return;
3448 3451
3449 /* 3452 data += written;
3450 * Append to the block we already have. Always doing this simplifies the 3453 len -= written;
3451 * code, and isn't too bad, either. If this is a short block, it isn't 3454 }
3452 * too expensive, and if this is a long block, we won't be able to write 3455
3453 * it all anyway. 3456
3454 */ 3457 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3455 if (len > 0) { 3458
3456 if (v_bufend < v_bufptr + len) { /* run out of room */ 3459 memcpy (v_buffer + v_buflen, data, len);
3457 if (v_bufstr != v_buffer) { 3460 v_buflen += len;
3458 /* there is unused space, move everything down */
3459 MEMMOVE(v_buffer, v_bufstr,
3460 (unsigned int)(v_bufptr - v_bufstr));
3461 v_bufptr -= v_bufstr - v_buffer;
3462 v_bufstr = v_buffer;
3463 } 3461 }
3464 if (v_bufend < v_bufptr + len) {
3465 /* still won't fit: get more space */
3466 /* use most basic realloc because an error is not fatal. */
3467 unsigned int size = v_bufptr - v_buffer;
3468 unsigned int reallocto;
3469 3462
3470 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3463 for (;;)
3471 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3464 {
3472 /* save across realloc */ 3465 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3473 if (v_buffer) { 3466
3474 v_bufstr = v_buffer; 3467 if (written > 0)
3475 v_bufptr = v_buffer + size; 3468 {
3476 v_bufend = v_buffer + reallocto; 3469 v_buflen -= written;
3477 } else { /* no memory: ignore entire write request */ 3470
3478 rxvt_print_error("data loss: cannot allocate buffer space"); 3471 if (v_buflen == 0)
3479 v_buffer = v_bufstr; /* restore clobbered pointer */ 3472 {
3480 } 3473 free (v_buffer);
3474 v_buffer = 0;
3475 v_buflen = 0;
3476
3477 pty_ev.set (EVENT_READ);
3478 return;
3479 }
3480
3481 memmove (v_buffer, v_buffer + written, v_buflen);
3482 }
3483 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3484 // original code just ignores this...
3485 destroy ();
3486 else
3487 {
3488 pty_ev.set (EVENT_READ | EVENT_WRITE);
3489 return;
3490 }
3481 } 3491 }
3482 }
3483 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3484 MEMCPY(v_bufptr, d, len);
3485 v_bufptr += len;
3486 }
3487 }
3488
3489 /*
3490 * Write out as much of the buffer as we can.
3491 * Be careful not to overflow the pty's input silo.
3492 * We are conservative here and only write a small amount at a time.
3493 *
3494 * If we can't push all the data into the pty yet, we expect write
3495 * to return a non-negative number less than the length requested
3496 * (if some data written) or -1 and set errno to EAGAIN,
3497 * EWOULDBLOCK, or EINTR (if no data written).
3498 *
3499 * (Not all systems do this, sigh, so the code is actually
3500 * a little more forgiving.)
3501 */
3502 if ((p = v_bufptr - v_bufstr) > 0) {
3503 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3504 if (riten < 0)
3505 riten = 0;
3506 v_bufstr += riten;
3507 if (v_bufstr >= v_bufptr) /* we wrote it all */
3508 v_bufstr = v_bufptr = v_buffer;
3509 }
3510 /*
3511 * If we have lots of unused memory allocated, return it
3512 */
3513 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3514 /* save pointers across realloc */
3515 unsigned int start = v_bufstr - v_buffer;
3516 unsigned int size = v_bufptr - v_buffer;
3517 unsigned int reallocto;
3518
3519 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3521 if (v_buffer) {
3522 v_bufstr = v_buffer + start;
3523 v_bufptr = v_buffer + size;
3524 v_bufend = v_buffer + reallocto;
3525 } else {
3526 /* should we print a warning if couldn't return memory? */
3527 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3528 }
3529 }
3530 R->v_buffer = v_buffer;
3531 R->v_bufstr = v_bufstr;
3532 R->v_bufptr = v_bufptr;
3533 R->v_bufend = v_bufend;
3534} 3492}
3493
3535/*----------------------- end-of-file (C source) -----------------------*/ 3494/*----------------------- end-of-file (C source) -----------------------*/
3536 3495

Diff Legend

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