ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.4 by pcg, Tue Nov 25 15:25:16 2003 UTC vs.
Revision 1.17 by pcg, Thu Dec 18 00:29:29 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.4 2003/11/25 15:25:16 pcg Exp $ 4 * $Id: command.C,v 1.17 2003/12/18 00:29:29 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>
… …
61 unsigned int newlen; 61 unsigned int newlen;
62 KeySym keysym; 62 KeySym keysym;
63#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
65#endif 65#endif
66#ifdef USE_XIM
67 int valid_keysym; 66 int valid_keysym;
68#endif
69 unsigned char *kbuf = R->kbuf; 67 unsigned char *kbuf = R->kbuf;
70 68
71/* 69/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
… …
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 77 meta = (ev->state & R->ModMetaMask);
78
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 79 if (R->numlock_state || (ev->state & R->ModNumLockMask))
80 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 81 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 83 }
84
85 kbuf[0] = 0;
86
84#ifdef USE_XIM 87#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 88 if (R->Input_Context)
89 {
86 Status status_return; 90 Status status_return;
87 91
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 93 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 94 KBUFSZ, &keysym, &status_return);
92#else 95#else
96 wchar_t wkbuf[KBUFSZ + 1];
97
98 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 99 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 100 KBUFSZ, &keysym, &status_return);
101
102 if (status_return == XLookupChars
103 || status_return == XLookupBoth)
104 {
105 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
107 }
108 else
109 len = 0;
95#endif 110#endif
96 valid_keysym = ((status_return == XLookupKeySym) 111 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 112 || status_return == XLookupBoth;
113 }
98 } else { 114 else
115#endif
116 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 117 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 118 valid_keysym = !len;
102 } 119 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 120
120#ifdef USE_XIM
121 if (valid_keysym) 121 if (valid_keysym)
122#endif
123 { 122 {
124/* for some backwards compatibility */ 123/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 124#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 125# ifdef HOTKEY_CTRL
127 if (ctrl) { 126 if (ctrl)
128# else 127# else
129 if (meta) { 128 if (meta)
130# endif 129# endif
130 {
131 if (keysym == R->ks_bigfont) { 131 if (keysym == R->ks_bigfont)
132 {
132 rxvt_change_font(aR_ 0, FONT_UP); 133 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 134 return;
135 }
134 } else if (keysym == R->ks_smallfont) { 136 else if (keysym == R->ks_smallfont)
137 {
135 rxvt_change_font(aR_ 0, FONT_DN); 138 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 139 return;
137 } 140 }
138 } 141 }
139#endif 142#endif
140 143
141 if (R->TermWin.saveLines) { 144 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 145#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 146 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 240 /* escape prefix */
238 if (meta) 241 if (meta)
239# ifdef META8_OPTION 242# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 243 if (R->meta_char == C0_ESC)
241# endif 244# endif
242 rxvt_tt_write(aR_ &ch, 1); 245 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 246 R->tt_write (kbuf0, l);
244 return; 247 return;
245 } else 248 } else
246#endif 249#endif
247 { 250 {
248 newlen = 1; 251 newlen = 1;
… …
572 if (R->greek_mode) 575 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 576 len = greek_xlat(kbuf, len);
574#endif 577#endif
575 /* nil */ ; 578 /* nil */ ;
576 } 579 }
577 } 580 }
578 581
579 if (len <= 0) 582 if (len <= 0)
580 return; /* not mapped */ 583 return; /* not mapped */
581 584
582 if (R->Options & Opt_scrollTtyKeypress) 585 if (R->Options & Opt_scrollTtyKeypress)
… …
605 && (R->meta_char == C0_ESC) 608 && (R->meta_char == C0_ESC)
606#endif 609#endif
607 ) { 610 ) {
608 const unsigned char ch = C0_ESC; 611 const unsigned char ch = C0_ESC;
609 612
610 rxvt_tt_write(aR_ &ch, 1); 613 R->tt_write(&ch, 1);
611 } 614 }
612#ifdef DEBUG_CMD 615#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 616 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 617 char *p;
615 int i; 618 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 621 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 622 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 623 fprintf(stderr, "'\n");
621 } 624 }
622#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 626 R->tt_write(kbuf, (unsigned int)len);
624} 627}
625/*}}} */ 628/*}}} */
626 629
627#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
656 return 0; 659 return 0;
657} 660}
658#endif /* MENUBAR_MAX */ 661#endif /* MENUBAR_MAX */
659 662
660void 663void
664rxvt_term::flush ()
665{
666#ifdef TRANSPARENT
667 if (want_full_refresh)
668 {
669 want_full_refresh = 0;
670 rxvt_scr_clear (this);
671 rxvt_scr_touch (this, False);
672 want_refresh = 1;
673 }
674#endif
675
676 if (want_refresh)
677 {
678 rxvt_scr_refresh (this, refresh_type);
679 rxvt_scrollbar_show (this, 1);
680#ifdef USE_XIM
681 rxvt_IMSendSpot (this);
682#endif
683 }
684
685 XFlush (Xdisplay);
686#if 0
687 if (XPending (Xdisplay)) process_x_events ();
688 if (XPending (Xdisplay)) process_x_events ();
689#endif
690}
691
692void
693rxvt_term::check_cb (check_watcher &w)
694{
695 SET_R (this);
696
697 flush ();
698}
699
700void
661rxvt_term::process_x_events () 701rxvt_term::process_x_events ()
662{ 702{
663 do 703 do
664 { 704 {
665 XEvent xev; 705 XEvent xev;
666 706
667 XNextEvent (Xdisplay, &xev); 707 XNextEvent (Xdisplay, &xev);
708
668#if defined(CURSOR_BLINK) 709#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 710 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) { 711 && xev.type == KeyPress)
712 {
671 if (hidden_cursor) { 713 if (hidden_cursor)
714 {
672 hidden_cursor = 0; 715 hidden_cursor = 0;
673 want_refresh = 1; 716 want_refresh = 1;
674 } 717 }
675 want_keypress_time = 1; 718
719 blink_ev.start (NOW + BLINK_INTERVAL);
676 } 720 }
677#endif 721#endif
678 722
679#if defined(POINTER_BLANK) 723#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 724 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) { 725 && (pointerBlankDelay > 0))
726 {
682 if (xev.type == MotionNotify 727 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 728 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 729 || xev.type == ButtonRelease)
685 if (hidden_pointer) 730 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 731 pointer_unblank ();
687 want_motion_time = 1; 732
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 733 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 734 pointer_blank ();
691 } 735 }
692#endif 736#endif
693 737
694#ifdef USE_XIM 738#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 739 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 740#endif
… …
698 } 742 }
699 while (XPending (Xdisplay)); 743 while (XPending (Xdisplay));
700} 744}
701 745
702void 746void
747rxvt_term::blink_cb (time_watcher &w)
748{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor;
753 want_refresh = 1;
754}
755
756void
703rxvt_term::x_cb (io_watcher &w, short revents) 757rxvt_term::x_cb (io_watcher &w, short revents)
704{ 758{
759 SET_R (this);
760
705 process_x_events (); 761 process_x_events ();
762}
706 763
707 flush (); 764bool
765rxvt_term::pty_fill ()
766{
767 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
768
769 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n;
772
773 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
774
775 if (n > 0)
776 {
777 cmdbuf_endp += n;
778 return true;
779 }
780 else if (n < 0 && errno != EAGAIN)
781 destroy ();
782
783 return false;
784}
785
786void
787rxvt_term::pty_cb (io_watcher &w, short revents)
788{
789 SET_R (this);
790
791 if (revents & EVENT_WRITE)
792 tt_write (0, 0);
793 else if (revents & EVENT_READ)
794 {
795 bool flag = true;
796
797 // loop, but don't allow a single term to monopolize us
798 // the number of loops is fully arbitrary, and thus wrong
799 while (flag && pty_fill ())
800 {
801 if (!seen_input)
802 {
803 seen_input = 1;
804 /* once we know the shell is running, send the screen size. Again! */
805 tt_winch ();
806 }
807
808 uint32_t ch = NOCHAR;
809
810 for (;;)
811 {
812 if (ch == NOCHAR)
813 ch = next_char ();
814
815 if (ch == NOCHAR) // TODO: improve
816 break;
817
818 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
819 {
820 /* Read a text string from the input buffer */
821 uint32_t buf[BUFSIZ];
822 bool refreshnow = false;
823 int nlines = 0;
824 uint32_t *str = buf;
825
826 *str++ = ch;
827
828 for (;;)
829 {
830 ch = next_char ();
831
832 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
833 break;
834 else
835 {
836 *str++ = ch;
837
838 if (ch == '\n')
839 {
840 nlines++;
841 refresh_count++;
842
843 if (!(Options & Opt_jumpScroll)
844 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
845 {
846 refreshnow = true;
847 flag = false;
848 ch = NOCHAR;
849 break;
850 }
851 }
852
853 if (str >= buf + BUFSIZ)
854 {
855 ch = NOCHAR;
856 break;
857 }
858 }
859 }
860
861 rxvt_scr_add_lines (this, buf, nlines, str - buf);
862
863 /*
864 * If there have been a lot of new lines, then update the screen
865 * What the heck I'll cheat and only refresh less than every page-full.
866 * the number of pages between refreshes is refresh_limit, which
867 * is incremented here because we must be doing flat-out scrolling.
868 *
869 * refreshing should be correct for small scrolls, because of the
870 * time-out
871 */
872 if (refreshnow)
873 {
874 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
875 refresh_limit++;
876
877 rxvt_scr_refresh (this, refresh_type);
878 }
879
880 }
881 else
882 {
883 switch (ch)
884 {
885 default:
886 rxvt_process_nonprinting (this, ch);
887 break;
888 case C0_ESC: /* escape char */
889 rxvt_process_escape_seq (this);
890 break;
891 /*case 0x9b: */ /* CSI */
892 /* rxvt_process_csi_seq (this); */
893 }
894
895 ch = NOCHAR;
896 }
897 }
898 }
899 }
708} 900}
709 901
710// read the next character, currently handles UTF-8 902// read the next character, currently handles UTF-8
711// will probably handle all sorts of other stuff in the future 903// will probably handle all sorts of other stuff in the future
712uint32_t 904uint32_t
… …
760 } 952 }
761 953
762 return NOCHAR; 954 return NOCHAR;
763} 955}
764 956
765bool
766rxvt_term::pty_fill (size_t count)
767{
768 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
769
770 memmove (cmdbuf_base, cmdbuf_ptr, n);
771 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp = cmdbuf_ptr + n;
773
774 n = read (cmd_fd, cmdbuf_endp, count);
775
776 if (n > 0)
777 {
778 cmdbuf_endp += n;
779 return true;
780 }
781 else if (n < 0 && errno == EAGAIN)
782 return false;
783
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786}
787
788void
789rxvt_term::pty_cb (io_watcher &w, short revents)
790{
791 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
792 {
793 /* once we know the shell is running, send the screen size. Again! */
794 //ch = rxvt_cmd_getc(aR); /* wait for something */
795 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
796
797 uint32_t ch = NOCHAR;
798
799 for (;;)
800 {
801 if (ch == NOCHAR)
802 ch = next_char ();
803
804 if (ch == NOCHAR) // TODO: improve
805 break;
806
807 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
808 {
809 /* Read a text string from the input buffer */
810 uint32_t buf[BUFSIZ];
811 bool refreshnow = false;
812 int nlines = 0;
813 uint32_t *str = buf;
814
815 *str++ = ch;
816
817 for (;;)
818 {
819 ch = next_char ();
820
821 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
822 break;
823 else
824 {
825 *str++ = ch;
826
827 if (ch == '\n')
828 {
829 nlines++;
830 refresh_count++;
831
832 if (!(Options & Opt_jumpScroll)
833 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
834 {
835 refreshnow = true;
836 ch = NOCHAR;
837 break;
838 }
839 }
840
841 if (str >= buf + BUFSIZ)
842 {
843 ch = NOCHAR;
844 break;
845 }
846 }
847 }
848
849 rxvt_scr_add_lines (this, buf, nlines, str - buf);
850
851 /*
852 * If there have been a lot of new lines, then update the screen
853 * What the heck I'll cheat and only refresh less than every page-full.
854 * the number of pages between refreshes is refresh_limit, which
855 * is incremented here because we must be doing flat-out scrolling.
856 *
857 * refreshing should be correct for small scrolls, because of the
858 * time-out
859 */
860 if (refreshnow)
861 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++;
864
865 rxvt_scr_refresh (this, refresh_type);
866 }
867
868 }
869 else
870 {
871 switch (ch)
872 {
873 default:
874 rxvt_process_nonprinting (this, ch);
875 break;
876 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this);
878 break;
879 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */
881 }
882
883 ch = NOCHAR;
884 }
885 }
886 }
887
888 flush ();
889}
890
891void
892rxvt_term::flush ()
893{
894#ifdef TRANSPARENT
895 if (want_full_refresh)
896 {
897 want_full_refresh = 0;
898 rxvt_scr_clear (this);
899 rxvt_scr_touch (this, False);
900 want_refresh = 1;
901 }
902#endif
903
904 if (want_refresh)
905 {
906 rxvt_scr_refresh (this, refresh_type);
907 rxvt_scrollbar_show (this, 1);
908#ifdef USE_XIM
909 rxvt_IMSendSpot (this);
910#endif
911 }
912
913 XFlush (Xdisplay);
914}
915
916/* rxvt_cmd_getc() - Return next input character */ 957/* rxvt_cmd_getc() - Return next input character */
917/* 958/*
918 * Return the next input character after first passing any keyboard input 959 * Return the next input character after first passing any keyboard input
919 * to the command. 960 * to the command.
920 */ 961 */
… …
929 return c; 970 return c;
930 971
931 // incomplete sequences should occur rarely, still, a better solution 972 // incomplete sequences should occur rarely, still, a better solution
932 // would be preferred. either setjmp/longjmp or better design. 973 // would be preferred. either setjmp/longjmp or better design.
933 fcntl (R->cmd_fd, F_SETFL, 0); 974 fcntl (R->cmd_fd, F_SETFL, 0);
934 R->pty_fill (1); 975 R->pty_fill ();
935 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 976 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936 } 977 }
937 978
979#if 0
938#define TIMEOUT_USEC 5000 980#define TIMEOUT_USEC 5000
939 fd_set readfds; 981 fd_set readfds;
940 int quick_timeout, select_res; 982 int quick_timeout, select_res;
941 int want_motion_time, want_keypress_time; 983 int want_motion_time, want_keypress_time;
942 struct timeval value; 984 struct timeval value;
… …
946 988
947 for (;;) { 989 for (;;) {
948 /* loop until we can return something */ 990 /* loop until we can return something */
949 991
950 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 992 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951 rxvt_tt_write(aR_ NULL, 0); 993 R->tt_write(NULL, 0);
952
953#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
954 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
955#endif
956#if defined(CURSOR_BLINK)
957 want_keypress_time = 0;
958#endif
959#if defined(POINTER_BLANK)
960 want_motion_time = 0;
961#endif
962
963 if (XPending (R->Xdisplay))
964 {
965 R->process_x_events ();
966
967 /* in case button actions pushed chars to cmdbuf */
968 if (R->cmdbuf_ptr < R->cmdbuf_endp)
969 return *R->cmdbuf_ptr++;
970 }
971
972#if defined(CURSOR_BLINK)
973 if (want_keypress_time) {
974 (void)gettimeofday(&tp, NULL);
975 R->lastcursorchange.tv_sec = tp.tv_sec;
976 R->lastcursorchange.tv_usec = tp.tv_usec;
977 }
978#endif
979#if defined(POINTER_BLANK)
980 if (want_motion_time) {
981 if (!tp.tv_sec)
982 (void)gettimeofday(&tp, NULL);
983 R->lastmotion.tv_sec = tp.tv_sec;
984 R->lastmotion.tv_usec = tp.tv_usec;
985 }
986#endif
987
988/*
989 * the command input buffer is empty and we have no pending X events
990 */
991 quick_timeout = 0;
992 994
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 995#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (R->mouse_slip_wheel_speed) { 996 if (R->mouse_slip_wheel_speed) {
995 quick_timeout = 1; 997 quick_timeout = 1;
996 if (!R->mouse_slip_wheel_delay-- 998 if (!R->mouse_slip_wheel_delay--
… …
1026 R->want_refresh = 1; 1028 R->want_refresh = 1;
1027 } 1029 }
1028 } 1030 }
1029#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1031#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030 1032
1031 FD_ZERO(&readfds);
1032 FD_SET(R->cmd_fd, &readfds);
1033 FD_SET(R->Xfd, &readfds);
1034 value.tv_usec = TIMEOUT_USEC;
1035 value.tv_sec = 0;
1036
1037 if (!R->TermWin.mapped)
1038 quick_timeout = 0;
1039 else {
1040 quick_timeout |= R->want_refresh;
1041#ifdef TRANSPARENT 1033#ifdef TRANSPARENT
1042 quick_timeout |= R->want_full_refresh; 1034 quick_timeout |= R->want_full_refresh;
1043#endif 1035#endif
1044 }
1045
1046#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1047 {
1048 int set_quick_timeout = 0;
1049 long csdiff, psdiff;
1050
1051#define BLINK_TIME 500000L
1052 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1053# if defined(CURSOR_BLINK)
1054 if (R->Options & Opt_cursorBlink) {
1055 if (!tp.tv_sec) /* didn't get it before so get it now */
1056 (void)gettimeofday(&tp, NULL);
1057
1058 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1059 + tp.tv_usec - R->lastcursorchange.tv_usec;
1060 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1061 R->lastcursorchange.tv_sec = tp.tv_sec;
1062 R->lastcursorchange.tv_usec = tp.tv_usec;
1063 R->hidden_cursor = !R->hidden_cursor;
1064 csdiff = 0;
1065 } else
1066 csdiff = BLINK_TIME - csdiff;
1067 set_quick_timeout = 1;
1068 }
1069# endif 1036#endif
1070# if defined(POINTER_BLANK)
1071 /*
1072 * If we haven't moved the pointer for a while
1073 */
1074 if ((R->Options & Opt_pointerBlank)
1075 && (R->pointerBlankDelay > 0)
1076 && (R->hidden_pointer == 0)) {
1077 long pdelay;
1078
1079 if (!tp.tv_sec) /* didn't get it before so get it now */
1080 (void)gettimeofday(&tp, NULL);
1081 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1082 + tp.tv_usec - R->lastmotion.tv_usec;
1083 pdelay = R->pointerBlankDelay * 1000000L;
1084 if (psdiff >= pdelay)
1085 rxvt_pointer_blank(aR);
1086 else {
1087 set_quick_timeout = 1;
1088 psdiff = pdelay - psdiff;
1089 }
1090 }
1091# endif
1092 if (!quick_timeout && set_quick_timeout) {
1093 MIN_IT(csdiff, psdiff);
1094 value.tv_sec = csdiff / 1000000L;
1095 value.tv_usec = csdiff % 1000000L;
1096 quick_timeout = 1;
1097 }
1098 }
1099#endif
1100
1101 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1102 (quick_timeout ? &value : NULL))) == 0) {
1103 /* select statement timed out - we're not hard and fast scrolling */
1104 R->refresh_limit = 1;
1105 }
1106#if defined(CURSOR_BLINK)
1107 if (R->Options & Opt_cursorBlink)
1108 R->want_refresh = 1;
1109#endif
1110 }
1111} 1037}
1112 1038
1113/* EXTPROTO */
1114void 1039void
1115rxvt_pointer_unblank(pR) 1040rxvt_term::pointer_unblank ()
1116{ 1041{
1117 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118 rxvt_recolour_cursor(aR); 1043 rxvt_recolour_cursor (this);
1044
1119#ifdef POINTER_BLANK 1045#ifdef POINTER_BLANK
1120 R->hidden_pointer = 0; 1046 hidden_pointer = 0;
1121 if (R->pointerBlankDelay > 0) {
1122 struct timeval tp;
1123 1047
1124 (void)gettimeofday(&tp, NULL); 1048 if (Options & Opt_pointerBlank)
1125 R->lastmotion.tv_sec = tp.tv_sec; 1049 pointer_ev.start (NOW + pointerBlankDelay);
1126 R->lastmotion.tv_usec = tp.tv_usec;
1127 }
1128#endif 1050#endif
1129} 1051}
1130 1052
1131#ifdef POINTER_BLANK 1053#ifdef POINTER_BLANK
1132/* INTPROTO */
1133void 1054void
1134rxvt_pointer_blank(pR) 1055rxvt_term::pointer_blank ()
1135{ 1056{
1057 pointer_ev.stop ();
1058
1059 if (!(Options & Opt_pointerBlank))
1060 return;
1061
1136 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137 XFlush(R->Xdisplay); 1063 XFlush (Xdisplay);
1064
1138 R->hidden_pointer = 1; 1065 hidden_pointer = 1;
1066}
1067
1068void
1069rxvt_term::pointer_cb (time_watcher &w)
1070{
1071 SET_R (this);
1072
1073 pointer_blank ();
1139} 1074}
1140#endif 1075#endif
1141 1076
1142/* INTPROTO */ 1077/* INTPROTO */
1143void 1078void
… …
1196 fprintf(stderr, "]: <%d>, %d/%d\n", 1131 fprintf(stderr, "]: <%d>, %d/%d\n",
1197 button_number, 1132 button_number,
1198 x + 1, 1133 x + 1,
1199 y + 1); 1134 y + 1);
1200#else 1135#else
1201 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1136 R->tt_printf("\033[M%c%c%c",
1202 (32 + button_number + key_state), 1137 (32 + button_number + key_state),
1203 (32 + x + 1), 1138 (32 + x + 1),
1204 (32 + y + 1)); 1139 (32 + y + 1));
1205#endif 1140#endif
1206} 1141}
… …
1223{ 1158{
1224 int i, want_timeout; 1159 int i, want_timeout;
1225 Window unused_root, unused_child; 1160 Window unused_root, unused_child;
1226 int unused_root_x, unused_root_y; 1161 int unused_root_x, unused_root_y;
1227 unsigned int unused_mask; 1162 unsigned int unused_mask;
1228 struct timeval tp;
1229 1163
1230#ifdef DEBUG_X 1164#ifdef DEBUG_X
1231 const char *const eventnames[] = 1165 const char *const eventnames[] =
1232 { /* mason - this matches my system */ 1166 { /* mason - this matches my system */
1233 "", 1167 "",
… …
1264 "SelectionNotify", 1198 "SelectionNotify",
1265 "ColormapNotify", 1199 "ColormapNotify",
1266 "ClientMessage", 1200 "ClientMessage",
1267 "MappingNotify" 1201 "MappingNotify"
1268 }; 1202 };
1203#endif
1204
1205#ifdef DEBUG_X
1206 struct timeval tp;
1269 struct tm *ltt; 1207 struct tm *ltt;
1270#endif
1271
1272 /*
1273 * check if we need to get the time for any timeouts
1274 */
1275
1276 for (i = NUM_TIMEOUTS; i--; )
1277 if (R->timeout[i].tv_sec) {
1278 want_timeout = 1;
1279 break;
1280 }
1281
1282#ifndef DEBUG_X
1283 if (want_timeout)
1284#endif
1285 (void)gettimeofday(&tp, NULL); 1208 (void)gettimeofday(&tp, NULL);
1286
1287#ifdef DEBUG_X
1288 ltt = localtime(&(tp.tv_sec)); 1209 ltt = localtime(&(tp.tv_sec));
1289 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1210 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1290#endif 1211#endif
1291
1292 /* X event timeouts */
1293 if (want_timeout)
1294 for (i = NUM_TIMEOUTS; i--; ) {
1295 if (R->timeout[i].tv_sec == 0)
1296 continue;
1297 if ((tp.tv_sec < R->timeout[i].tv_sec)
1298 || (tp.tv_sec == R->timeout[i].tv_sec
1299 && tp.tv_usec < R->timeout[i].tv_usec))
1300 continue;
1301 R->timeout[i].tv_sec = 0;
1302 switch(i) {
1303 case TIMEOUT_INCR:
1304 rxvt_print_error("data loss: timeout on INCR selection paste");
1305 R->selection_wait = Sel_none;
1306 break;
1307 default:
1308 break;
1309 }
1310 }
1311 1212
1312 switch (ev->type) { 1213 switch (ev->type) {
1313 case KeyPress: 1214 case KeyPress:
1314 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1215 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1315 break; 1216 break;
… …
1339 break; 1240 break;
1340 1241
1341 case ClientMessage: 1242 case ClientMessage:
1342 if (ev->xclient.format == 32 1243 if (ev->xclient.format == 32
1343 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1244 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344 exit(EXIT_SUCCESS); 1245 R->destroy ();
1345#ifdef OFFIX_DND 1246#ifdef OFFIX_DND
1346 /* OffiX Dnd (drag 'n' drop) protocol */ 1247 /* OffiX Dnd (drag 'n' drop) protocol */
1347 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1248 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348 && (ev->xclient.data.l[0] == DndFile 1249 && (ev->xclient.data.l[0] == DndFile
1349 || ev->xclient.data.l[0] == DndDir 1250 || ev->xclient.data.l[0] == DndDir
1350 || ev->xclient.data.l[0] == DndLink)) { 1251 || ev->xclient.data.l[0] == DndLink)) {
1351 /* Get Dnd data */ 1252 /* Get Dnd data */
1352 Atom ActualType; 1253 Atom ActualType;
… …
1384 * in the GraphicsExpose parts, which means that after each refresh, 1285 * in the GraphicsExpose parts, which means that after each refresh,
1385 * we need to wait for the graphics expose or Noexpose events, 1286 * we need to wait for the graphics expose or Noexpose events,
1386 * which ought to make things real slow! 1287 * which ought to make things real slow!
1387 */ 1288 */
1388 case VisibilityNotify: 1289 case VisibilityNotify:
1389 switch (ev->xvisibility.state) { 1290 switch (ev->xvisibility.state)
1291 {
1390 case VisibilityUnobscured: 1292 case VisibilityUnobscured:
1391 R->refresh_type = FAST_REFRESH; 1293 R->refresh_type = FAST_REFRESH;
1392 break; 1294 break;
1393 case VisibilityPartiallyObscured: 1295 case VisibilityPartiallyObscured:
1394 R->refresh_type = SLOW_REFRESH; 1296 R->refresh_type = SLOW_REFRESH;
1395 break; 1297 break;
1396 default: 1298 default:
1397 R->refresh_type = NO_REFRESH; 1299 R->refresh_type = NO_REFRESH;
1398 break; 1300 break;
1399 } 1301 }
1400 break; 1302 break;
1401 1303
1402 case FocusIn: 1304 case FocusIn:
1403 if (!R->TermWin.focus) { 1305 if (!R->TermWin.focus) {
1404 R->TermWin.focus = 1; 1306 R->TermWin.focus = 1;
1405 R->want_refresh = 1; 1307 R->want_refresh = 1;
1406#ifdef USE_XIM 1308#ifdef USE_XIM
1407 if (R->Input_Context != NULL) 1309 if (R->Input_Context != NULL)
1408 XSetICFocus(R->Input_Context); 1310 XSetICFocus(R->Input_Context);
1409#endif 1311#endif
1312#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink)
1314 R->blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif
1410 } 1316 }
1411 break; 1317 break;
1412 1318
1413 case FocusOut: 1319 case FocusOut:
1414 if (R->TermWin.focus) { 1320 if (R->TermWin.focus) {
1415 R->TermWin.focus = 0; 1321 R->TermWin.focus = 0;
1416 R->want_refresh = 1; 1322 R->want_refresh = 1;
1417#ifdef USE_XIM 1323#ifdef USE_XIM
1418 if (R->Input_Context != NULL) 1324 if (R->Input_Context != NULL)
1419 XUnsetICFocus(R->Input_Context); 1325 XUnsetICFocus(R->Input_Context);
1326#endif
1327#ifdef CURSOR_BLINK
1328 if (R->Options & Opt_cursorBlink)
1329 R->blink_ev.stop ();
1330 R->hidden_cursor = 0;
1420#endif 1331#endif
1421 } 1332 }
1422 break; 1333 break;
1423 1334
1424 case ConfigureNotify: 1335 case ConfigureNotify:
… …
1537 break; 1448 break;
1538 1449
1539 case MotionNotify: 1450 case MotionNotify:
1540#ifdef POINTER_BLANK 1451#ifdef POINTER_BLANK
1541 if (R->hidden_pointer) 1452 if (R->hidden_pointer)
1542 rxvt_pointer_unblank(aR); 1453 R->pointer_unblank ();
1543#endif 1454#endif
1544#if MENUBAR 1455#if MENUBAR
1545 if (isMenuBarWindow(ev->xany.window)) { 1456 if (isMenuBarWindow(ev->xany.window)) {
1546 rxvt_menubar_control(aR_ &(ev->xbutton)); 1457 rxvt_menubar_control(aR_ &(ev->xbutton));
1547 break; 1458 break;
… …
1738 */ 1649 */
1739 if ((R->scrollBar.style == R_SB_NEXT 1650 if ((R->scrollBar.style == R_SB_NEXT
1740 && scrollbarnext_upButton(ev->y)) 1651 && scrollbarnext_upButton(ev->y))
1741 || (R->scrollBar.style == R_SB_RXVT 1652 || (R->scrollBar.style == R_SB_RXVT
1742 && scrollbarrxvt_upButton(ev->y))) 1653 && scrollbarrxvt_upButton(ev->y)))
1743 rxvt_tt_printf(aR_ "\033[A"); 1654 R->tt_printf("\033[A");
1744 else if ((R->scrollBar.style == R_SB_NEXT 1655 else if ((R->scrollBar.style == R_SB_NEXT
1745 && scrollbarnext_dnButton(ev->y)) 1656 && scrollbarnext_dnButton(ev->y))
1746 || (R->scrollBar.style == R_SB_RXVT 1657 || (R->scrollBar.style == R_SB_RXVT
1747 && scrollbarrxvt_dnButton(ev->y))) 1658 && scrollbarrxvt_dnButton(ev->y)))
1748 rxvt_tt_printf(aR_ "\033[B"); 1659 R->tt_printf("\033[B");
1749 else 1660 else
1750 switch (ev->button) { 1661 switch (ev->button) {
1751 case Button2: 1662 case Button2:
1752 rxvt_tt_printf(aR_ "\014"); 1663 R->tt_printf("\014");
1753 break; 1664 break;
1754 case Button1: 1665 case Button1:
1755 rxvt_tt_printf(aR_ "\033[6~"); 1666 R->tt_printf("\033[6~");
1756 break; 1667 break;
1757 case Button3: 1668 case Button3:
1758 rxvt_tt_printf(aR_ "\033[5~"); 1669 R->tt_printf("\033[5~");
1759 break; 1670 break;
1760 } 1671 }
1761 } 1672 }
1762 else 1673 else
1763#endif /* NO_SCROLLBAR_REPORT */ 1674#endif /* NO_SCROLLBAR_REPORT */
… …
2164 return stream; 2075 return stream;
2165} 2076}
2166 2077
2167/* EXTPROTO */ 2078/* EXTPROTO */
2168int 2079int
2169rxvt_pclose_printer(FILE *stream) 2080rxvt_pclose_printer (FILE *stream)
2170{ 2081{
2171 fflush(stream); 2082 fflush (stream);
2172/* pclose() reported not to work on SunOS 4.1.3 */ 2083/* pclose() reported not to work on SunOS 4.1.3 */
2173# if defined (__sun__) /* TODO: RESOLVE THIS */ 2084# if defined (__sun__) /* TODO: RESOLVE THIS */
2174/* pclose works provided SIGCHLD handler uses waitpid */ 2085/* pclose works provided SIGCHLD handler uses waitpid */
2175 return pclose(stream); /* return fclose (stream); */ 2086 return pclose (stream); /* return fclose (stream); */
2176# else 2087# else
2177 return pclose(stream); 2088 return pclose (stream);
2178# endif 2089# endif
2179} 2090}
2180 2091
2181/* 2092/*
2182 * simulate attached vt100 printer 2093 * simulate attached vt100 printer
… …
2245rxvt_process_nonprinting(pR_ unsigned char ch) 2156rxvt_process_nonprinting(pR_ unsigned char ch)
2246{ 2157{
2247 switch (ch) { 2158 switch (ch) {
2248 case C0_ENQ: /* terminal Status */ 2159 case C0_ENQ: /* terminal Status */
2249 if (R->rs[Rs_answerbackstring]) 2160 if (R->rs[Rs_answerbackstring])
2250 rxvt_tt_write(aR_ 2161 R->tt_write(
2251 (const unsigned char *)R->rs[Rs_answerbackstring], 2162 (const unsigned char *)R->rs[Rs_answerbackstring],
2252 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2163 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253 else 2164 else
2254 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2165 R->tt_write((unsigned char *)VT100_ANS,
2255 (unsigned int)STRLEN(VT100_ANS)); 2166 (unsigned int)STRLEN(VT100_ANS));
2256 break; 2167 break;
2257 case C0_BEL: /* bell */ 2168 case C0_BEL: /* bell */
2258 rxvt_scr_bell(aR); 2169 rxvt_scr_bell(aR);
2259 break; 2170 break;
… …
2322 row = rxvt_cmd_getc(aR) - ' '; 2233 row = rxvt_cmd_getc(aR) - ' ';
2323 col = rxvt_cmd_getc(aR) - ' '; 2234 col = rxvt_cmd_getc(aR) - ' ';
2324 rxvt_scr_gotorc(aR_ row, col, 0); 2235 rxvt_scr_gotorc(aR_ row, col, 0);
2325 break; 2236 break;
2326 case 'Z': /* identify the terminal type */ 2237 case 'Z': /* identify the terminal type */
2327 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2238 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2328 break; 2239 break;
2329 case '<': /* turn off VT52 mode */ 2240 case '<': /* turn off VT52 mode */
2330 PrivMode(0, PrivMode_vt52); 2241 PrivMode(0, PrivMode_vt52);
2331 break; 2242 break;
2332 case 'F': /* use special graphics character set */ 2243 case 'F': /* use special graphics character set */
… …
2439 rxvt_process_dcs_seq(aR); 2350 rxvt_process_dcs_seq(aR);
2440 break; 2351 break;
2441 2352
2442 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2353 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443 case C1_SCI: /* ESC Z */ 2354 case C1_SCI: /* ESC Z */
2444 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2355 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2356 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446 break; /* steal obsolete ESC [ c */ 2357 break; /* steal obsolete ESC [ c */
2447 2358
2448 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2359 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449 case C1_CSI: /* ESC [ */ 2360 case C1_CSI: /* ESC [ */
… …
2570 */ 2481 */
2571 if (priv) { 2482 if (priv) {
2572 switch (priv) { 2483 switch (priv) {
2573 case '>': 2484 case '>':
2574 if (ch == CSI_DA) /* secondary device attributes */ 2485 if (ch == CSI_DA) /* secondary device attributes */
2575 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2486 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576 break; 2487 break;
2577 case '?': 2488 case '?':
2578 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2489 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2490 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580 break; 2491 break;
… …
2683 2594
2684 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2595 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2685 arg[0] = -arg[0]; 2596 arg[0] = -arg[0];
2686 /* FALLTHROUGH */ 2597 /* FALLTHROUGH */
2687 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2598 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2599 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2689 break; 2600 break;
2690 2601
2691 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2602 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2603 R->tt_write((const unsigned char *)VT100_ANS,
2693 (unsigned int)(sizeof(VT100_ANS) - 1)); 2604 (unsigned int)(sizeof(VT100_ANS) - 1));
2694 break; 2605 break;
2695 2606
2696 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2607 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697 rxvt_process_sgr_mode(aR_ nargs, arg); 2608 rxvt_process_sgr_mode(aR_ nargs, arg);
2698 break; 2609 break;
2699 2610
2700 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2611 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701 switch (arg[0]) { 2612 switch (arg[0]) {
2702 case 5: /* DSR requested */ 2613 case 5: /* DSR requested */
2703 rxvt_tt_printf(aR_ "\033[0n"); 2614 R->tt_printf("\033[0n");
2704 break; 2615 break;
2705 case 6: /* CPR requested */ 2616 case 6: /* CPR requested */
2706 rxvt_scr_report_position(aR); 2617 rxvt_scr_report_position(aR);
2707 break; 2618 break;
2708#if defined (ENABLE_DISPLAY_ANSWER) 2619#if defined (ENABLE_DISPLAY_ANSWER)
2709 case 7: /* unofficial extension */ 2620 case 7: /* unofficial extension */
2710 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2621 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711 break; 2622 break;
2712#endif 2623#endif
2713 case 8: /* unofficial extension */ 2624 case 8: /* unofficial extension */
2714 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2625 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715 break; 2626 break;
… …
2784 break; 2695 break;
2785#endif 2696#endif
2786 2697
2787 case CSI_78: /* DECREQTPARM */ 2698 case CSI_78: /* DECREQTPARM */
2788 if (arg[0] == 0 || arg[0] == 1) 2699 if (arg[0] == 0 || arg[0] == 1)
2789 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2700 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2790 /* FALLTHROUGH */ 2701 /* FALLTHROUGH */
2791 2702
2792 default: 2703 default:
2793 break; 2704 break;
2794 } 2705 }
… …
2848 /* 2759 /*
2849 * reports - some output format copied from XTerm 2760 * reports - some output format copied from XTerm
2850 */ 2761 */
2851 case 11: /* report window state */ 2762 case 11: /* report window state */
2852 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2763 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2764 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854 break; 2765 break;
2855 case 13: /* report window position */ 2766 case 13: /* report window position */
2856 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2768 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858 -wattr.border_width, -wattr.border_width, 2769 -wattr.border_width, -wattr.border_width,
2859 &x, &y, &wdummy); 2770 &x, &y, &wdummy);
2860 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2771 R->tt_printf("\033[3;%d;%dt", x, y);
2861 break; 2772 break;
2862 case 14: /* report window size (pixels) */ 2773 case 14: /* report window size (pixels) */
2863 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2774 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2775 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865 break; 2776 break;
2866 case 18: /* report window size (chars) */ 2777 case 18: /* report window size (chars) */
2867 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2778 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2868 break; 2779 break;
2869#if 0 /* XXX: currently disabled due to security concerns */ 2780#if 0 /* XXX: currently disabled due to security concerns */
2870 case 20: /* report icon label */ 2781 case 20: /* report icon label */
2871 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2782 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2783 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873 break; 2784 break;
2874 case 21: /* report window title */ 2785 case 21: /* report window title */
2875 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2786 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2787 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877 break; 2788 break;
2878#endif 2789#endif
2879 } 2790 }
2880} 2791}
2881#endif 2792#endif
… …
3424{ 3335{
3425 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3336 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426 3337
3427#ifndef RXVT_GRAPHICS 3338#ifndef RXVT_GRAPHICS
3428 if (cmd == 'Q') { /* query graphics */ 3339 if (cmd == 'Q') { /* query graphics */
3429 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3340 R->tt_printf("\033G0\n"); /* no graphics */
3430 return; 3341 return;
3431 } 3342 }
3432/* swallow other graphics sequences until terminating ':' */ 3343/* swallow other graphics sequences until terminating ':' */
3433 do 3344 do
3434 ch = rxvt_cmd_getc(aR); 3345 ch = rxvt_cmd_getc(aR);
… …
3437 unsigned int nargs; 3348 unsigned int nargs;
3438 int args[NGRX_PTS]; 3349 int args[NGRX_PTS];
3439 unsigned char *text = NULL; 3350 unsigned char *text = NULL;
3440 3351
3441 if (cmd == 'Q') { /* query graphics */ 3352 if (cmd == 'Q') { /* query graphics */
3442 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3353 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443 return; 3354 return;
3444 } 3355 }
3445 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3356 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446 int neg; 3357 int neg;
3447 3358
… …
3481 3392
3482/* 3393/*
3483 * Send printf() formatted output to the command. 3394 * Send printf() formatted output to the command.
3484 * Only use for small amounts of data. 3395 * Only use for small amounts of data.
3485 */ 3396 */
3486/* EXTPROTO */
3487void 3397void
3488rxvt_tt_printf(pR_ const char *fmt,...) 3398rxvt_term::tt_printf (const char *fmt,...)
3489{ 3399{
3490 va_list arg_ptr; 3400 va_list arg_ptr;
3491 unsigned char buf[256]; 3401 unsigned char buf[256];
3492 3402
3493 va_start(arg_ptr, fmt); 3403 va_start (arg_ptr, fmt);
3494 vsprintf((char *)buf, fmt, arg_ptr); 3404 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495 va_end(arg_ptr); 3405 va_end (arg_ptr);
3496 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3406 tt_write (buf, STRLEN (buf));
3497} 3407}
3498 3408
3499/* ---------------------------------------------------------------------- */ 3409/* ---------------------------------------------------------------------- */
3500/* Addresses pasting large amounts of data and rxvt hang
3501 * code pinched from xterm (v_write()) and applied originally to
3502 * rxvt-2.18 - Hops
3503 * Write data to the pty as typed by the user, pasted with the mouse, 3410/* Write data to the pty as typed by the user, pasted with the mouse,
3504 * or generated by us in response to a query ESC sequence. 3411 * or generated by us in response to a query ESC sequence.
3505 */ 3412 */
3506/* EXTPROTO */
3507void 3413void
3508rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3414rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 3415{
3510#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3416 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3511 int riten;
3512 unsigned int p;
3513 unsigned char *v_buffer, /* start of physical buffer */
3514 *v_bufstr, /* start of current buffer pending */
3515 *v_bufptr, /* end of current buffer pending */
3516 *v_bufend; /* end of physical buffer */
3517 3417
3518 if (R->v_bufstr == NULL && len > 0) { 3418 if (len)
3519 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3521 v_bufend = v_buffer + p;
3522 } else {
3523 v_buffer = R->v_buffer;
3524 v_bufstr = R->v_bufstr;
3525 v_bufptr = R->v_bufptr;
3526 v_bufend = R->v_bufend;
3527 } 3419 {
3420 if (v_buflen == 0)
3421 {
3422 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3423 if (written == len)
3424 return;
3528 3425
3529 /* 3426 data += written;
3530 * Append to the block we already have. Always doing this simplifies the 3427 len -= written;
3531 * code, and isn't too bad, either. If this is a short block, it isn't 3428 }
3532 * too expensive, and if this is a long block, we won't be able to write 3429
3533 * it all anyway. 3430
3534 */ 3431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535 if (len > 0) { 3432
3536 if (v_bufend < v_bufptr + len) { /* run out of room */ 3433 memcpy (v_buffer + v_buflen, data, len);
3537 if (v_bufstr != v_buffer) { 3434 v_buflen += len;
3538 /* there is unused space, move everything down */
3539 MEMMOVE(v_buffer, v_bufstr,
3540 (unsigned int)(v_bufptr - v_bufstr));
3541 v_bufptr -= v_bufstr - v_buffer;
3542 v_bufstr = v_buffer;
3543 } 3435 }
3544 if (v_bufend < v_bufptr + len) {
3545 /* still won't fit: get more space */
3546 /* use most basic realloc because an error is not fatal. */
3547 unsigned int size = v_bufptr - v_buffer;
3548 unsigned int reallocto;
3549 3436
3550 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3437 for (;;)
3551 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3438 {
3552 /* save across realloc */ 3439 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553 if (v_buffer) { 3440
3554 v_bufstr = v_buffer; 3441 if (written > 0)
3555 v_bufptr = v_buffer + size; 3442 {
3556 v_bufend = v_buffer + reallocto; 3443 v_buflen -= written;
3557 } else { /* no memory: ignore entire write request */ 3444
3558 rxvt_print_error("data loss: cannot allocate buffer space"); 3445 if (v_buflen == 0)
3559 v_buffer = v_bufstr; /* restore clobbered pointer */ 3446 {
3560 } 3447 free (v_buffer);
3448 v_buffer = 0;
3449 v_buflen = 0;
3450
3451 pty_ev.set (EVENT_READ);
3452 return;
3453 }
3454
3455 memmove (v_buffer, v_buffer + written, v_buflen);
3456 }
3457 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3458 // original code just ignores this...
3459 destroy ();
3460 else
3461 {
3462 pty_ev.set (EVENT_READ | EVENT_WRITE);
3463 return;
3464 }
3561 } 3465 }
3562 }
3563 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3564 MEMCPY(v_bufptr, d, len);
3565 v_bufptr += len;
3566 }
3567 }
3568
3569 /*
3570 * Write out as much of the buffer as we can.
3571 * Be careful not to overflow the pty's input silo.
3572 * We are conservative here and only write a small amount at a time.
3573 *
3574 * If we can't push all the data into the pty yet, we expect write
3575 * to return a non-negative number less than the length requested
3576 * (if some data written) or -1 and set errno to EAGAIN,
3577 * EWOULDBLOCK, or EINTR (if no data written).
3578 *
3579 * (Not all systems do this, sigh, so the code is actually
3580 * a little more forgiving.)
3581 */
3582 if ((p = v_bufptr - v_bufstr) > 0) {
3583 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3584 if (riten < 0)
3585 riten = 0;
3586 v_bufstr += riten;
3587 if (v_bufstr >= v_bufptr) /* we wrote it all */
3588 v_bufstr = v_bufptr = v_buffer;
3589 }
3590 /*
3591 * If we have lots of unused memory allocated, return it
3592 */
3593 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3594 /* save pointers across realloc */
3595 unsigned int start = v_bufstr - v_buffer;
3596 unsigned int size = v_bufptr - v_buffer;
3597 unsigned int reallocto;
3598
3599 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3600 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3601 if (v_buffer) {
3602 v_bufstr = v_buffer + start;
3603 v_bufptr = v_buffer + size;
3604 v_bufend = v_buffer + reallocto;
3605 } else {
3606 /* should we print a warning if couldn't return memory? */
3607 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3608 }
3609 }
3610 R->v_buffer = v_buffer;
3611 R->v_bufstr = v_bufstr;
3612 R->v_bufptr = v_bufptr;
3613 R->v_bufend = v_bufend;
3614} 3466}
3467
3615/*----------------------- end-of-file (C source) -----------------------*/ 3468/*----------------------- end-of-file (C source) -----------------------*/
3616 3469

Diff Legend

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