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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.6 2003/11/25 17:11:33 pcg Exp $ 4 * $Id: command.C,v 1.10 2003/11/27 16:49:45 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
237 /* escape prefix */ 237 /* escape prefix */
238 if (meta) 238 if (meta)
239# ifdef META8_OPTION 239# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 240 if (R->meta_char == C0_ESC)
241# endif 241# endif
242 rxvt_tt_write(aR_ &ch, 1); 242 R->tt_write(&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 243 R->tt_write(kbuf0, l);
244 return; 244 return;
245 } else 245 } else
246#endif 246#endif
247 { 247 {
248 newlen = 1; 248 newlen = 1;
… …
605 && (R->meta_char == C0_ESC) 605 && (R->meta_char == C0_ESC)
606#endif 606#endif
607 ) { 607 ) {
608 const unsigned char ch = C0_ESC; 608 const unsigned char ch = C0_ESC;
609 609
610 rxvt_tt_write(aR_ &ch, 1); 610 R->tt_write(&ch, 1);
611 } 611 }
612#ifdef DEBUG_CMD 612#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 613 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 614 char *p;
615 int i; 615 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 618 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 620 fprintf(stderr, "'\n");
621 } 621 }
622#endif /* DEBUG_CMD */ 622#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 623 R->tt_write(kbuf, (unsigned int)len);
624} 624}
625/*}}} */ 625/*}}} */
626 626
627#if (MENUBAR_MAX) 627#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
704} 704}
705 705
706void 706void
707rxvt_term::blink_cb (time_watcher &w) 707rxvt_term::blink_cb (time_watcher &w)
708{ 708{
709 SET_R (this);
710
709 w.at += BLINK_INTERVAL; 711 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 712 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 713 want_refresh = 1;
712 flush(); 714 flush ();
713} 715}
714 716
715void 717void
716rxvt_term::x_cb (io_watcher &w, short revents) 718rxvt_term::x_cb (io_watcher &w, short revents)
717{ 719{
720 SET_R (this);
721
718 process_x_events (); 722 process_x_events ();
719 723
720 flush (); 724 flush ();
721} 725}
722 726
… …
774 778
775 return NOCHAR; 779 return NOCHAR;
776} 780}
777 781
778bool 782bool
779rxvt_term::pty_fill (size_t count) 783rxvt_term::pty_fill ()
780{ 784{
781 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 785 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
782 786
783 memmove (cmdbuf_base, cmdbuf_ptr, n); 787 memmove (cmdbuf_base, cmdbuf_ptr, n);
784 cmdbuf_ptr = cmdbuf_base; 788 cmdbuf_ptr = cmdbuf_base;
785 cmdbuf_endp = cmdbuf_ptr + n; 789 cmdbuf_endp = cmdbuf_ptr + n;
786 790
787 n = read (cmd_fd, cmdbuf_endp, count); 791 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
788 792
789 if (n > 0) 793 if (n > 0)
790 { 794 {
791 cmdbuf_endp += n; 795 cmdbuf_endp += n;
792 return true; 796 return true;
793 } 797 }
794 else if (n < 0 && errno == EAGAIN) 798 else if (n < 0 && errno == EAGAIN)
795 return false; 799 return false;
796 800
797 rxvt_clean_exit(); 801 destroy ();
798 exit(EXIT_FAILURE); /* bad order of events? */
799} 802}
800 803
801void 804void
802rxvt_term::pty_cb (io_watcher &w, short revents) 805rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 806{
804 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr))) 807 SET_R (this);
808
809 if (revents & EVENT_WRITE)
810 tt_write (0, 0);
811 else if (revents & EVENT_READ)
812 // loop, but don't allow a single term to monopolize us
813 // the number of loops is fully arbitrary, and thus wrong
814 for (int i = 7; i-- && pty_fill (); )
805 { 815 {
816 //TODO:
806 /* once we know the shell is running, send the screen size. Again! */ 817 /* once we know the shell is running, send the screen size. Again! */
807 //ch = rxvt_cmd_getc(aR); /* wait for something */ 818 //ch = rxvt_cmd_getc(aR); /* wait for something */
808 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); 819 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
809 820
810 uint32_t ch = NOCHAR; 821 uint32_t ch = NOCHAR;
811 822
812 for (;;) 823 for (;;)
813 { 824 {
814 if (ch == NOCHAR) 825 if (ch == NOCHAR)
815 ch = next_char (); 826 ch = next_char ();
816 827
817 if (ch == NOCHAR) // TODO: improve 828 if (ch == NOCHAR) // TODO: improve
818 break; 829 break;
819 830
820 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 831 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
821 { 832 {
822 /* Read a text string from the input buffer */ 833 /* Read a text string from the input buffer */
823 uint32_t buf[BUFSIZ]; 834 uint32_t buf[BUFSIZ];
824 bool refreshnow = false; 835 bool refreshnow = false;
825 int nlines = 0; 836 int nlines = 0;
826 uint32_t *str = buf; 837 uint32_t *str = buf;
827 838
828 *str++ = ch; 839 *str++ = ch;
829 840
830 for (;;) 841 for (;;)
831 { 842 {
832 ch = next_char (); 843 ch = next_char ();
833 844
834 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 845 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
835 break; 846 break;
836 else 847 else
837 { 848 {
838 *str++ = ch; 849 *str++ = ch;
839 850
840 if (ch == '\n') 851 if (ch == '\n')
841 { 852 {
842 nlines++; 853 nlines++;
843 refresh_count++; 854 refresh_count++;
844 855
845 if (!(Options & Opt_jumpScroll) 856 if (!(Options & Opt_jumpScroll)
846 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
847 { 858 {
848 refreshnow = true; 859 refreshnow = true;
849 ch = NOCHAR; 860 ch = NOCHAR;
850 break; 861 break;
851 } 862 }
852 } 863 }
853 864
854 if (str >= buf + BUFSIZ) 865 if (str >= buf + BUFSIZ)
855 { 866 {
856 ch = NOCHAR; 867 ch = NOCHAR;
857 break; 868 break;
858 } 869 }
859 } 870 }
860 } 871 }
861 872
862 rxvt_scr_add_lines (this, buf, nlines, str - buf); 873 rxvt_scr_add_lines (this, buf, nlines, str - buf);
863 874
864 /* 875 /*
865 * If there have been a lot of new lines, then update the screen 876 * If there have been a lot of new lines, then update the screen
866 * What the heck I'll cheat and only refresh less than every page-full. 877 * What the heck I'll cheat and only refresh less than every page-full.
867 * the number of pages between refreshes is refresh_limit, which 878 * the number of pages between refreshes is refresh_limit, which
868 * is incremented here because we must be doing flat-out scrolling. 879 * is incremented here because we must be doing flat-out scrolling.
869 * 880 *
870 * refreshing should be correct for small scrolls, because of the 881 * refreshing should be correct for small scrolls, because of the
871 * time-out 882 * time-out
872 */ 883 */
873 if (refreshnow) 884 if (refreshnow)
874 { 885 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 886 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++; 887 refresh_limit++;
877 888
878 rxvt_scr_refresh (this, refresh_type); 889 rxvt_scr_refresh (this, refresh_type);
879 } 890 }
880 891
881 } 892 }
882 else 893 else
883 { 894 {
884 switch (ch) 895 switch (ch)
885 { 896 {
886 default: 897 default:
887 rxvt_process_nonprinting (this, ch); 898 rxvt_process_nonprinting (this, ch);
888 break; 899 break;
889 case C0_ESC: /* escape char */ 900 case C0_ESC: /* escape char */
890 rxvt_process_escape_seq (this); 901 rxvt_process_escape_seq (this);
891 break; 902 break;
892 /*case 0x9b: */ /* CSI */ 903 /*case 0x9b: */ /* CSI */
893 /* rxvt_process_csi_seq (this); */ 904 /* rxvt_process_csi_seq (this); */
894 } 905 }
895 906
896 ch = NOCHAR; 907 ch = NOCHAR;
897 } 908 }
898 } 909 }
899 } 910 }
900 911
901 flush (); 912 flush ();
902} 913}
903 914
904void 915void
… …
921#ifdef USE_XIM 932#ifdef USE_XIM
922 rxvt_IMSendSpot (this); 933 rxvt_IMSendSpot (this);
923#endif 934#endif
924 } 935 }
925 936
937 if (XPending (Xdisplay)) process_x_events ();
926 XFlush (Xdisplay); 938 XFlush (Xdisplay);
939 if (XPending (Xdisplay)) process_x_events ();
927} 940}
928 941
929/* rxvt_cmd_getc() - Return next input character */ 942/* rxvt_cmd_getc() - Return next input character */
930/* 943/*
931 * Return the next input character after first passing any keyboard input 944 * Return the next input character after first passing any keyboard input
… …
942 return c; 955 return c;
943 956
944 // incomplete sequences should occur rarely, still, a better solution 957 // incomplete sequences should occur rarely, still, a better solution
945 // would be preferred. either setjmp/longjmp or better design. 958 // would be preferred. either setjmp/longjmp or better design.
946 fcntl (R->cmd_fd, F_SETFL, 0); 959 fcntl (R->cmd_fd, F_SETFL, 0);
947 R->pty_fill (1); 960 R->pty_fill ();
948 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 961 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
949 } 962 }
950 963
951#if 0 964#if 0
952#define TIMEOUT_USEC 5000 965#define TIMEOUT_USEC 5000
… …
960 973
961 for (;;) { 974 for (;;) {
962 /* loop until we can return something */ 975 /* loop until we can return something */
963 976
964 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 977 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
965 rxvt_tt_write(aR_ NULL, 0); 978 R->tt_write(NULL, 0);
966 979
967#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 980#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
968 if (R->mouse_slip_wheel_speed) { 981 if (R->mouse_slip_wheel_speed) {
969 quick_timeout = 1; 982 quick_timeout = 1;
970 if (!R->mouse_slip_wheel_delay-- 983 if (!R->mouse_slip_wheel_delay--
… …
1006 quick_timeout |= R->want_full_refresh; 1019 quick_timeout |= R->want_full_refresh;
1007#endif 1020#endif
1008#endif 1021#endif
1009} 1022}
1010 1023
1024void
1025rxvt_term::pointer_unblank ()
1026{
1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1028 rxvt_recolour_cursor (this);
1029
1030#ifdef POINTER_BLANK
1031 hidden_pointer = 0;
1032
1033 if (Options & Opt_pointerBlank)
1034 pointer_ev.start (NOW + pointerBlankDelay);
1035#endif
1036}
1037
1011#ifdef POINTER_BLANK 1038#ifdef POINTER_BLANK
1012void 1039void
1013rxvt_term::pointer_unblank () 1040rxvt_term::pointer_blank ()
1014{ 1041{
1042 pointer_ev.stop ();
1043
1015 if (!(Options & Opt_pointerBlank)) 1044 if (!(Options & Opt_pointerBlank))
1016 return; 1045 return;
1017 1046
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); 1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1034 XFlush (Xdisplay); 1048 XFlush (Xdisplay);
1035 1049
1036 hidden_pointer = 1; 1050 hidden_pointer = 1;
1037} 1051}
1038 1052
1039void 1053void
1040rxvt_term::pointer_cb (time_watcher &w) 1054rxvt_term::pointer_cb (time_watcher &w)
1041{ 1055{
1056 SET_R (this);
1057
1042 pointer_blank (); 1058 pointer_blank ();
1043} 1059}
1044#endif 1060#endif
1045 1061
1046/* INTPROTO */ 1062/* INTPROTO */
… …
1100 fprintf(stderr, "]: <%d>, %d/%d\n", 1116 fprintf(stderr, "]: <%d>, %d/%d\n",
1101 button_number, 1117 button_number,
1102 x + 1, 1118 x + 1,
1103 y + 1); 1119 y + 1);
1104#else 1120#else
1105 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1121 R->tt_printf("\033[M%c%c%c",
1106 (32 + button_number + key_state), 1122 (32 + button_number + key_state),
1107 (32 + x + 1), 1123 (32 + x + 1),
1108 (32 + y + 1)); 1124 (32 + y + 1));
1109#endif 1125#endif
1110} 1126}
… …
1243 break; 1259 break;
1244 1260
1245 case ClientMessage: 1261 case ClientMessage:
1246 if (ev->xclient.format == 32 1262 if (ev->xclient.format == 32
1247 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1263 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1248 exit(EXIT_SUCCESS); 1264 R->destroy ();
1249#ifdef OFFIX_DND 1265#ifdef OFFIX_DND
1250 /* OffiX Dnd (drag 'n' drop) protocol */ 1266 /* OffiX Dnd (drag 'n' drop) protocol */
1251 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1267 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1252 && (ev->xclient.data.l[0] == DndFile 1268 && (ev->xclient.data.l[0] == DndFile
1253 || ev->xclient.data.l[0] == DndDir 1269 || ev->xclient.data.l[0] == DndDir
1254 || ev->xclient.data.l[0] == DndLink)) { 1270 || ev->xclient.data.l[0] == DndLink)) {
1255 /* Get Dnd data */ 1271 /* Get Dnd data */
1256 Atom ActualType; 1272 Atom ActualType;
… …
1288 * in the GraphicsExpose parts, which means that after each refresh, 1304 * in the GraphicsExpose parts, which means that after each refresh,
1289 * we need to wait for the graphics expose or Noexpose events, 1305 * we need to wait for the graphics expose or Noexpose events,
1290 * which ought to make things real slow! 1306 * which ought to make things real slow!
1291 */ 1307 */
1292 case VisibilityNotify: 1308 case VisibilityNotify:
1293 switch (ev->xvisibility.state) { 1309 switch (ev->xvisibility.state)
1310 {
1294 case VisibilityUnobscured: 1311 case VisibilityUnobscured:
1295 R->refresh_type = FAST_REFRESH; 1312 R->refresh_type = FAST_REFRESH;
1296 break; 1313 break;
1297 case VisibilityPartiallyObscured: 1314 case VisibilityPartiallyObscured:
1298 R->refresh_type = SLOW_REFRESH; 1315 R->refresh_type = SLOW_REFRESH;
1299 break; 1316 break;
1300 default: 1317 default:
1301 R->refresh_type = NO_REFRESH; 1318 R->refresh_type = NO_REFRESH;
1302 break; 1319 break;
1303 } 1320 }
1304 break; 1321 break;
1305 1322
1306 case FocusIn: 1323 case FocusIn:
1307 if (!R->TermWin.focus) { 1324 if (!R->TermWin.focus) {
1308 R->TermWin.focus = 1; 1325 R->TermWin.focus = 1;
… …
1651 */ 1668 */
1652 if ((R->scrollBar.style == R_SB_NEXT 1669 if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_upButton(ev->y)) 1670 && scrollbarnext_upButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT 1671 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_upButton(ev->y))) 1672 && scrollbarrxvt_upButton(ev->y)))
1656 rxvt_tt_printf(aR_ "\033[A"); 1673 R->tt_printf("\033[A");
1657 else if ((R->scrollBar.style == R_SB_NEXT 1674 else if ((R->scrollBar.style == R_SB_NEXT
1658 && scrollbarnext_dnButton(ev->y)) 1675 && scrollbarnext_dnButton(ev->y))
1659 || (R->scrollBar.style == R_SB_RXVT 1676 || (R->scrollBar.style == R_SB_RXVT
1660 && scrollbarrxvt_dnButton(ev->y))) 1677 && scrollbarrxvt_dnButton(ev->y)))
1661 rxvt_tt_printf(aR_ "\033[B"); 1678 R->tt_printf("\033[B");
1662 else 1679 else
1663 switch (ev->button) { 1680 switch (ev->button) {
1664 case Button2: 1681 case Button2:
1665 rxvt_tt_printf(aR_ "\014"); 1682 R->tt_printf("\014");
1666 break; 1683 break;
1667 case Button1: 1684 case Button1:
1668 rxvt_tt_printf(aR_ "\033[6~"); 1685 R->tt_printf("\033[6~");
1669 break; 1686 break;
1670 case Button3: 1687 case Button3:
1671 rxvt_tt_printf(aR_ "\033[5~"); 1688 R->tt_printf("\033[5~");
1672 break; 1689 break;
1673 } 1690 }
1674 } 1691 }
1675 else 1692 else
1676#endif /* NO_SCROLLBAR_REPORT */ 1693#endif /* NO_SCROLLBAR_REPORT */
… …
2158rxvt_process_nonprinting(pR_ unsigned char ch) 2175rxvt_process_nonprinting(pR_ unsigned char ch)
2159{ 2176{
2160 switch (ch) { 2177 switch (ch) {
2161 case C0_ENQ: /* terminal Status */ 2178 case C0_ENQ: /* terminal Status */
2162 if (R->rs[Rs_answerbackstring]) 2179 if (R->rs[Rs_answerbackstring])
2163 rxvt_tt_write(aR_ 2180 R->tt_write(
2164 (const unsigned char *)R->rs[Rs_answerbackstring], 2181 (const unsigned char *)R->rs[Rs_answerbackstring],
2165 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2182 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2166 else 2183 else
2167 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2184 R->tt_write((unsigned char *)VT100_ANS,
2168 (unsigned int)STRLEN(VT100_ANS)); 2185 (unsigned int)STRLEN(VT100_ANS));
2169 break; 2186 break;
2170 case C0_BEL: /* bell */ 2187 case C0_BEL: /* bell */
2171 rxvt_scr_bell(aR); 2188 rxvt_scr_bell(aR);
2172 break; 2189 break;
… …
2235 row = rxvt_cmd_getc(aR) - ' '; 2252 row = rxvt_cmd_getc(aR) - ' ';
2236 col = rxvt_cmd_getc(aR) - ' '; 2253 col = rxvt_cmd_getc(aR) - ' ';
2237 rxvt_scr_gotorc(aR_ row, col, 0); 2254 rxvt_scr_gotorc(aR_ row, col, 0);
2238 break; 2255 break;
2239 case 'Z': /* identify the terminal type */ 2256 case 'Z': /* identify the terminal type */
2240 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2257 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2241 break; 2258 break;
2242 case '<': /* turn off VT52 mode */ 2259 case '<': /* turn off VT52 mode */
2243 PrivMode(0, PrivMode_vt52); 2260 PrivMode(0, PrivMode_vt52);
2244 break; 2261 break;
2245 case 'F': /* use special graphics character set */ 2262 case 'F': /* use special graphics character set */
… …
2352 rxvt_process_dcs_seq(aR); 2369 rxvt_process_dcs_seq(aR);
2353 break; 2370 break;
2354 2371
2355 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2372 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2356 case C1_SCI: /* ESC Z */ 2373 case C1_SCI: /* ESC Z */
2357 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2374 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2358 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2375 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2359 break; /* steal obsolete ESC [ c */ 2376 break; /* steal obsolete ESC [ c */
2360 2377
2361 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2378 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2362 case C1_CSI: /* ESC [ */ 2379 case C1_CSI: /* ESC [ */
… …
2483 */ 2500 */
2484 if (priv) { 2501 if (priv) {
2485 switch (priv) { 2502 switch (priv) {
2486 case '>': 2503 case '>':
2487 if (ch == CSI_DA) /* secondary device attributes */ 2504 if (ch == CSI_DA) /* secondary device attributes */
2488 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2505 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2489 break; 2506 break;
2490 case '?': 2507 case '?':
2491 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2508 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2492 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2509 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2493 break; 2510 break;
… …
2600 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2617 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2601 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2618 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2602 break; 2619 break;
2603 2620
2604 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2621 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2605 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2622 R->tt_write((const unsigned char *)VT100_ANS,
2606 (unsigned int)(sizeof(VT100_ANS) - 1)); 2623 (unsigned int)(sizeof(VT100_ANS) - 1));
2607 break; 2624 break;
2608 2625
2609 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2626 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2610 rxvt_process_sgr_mode(aR_ nargs, arg); 2627 rxvt_process_sgr_mode(aR_ nargs, arg);
2611 break; 2628 break;
2612 2629
2613 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2630 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2614 switch (arg[0]) { 2631 switch (arg[0]) {
2615 case 5: /* DSR requested */ 2632 case 5: /* DSR requested */
2616 rxvt_tt_printf(aR_ "\033[0n"); 2633 R->tt_printf("\033[0n");
2617 break; 2634 break;
2618 case 6: /* CPR requested */ 2635 case 6: /* CPR requested */
2619 rxvt_scr_report_position(aR); 2636 rxvt_scr_report_position(aR);
2620 break; 2637 break;
2621#if defined (ENABLE_DISPLAY_ANSWER) 2638#if defined (ENABLE_DISPLAY_ANSWER)
2622 case 7: /* unofficial extension */ 2639 case 7: /* unofficial extension */
2623 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2640 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2624 break; 2641 break;
2625#endif 2642#endif
2626 case 8: /* unofficial extension */ 2643 case 8: /* unofficial extension */
2627 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2644 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2628 break; 2645 break;
… …
2697 break; 2714 break;
2698#endif 2715#endif
2699 2716
2700 case CSI_78: /* DECREQTPARM */ 2717 case CSI_78: /* DECREQTPARM */
2701 if (arg[0] == 0 || arg[0] == 1) 2718 if (arg[0] == 0 || arg[0] == 1)
2702 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2719 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2703 /* FALLTHROUGH */ 2720 /* FALLTHROUGH */
2704 2721
2705 default: 2722 default:
2706 break; 2723 break;
2707 } 2724 }
… …
2761 /* 2778 /*
2762 * reports - some output format copied from XTerm 2779 * reports - some output format copied from XTerm
2763 */ 2780 */
2764 case 11: /* report window state */ 2781 case 11: /* report window state */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2782 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2766 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2783 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2767 break; 2784 break;
2768 case 13: /* report window position */ 2785 case 13: /* report window position */
2769 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2786 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2770 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2787 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2771 -wattr.border_width, -wattr.border_width, 2788 -wattr.border_width, -wattr.border_width,
2772 &x, &y, &wdummy); 2789 &x, &y, &wdummy);
2773 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2790 R->tt_printf("\033[3;%d;%dt", x, y);
2774 break; 2791 break;
2775 case 14: /* report window size (pixels) */ 2792 case 14: /* report window size (pixels) */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2777 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2794 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2778 break; 2795 break;
2779 case 18: /* report window size (chars) */ 2796 case 18: /* report window size (chars) */
2780 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2797 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2781 break; 2798 break;
2782#if 0 /* XXX: currently disabled due to security concerns */ 2799#if 0 /* XXX: currently disabled due to security concerns */
2783 case 20: /* report icon label */ 2800 case 20: /* report icon label */
2784 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2801 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2785 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2802 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2803 break;
2787 case 21: /* report window title */ 2804 case 21: /* report window title */
2788 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2805 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2789 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2806 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2790 break; 2807 break;
2791#endif 2808#endif
2792 } 2809 }
2793} 2810}
2794#endif 2811#endif
… …
3337{ 3354{
3338 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3355 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3339 3356
3340#ifndef RXVT_GRAPHICS 3357#ifndef RXVT_GRAPHICS
3341 if (cmd == 'Q') { /* query graphics */ 3358 if (cmd == 'Q') { /* query graphics */
3342 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3359 R->tt_printf("\033G0\n"); /* no graphics */
3343 return; 3360 return;
3344 } 3361 }
3345/* swallow other graphics sequences until terminating ':' */ 3362/* swallow other graphics sequences until terminating ':' */
3346 do 3363 do
3347 ch = rxvt_cmd_getc(aR); 3364 ch = rxvt_cmd_getc(aR);
… …
3350 unsigned int nargs; 3367 unsigned int nargs;
3351 int args[NGRX_PTS]; 3368 int args[NGRX_PTS];
3352 unsigned char *text = NULL; 3369 unsigned char *text = NULL;
3353 3370
3354 if (cmd == 'Q') { /* query graphics */ 3371 if (cmd == 'Q') { /* query graphics */
3355 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3372 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3356 return; 3373 return;
3357 } 3374 }
3358 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3375 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3359 int neg; 3376 int neg;
3360 3377
… …
3394 3411
3395/* 3412/*
3396 * Send printf() formatted output to the command. 3413 * Send printf() formatted output to the command.
3397 * Only use for small amounts of data. 3414 * Only use for small amounts of data.
3398 */ 3415 */
3399/* EXTPROTO */
3400void 3416void
3401rxvt_tt_printf(pR_ const char *fmt,...) 3417rxvt_term::tt_printf (const char *fmt,...)
3402{ 3418{
3403 va_list arg_ptr; 3419 va_list arg_ptr;
3404 unsigned char buf[256]; 3420 unsigned char buf[256];
3405 3421
3406 va_start(arg_ptr, fmt); 3422 va_start (arg_ptr, fmt);
3407 vsprintf((char *)buf, fmt, arg_ptr); 3423 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3408 va_end(arg_ptr); 3424 va_end (arg_ptr);
3409 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3425 tt_write (buf, STRLEN (buf));
3410} 3426}
3411 3427
3412/* ---------------------------------------------------------------------- */ 3428/* ---------------------------------------------------------------------- */
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, 3429/* 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. 3430 * or generated by us in response to a query ESC sequence.
3418 */ 3431 */
3419/* EXTPROTO */
3420void 3432void
3421rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3433rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3422{ 3434{
3423#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3435 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 3436
3431 if (R->v_bufstr == NULL && len > 0) { 3437 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 } 3438 {
3439 if (v_buflen == 0)
3440 {
3441 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3442 if (written == len)
3443 return;
3441 3444
3442 /* 3445 data += written;
3443 * Append to the block we already have. Always doing this simplifies the 3446 len -= written;
3444 * code, and isn't too bad, either. If this is a short block, it isn't 3447 }
3445 * too expensive, and if this is a long block, we won't be able to write 3448
3446 * it all anyway. 3449
3447 */ 3450 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3448 if (len > 0) { 3451
3449 if (v_bufend < v_bufptr + len) { /* run out of room */ 3452 memcpy (v_buffer + v_buflen, data, len);
3450 if (v_bufstr != v_buffer) { 3453 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 } 3454 }
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 3455
3463 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3456 for (;;)
3464 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3457 {
3465 /* save across realloc */ 3458 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3466 if (v_buffer) { 3459
3467 v_bufstr = v_buffer; 3460 if (written > 0)
3468 v_bufptr = v_buffer + size; 3461 {
3469 v_bufend = v_buffer + reallocto; 3462 v_buflen -= written;
3470 } else { /* no memory: ignore entire write request */ 3463
3471 rxvt_print_error("data loss: cannot allocate buffer space"); 3464 if (v_buflen == 0)
3472 v_buffer = v_bufstr; /* restore clobbered pointer */ 3465 {
3473 } 3466 free (v_buffer);
3467 v_buffer = 0;
3468 v_buflen = 0;
3469
3470 pty_ev.set (EVENT_READ);
3471 return;
3472 }
3473
3474 memmove (v_buffer, v_buffer + written, v_buflen);
3475 }
3476 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3477 // original code just ignores this...
3478 destroy ();
3479 else
3480 {
3481 pty_ev.set (EVENT_READ | EVENT_WRITE);
3482 return;
3483 }
3474 } 3484 }
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} 3485}
3486
3528/*----------------------- end-of-file (C source) -----------------------*/ 3487/*----------------------- end-of-file (C source) -----------------------*/
3529 3488

Diff Legend

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