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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.14 by pcg, Mon Dec 8 23:14:40 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.5 2003/11/25 15:44:38 pcg Exp $ 4 * $Id: command.C,v 1.14 2003/12/08 23:14:40 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
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 96 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
95#endif 98#endif
96 valid_keysym = ((status_return == XLookupKeySym) 99 valid_keysym = ((status_return == XLookupKeySym)
97 || (status_return == XLookupBoth)); 100 || (status_return == XLookupBoth));
101 }
98 } else { 102 else
103#endif
104 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 105 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 106 valid_keysym = !len;
102 } 107 }
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 108
120#ifdef USE_XIM
121 if (valid_keysym) 109 if (valid_keysym)
122#endif
123 { 110 {
124/* for some backwards compatibility */ 111/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 112#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 113# ifdef HOTKEY_CTRL
127 if (ctrl) { 114 if (ctrl)
128# else 115# else
129 if (meta) { 116 if (meta)
130# endif 117# endif
118 {
131 if (keysym == R->ks_bigfont) { 119 if (keysym == R->ks_bigfont)
120 {
132 rxvt_change_font(aR_ 0, FONT_UP); 121 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 122 return;
123 }
134 } else if (keysym == R->ks_smallfont) { 124 else if (keysym == R->ks_smallfont)
125 {
135 rxvt_change_font(aR_ 0, FONT_DN); 126 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 127 return;
137 } 128 }
138 } 129 }
139#endif 130#endif
140 131
141 if (R->TermWin.saveLines) { 132 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 133#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 134 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 228 /* escape prefix */
238 if (meta) 229 if (meta)
239# ifdef META8_OPTION 230# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 231 if (R->meta_char == C0_ESC)
241# endif 232# endif
242 rxvt_tt_write(aR_ &ch, 1); 233 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 234 R->tt_write (kbuf0, l);
244 return; 235 return;
245 } else 236 } else
246#endif 237#endif
247 { 238 {
248 newlen = 1; 239 newlen = 1;
… …
572 if (R->greek_mode) 563 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 564 len = greek_xlat(kbuf, len);
574#endif 565#endif
575 /* nil */ ; 566 /* nil */ ;
576 } 567 }
577 } 568 }
578 569
579 if (len <= 0) 570 if (len <= 0)
580 return; /* not mapped */ 571 return; /* not mapped */
581 572
582 if (R->Options & Opt_scrollTtyKeypress) 573 if (R->Options & Opt_scrollTtyKeypress)
… …
605 && (R->meta_char == C0_ESC) 596 && (R->meta_char == C0_ESC)
606#endif 597#endif
607 ) { 598 ) {
608 const unsigned char ch = C0_ESC; 599 const unsigned char ch = C0_ESC;
609 600
610 rxvt_tt_write(aR_ &ch, 1); 601 R->tt_write(&ch, 1);
611 } 602 }
612#ifdef DEBUG_CMD 603#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 604 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 605 char *p;
615 int i; 606 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 609 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 610 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 611 fprintf(stderr, "'\n");
621 } 612 }
622#endif /* DEBUG_CMD */ 613#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 614 R->tt_write(kbuf, (unsigned int)len);
624} 615}
625/*}}} */ 616/*}}} */
626 617
627#if (MENUBAR_MAX) 618#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 619/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
656 return 0; 647 return 0;
657} 648}
658#endif /* MENUBAR_MAX */ 649#endif /* MENUBAR_MAX */
659 650
660void 651void
652rxvt_term::flush ()
653{
654#ifdef TRANSPARENT
655 if (want_full_refresh)
656 {
657 want_full_refresh = 0;
658 rxvt_scr_clear (this);
659 rxvt_scr_touch (this, False);
660 want_refresh = 1;
661 }
662#endif
663
664 if (want_refresh)
665 {
666 rxvt_scr_refresh (this, refresh_type);
667 rxvt_scrollbar_show (this, 1);
668#ifdef USE_XIM
669 rxvt_IMSendSpot (this);
670#endif
671 }
672
673 XFlush (Xdisplay);
674#if 0
675 if (XPending (Xdisplay)) process_x_events ();
676 if (XPending (Xdisplay)) process_x_events ();
677#endif
678}
679
680void
681rxvt_term::check_cb (check_watcher &w)
682{
683 SET_R (this);
684
685 flush ();
686}
687
688void
661rxvt_term::process_x_events () 689rxvt_term::process_x_events ()
662{ 690{
663 do 691 do
664 { 692 {
665 XEvent xev; 693 XEvent xev;
666 694
667 XNextEvent (Xdisplay, &xev); 695 XNextEvent (Xdisplay, &xev);
668 696
669#if defined(CURSOR_BLINK) 697#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink) 698 if ((Options & Opt_cursorBlink)
671 && xev.type == KeyPress) { 699 && xev.type == KeyPress)
700 {
672 if (hidden_cursor) { 701 if (hidden_cursor)
702 {
673 hidden_cursor = 0; 703 hidden_cursor = 0;
674 want_refresh = 1; 704 want_refresh = 1;
675 } 705 }
706
676 blink_ev.start (NOW + BLINK_INTERVAL); 707 blink_ev.start (NOW + BLINK_INTERVAL);
677 } 708 }
678#endif 709#endif
679 710
680#if defined(POINTER_BLANK) 711#if defined(POINTER_BLANK)
681 if ((Options & Opt_pointerBlank) 712 if ((Options & Opt_pointerBlank)
682 && (pointerBlankDelay > 0)) { 713 && (pointerBlankDelay > 0))
714 {
683 if (xev.type == MotionNotify 715 if (xev.type == MotionNotify
684 || xev.type == ButtonPress 716 || xev.type == ButtonPress
685 || xev.type == ButtonRelease) { 717 || xev.type == ButtonRelease)
686 if (hidden_pointer) 718 if (hidden_pointer)
687 rxvt_pointer_unblank(aR); 719 pointer_unblank ();
688 want_motion_time = 1; 720
689 }
690 if (xev.type == KeyPress && hidden_pointer == 0) 721 if (xev.type == KeyPress && hidden_pointer == 0)
691 rxvt_pointer_blank (this); 722 pointer_blank ();
692 } 723 }
693#endif 724#endif
694 725
695#ifdef USE_XIM 726#ifdef USE_XIM
696 if (!XFilterEvent (&xev, xev.xany.window)) 727 if (!XFilterEvent (&xev, xev.xany.window))
697#endif 728#endif
… …
701} 732}
702 733
703void 734void
704rxvt_term::blink_cb (time_watcher &w) 735rxvt_term::blink_cb (time_watcher &w)
705{ 736{
737 SET_R (this);
738
706 w.at += BLINK_INTERVAL; 739 w.at += BLINK_INTERVAL;
707 hidden_cursor = !hidden_cursor; 740 hidden_cursor = !hidden_cursor;
708 want_refresh = 1; 741 want_refresh = 1;
709 flush();
710} 742}
711 743
712void 744void
713rxvt_term::x_cb (io_watcher &w, short revents) 745rxvt_term::x_cb (io_watcher &w, short revents)
714{ 746{
747 SET_R (this);
748
715 process_x_events (); 749 process_x_events ();
750}
716 751
717 flush (); 752bool
753rxvt_term::pty_fill ()
754{
755 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
756
757 memmove (cmdbuf_base, cmdbuf_ptr, n);
758 cmdbuf_ptr = cmdbuf_base;
759 cmdbuf_endp = cmdbuf_ptr + n;
760
761 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
762
763 if (n > 0)
764 {
765 cmdbuf_endp += n;
766 return true;
767 }
768 else if (n < 0 && errno != EAGAIN)
769 destroy ();
770
771 return false;
772}
773
774void
775rxvt_term::pty_cb (io_watcher &w, short revents)
776{
777 SET_R (this);
778
779 if (revents & EVENT_WRITE)
780 tt_write (0, 0);
781 else if (revents & EVENT_READ)
782 {
783 bool flag = true;
784
785 // loop, but don't allow a single term to monopolize us
786 // the number of loops is fully arbitrary, and thus wrong
787 while (flag && pty_fill ())
788 {
789 if (!seen_input)
790 {
791 seen_input = 1;
792 /* once we know the shell is running, send the screen size. Again! */
793 tt_winch ();
794 }
795
796 uint32_t ch = NOCHAR;
797
798 for (;;)
799 {
800 if (ch == NOCHAR)
801 ch = next_char ();
802
803 if (ch == NOCHAR) // TODO: improve
804 break;
805
806 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
807 {
808 /* Read a text string from the input buffer */
809 uint32_t buf[BUFSIZ];
810 bool refreshnow = false;
811 int nlines = 0;
812 uint32_t *str = buf;
813
814 *str++ = ch;
815
816 for (;;)
817 {
818 ch = next_char ();
819
820 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
821 break;
822 else
823 {
824 *str++ = ch;
825
826 if (ch == '\n')
827 {
828 nlines++;
829 refresh_count++;
830
831 if (!(Options & Opt_jumpScroll)
832 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
833 {
834 refreshnow = true;
835 flag = false;
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 }
718} 888}
719 889
720// read the next character, currently handles UTF-8 890// read the next character, currently handles UTF-8
721// will probably handle all sorts of other stuff in the future 891// will probably handle all sorts of other stuff in the future
722uint32_t 892uint32_t
… …
770 } 940 }
771 941
772 return NOCHAR; 942 return NOCHAR;
773} 943}
774 944
775bool
776rxvt_term::pty_fill (size_t count)
777{
778 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779
780 memmove (cmdbuf_base, cmdbuf_ptr, n);
781 cmdbuf_ptr = cmdbuf_base;
782 cmdbuf_endp = cmdbuf_ptr + n;
783
784 n = read (cmd_fd, cmdbuf_endp, count);
785
786 if (n > 0)
787 {
788 cmdbuf_endp += n;
789 return true;
790 }
791 else if (n < 0 && errno == EAGAIN)
792 return false;
793
794 rxvt_clean_exit();
795 exit(EXIT_FAILURE); /* bad order of events? */
796}
797
798void
799rxvt_term::pty_cb (io_watcher &w, short revents)
800{
801 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
802 {
803 /* once we know the shell is running, send the screen size. Again! */
804 //ch = rxvt_cmd_getc(aR); /* wait for something */
805 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806
807 uint32_t ch = NOCHAR;
808
809 for (;;)
810 {
811 if (ch == NOCHAR)
812 ch = next_char ();
813
814 if (ch == NOCHAR) // TODO: improve
815 break;
816
817 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818 {
819 /* Read a text string from the input buffer */
820 uint32_t buf[BUFSIZ];
821 bool refreshnow = false;
822 int nlines = 0;
823 uint32_t *str = buf;
824
825 *str++ = ch;
826
827 for (;;)
828 {
829 ch = next_char ();
830
831 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832 break;
833 else
834 {
835 *str++ = ch;
836
837 if (ch == '\n')
838 {
839 nlines++;
840 refresh_count++;
841
842 if (!(Options & Opt_jumpScroll)
843 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844 {
845 refreshnow = true;
846 ch = NOCHAR;
847 break;
848 }
849 }
850
851 if (str >= buf + BUFSIZ)
852 {
853 ch = NOCHAR;
854 break;
855 }
856 }
857 }
858
859 rxvt_scr_add_lines (this, buf, nlines, str - buf);
860
861 /*
862 * If there have been a lot of new lines, then update the screen
863 * What the heck I'll cheat and only refresh less than every page-full.
864 * the number of pages between refreshes is refresh_limit, which
865 * is incremented here because we must be doing flat-out scrolling.
866 *
867 * refreshing should be correct for small scrolls, because of the
868 * time-out
869 */
870 if (refreshnow)
871 {
872 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873 refresh_limit++;
874
875 rxvt_scr_refresh (this, refresh_type);
876 }
877
878 }
879 else
880 {
881 switch (ch)
882 {
883 default:
884 rxvt_process_nonprinting (this, ch);
885 break;
886 case C0_ESC: /* escape char */
887 rxvt_process_escape_seq (this);
888 break;
889 /*case 0x9b: */ /* CSI */
890 /* rxvt_process_csi_seq (this); */
891 }
892
893 ch = NOCHAR;
894 }
895 }
896 }
897
898 flush ();
899}
900
901void
902rxvt_term::flush ()
903{
904#ifdef TRANSPARENT
905 if (want_full_refresh)
906 {
907 want_full_refresh = 0;
908 rxvt_scr_clear (this);
909 rxvt_scr_touch (this, False);
910 want_refresh = 1;
911 }
912#endif
913
914 if (want_refresh)
915 {
916 rxvt_scr_refresh (this, refresh_type);
917 rxvt_scrollbar_show (this, 1);
918#ifdef USE_XIM
919 rxvt_IMSendSpot (this);
920#endif
921 }
922
923 XFlush (Xdisplay);
924}
925
926/* rxvt_cmd_getc() - Return next input character */ 945/* rxvt_cmd_getc() - Return next input character */
927/* 946/*
928 * Return the next input character after first passing any keyboard input 947 * Return the next input character after first passing any keyboard input
929 * to the command. 948 * to the command.
930 */ 949 */
… …
939 return c; 958 return c;
940 959
941 // incomplete sequences should occur rarely, still, a better solution 960 // incomplete sequences should occur rarely, still, a better solution
942 // would be preferred. either setjmp/longjmp or better design. 961 // would be preferred. either setjmp/longjmp or better design.
943 fcntl (R->cmd_fd, F_SETFL, 0); 962 fcntl (R->cmd_fd, F_SETFL, 0);
944 R->pty_fill (1); 963 R->pty_fill ();
945 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 964 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946 } 965 }
947 966
967#if 0
948#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
949 fd_set readfds; 969 fd_set readfds;
950 int quick_timeout, select_res; 970 int quick_timeout, select_res;
951 int want_motion_time, want_keypress_time; 971 int want_motion_time, want_keypress_time;
952 struct timeval value; 972 struct timeval value;
… …
956 976
957 for (;;) { 977 for (;;) {
958 /* loop until we can return something */ 978 /* loop until we can return something */
959 979
960 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 980 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961 rxvt_tt_write(aR_ NULL, 0); 981 R->tt_write(NULL, 0);
962
963#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
964 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
965#endif
966#if defined(CURSOR_BLINK)
967 want_keypress_time = 0;
968#endif
969#if defined(POINTER_BLANK)
970 want_motion_time = 0;
971#endif
972
973 if (XPending (R->Xdisplay))
974 {
975 R->process_x_events ();
976
977 /* in case button actions pushed chars to cmdbuf */
978 if (R->cmdbuf_ptr < R->cmdbuf_endp)
979 return *R->cmdbuf_ptr++;
980 }
981
982#if defined(CURSOR_BLINK)
983 if (want_keypress_time) {
984 (void)gettimeofday(&tp, NULL);
985 R->lastcursorchange.tv_sec = tp.tv_sec;
986 R->lastcursorchange.tv_usec = tp.tv_usec;
987 }
988#endif
989#if defined(POINTER_BLANK)
990 if (want_motion_time) {
991 if (!tp.tv_sec)
992 (void)gettimeofday(&tp, NULL);
993 R->lastmotion.tv_sec = tp.tv_sec;
994 R->lastmotion.tv_usec = tp.tv_usec;
995 }
996#endif
997
998/*
999 * the command input buffer is empty and we have no pending X events
1000 */
1001 quick_timeout = 0;
1002 982
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004 if (R->mouse_slip_wheel_speed) { 984 if (R->mouse_slip_wheel_speed) {
1005 quick_timeout = 1; 985 quick_timeout = 1;
1006 if (!R->mouse_slip_wheel_delay-- 986 if (!R->mouse_slip_wheel_delay--
… …
1036 R->want_refresh = 1; 1016 R->want_refresh = 1;
1037 } 1017 }
1038 } 1018 }
1039#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040 1020
1041 FD_ZERO(&readfds);
1042 FD_SET(R->cmd_fd, &readfds);
1043 FD_SET(R->Xfd, &readfds);
1044 value.tv_usec = TIMEOUT_USEC;
1045 value.tv_sec = 0;
1046
1047 if (!R->TermWin.mapped)
1048 quick_timeout = 0;
1049 else {
1050 quick_timeout |= R->want_refresh;
1051#ifdef TRANSPARENT 1021#ifdef TRANSPARENT
1052 quick_timeout |= R->want_full_refresh; 1022 quick_timeout |= R->want_full_refresh;
1053#endif 1023#endif
1054 }
1055
1056#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1057 {
1058 int set_quick_timeout = 0;
1059 long csdiff, psdiff;
1060
1061#define BLINK_TIME 500000L
1062 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1063# if defined(CURSOR_BLINK)
1064 if (R->Options & Opt_cursorBlink) {
1065 if (!tp.tv_sec) /* didn't get it before so get it now */
1066 (void)gettimeofday(&tp, NULL);
1067
1068 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1069 + tp.tv_usec - R->lastcursorchange.tv_usec;
1070 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1071 R->lastcursorchange.tv_sec = tp.tv_sec;
1072 R->lastcursorchange.tv_usec = tp.tv_usec;
1073 R->hidden_cursor = !R->hidden_cursor;
1074 csdiff = 0;
1075 } else
1076 csdiff = BLINK_TIME - csdiff;
1077 set_quick_timeout = 1;
1078 }
1079# endif 1024#endif
1080# if defined(POINTER_BLANK)
1081 /*
1082 * If we haven't moved the pointer for a while
1083 */
1084 if ((R->Options & Opt_pointerBlank)
1085 && (R->pointerBlankDelay > 0)
1086 && (R->hidden_pointer == 0)) {
1087 long pdelay;
1088
1089 if (!tp.tv_sec) /* didn't get it before so get it now */
1090 (void)gettimeofday(&tp, NULL);
1091 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1092 + tp.tv_usec - R->lastmotion.tv_usec;
1093 pdelay = R->pointerBlankDelay * 1000000L;
1094 if (psdiff >= pdelay)
1095 rxvt_pointer_blank(aR);
1096 else {
1097 set_quick_timeout = 1;
1098 psdiff = pdelay - psdiff;
1099 }
1100 }
1101# endif
1102 if (!quick_timeout && set_quick_timeout) {
1103 MIN_IT(csdiff, psdiff);
1104 value.tv_sec = csdiff / 1000000L;
1105 value.tv_usec = csdiff % 1000000L;
1106 quick_timeout = 1;
1107 }
1108 }
1109#endif
1110
1111 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1112 (quick_timeout ? &value : NULL))) == 0) {
1113 /* select statement timed out - we're not hard and fast scrolling */
1114 R->refresh_limit = 1;
1115 }
1116#if defined(CURSOR_BLINK)
1117 if (R->Options & Opt_cursorBlink)
1118 R->want_refresh = 1;
1119#endif
1120 }
1121} 1025}
1122 1026
1123/* EXTPROTO */
1124void 1027void
1125rxvt_pointer_unblank(pR) 1028rxvt_term::pointer_unblank ()
1126{ 1029{
1127 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128 rxvt_recolour_cursor(aR); 1031 rxvt_recolour_cursor (this);
1032
1129#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
1130 R->hidden_pointer = 0; 1034 hidden_pointer = 0;
1131 if (R->pointerBlankDelay > 0) {
1132 struct timeval tp;
1133 1035
1134 (void)gettimeofday(&tp, NULL); 1036 if (Options & Opt_pointerBlank)
1135 R->lastmotion.tv_sec = tp.tv_sec; 1037 pointer_ev.start (NOW + pointerBlankDelay);
1136 R->lastmotion.tv_usec = tp.tv_usec;
1137 }
1138#endif 1038#endif
1139} 1039}
1140 1040
1141#ifdef POINTER_BLANK 1041#ifdef POINTER_BLANK
1142/* INTPROTO */
1143void 1042void
1144rxvt_pointer_blank(pR) 1043rxvt_term::pointer_blank ()
1145{ 1044{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank))
1048 return;
1049
1146 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147 XFlush(R->Xdisplay); 1051 XFlush (Xdisplay);
1052
1148 R->hidden_pointer = 1; 1053 hidden_pointer = 1;
1054}
1055
1056void
1057rxvt_term::pointer_cb (time_watcher &w)
1058{
1059 SET_R (this);
1060
1061 pointer_blank ();
1149} 1062}
1150#endif 1063#endif
1151 1064
1152/* INTPROTO */ 1065/* INTPROTO */
1153void 1066void
… …
1206 fprintf(stderr, "]: <%d>, %d/%d\n", 1119 fprintf(stderr, "]: <%d>, %d/%d\n",
1207 button_number, 1120 button_number,
1208 x + 1, 1121 x + 1,
1209 y + 1); 1122 y + 1);
1210#else 1123#else
1211 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1124 R->tt_printf("\033[M%c%c%c",
1212 (32 + button_number + key_state), 1125 (32 + button_number + key_state),
1213 (32 + x + 1), 1126 (32 + x + 1),
1214 (32 + y + 1)); 1127 (32 + y + 1));
1215#endif 1128#endif
1216} 1129}
… …
1349 break; 1262 break;
1350 1263
1351 case ClientMessage: 1264 case ClientMessage:
1352 if (ev->xclient.format == 32 1265 if (ev->xclient.format == 32
1353 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1266 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354 exit(EXIT_SUCCESS); 1267 R->destroy ();
1355#ifdef OFFIX_DND 1268#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */ 1269 /* OffiX Dnd (drag 'n' drop) protocol */
1357 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1270 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358 && (ev->xclient.data.l[0] == DndFile 1271 && (ev->xclient.data.l[0] == DndFile
1359 || ev->xclient.data.l[0] == DndDir 1272 || ev->xclient.data.l[0] == DndDir
1360 || ev->xclient.data.l[0] == DndLink)) { 1273 || ev->xclient.data.l[0] == DndLink)) {
1361 /* Get Dnd data */ 1274 /* Get Dnd data */
1362 Atom ActualType; 1275 Atom ActualType;
… …
1394 * in the GraphicsExpose parts, which means that after each refresh, 1307 * in the GraphicsExpose parts, which means that after each refresh,
1395 * we need to wait for the graphics expose or Noexpose events, 1308 * we need to wait for the graphics expose or Noexpose events,
1396 * which ought to make things real slow! 1309 * which ought to make things real slow!
1397 */ 1310 */
1398 case VisibilityNotify: 1311 case VisibilityNotify:
1399 switch (ev->xvisibility.state) { 1312 switch (ev->xvisibility.state)
1313 {
1400 case VisibilityUnobscured: 1314 case VisibilityUnobscured:
1401 R->refresh_type = FAST_REFRESH; 1315 R->refresh_type = FAST_REFRESH;
1402 break; 1316 break;
1403 case VisibilityPartiallyObscured: 1317 case VisibilityPartiallyObscured:
1404 R->refresh_type = SLOW_REFRESH; 1318 R->refresh_type = SLOW_REFRESH;
1405 break; 1319 break;
1406 default: 1320 default:
1407 R->refresh_type = NO_REFRESH; 1321 R->refresh_type = NO_REFRESH;
1408 break; 1322 break;
1409 } 1323 }
1410 break; 1324 break;
1411 1325
1412 case FocusIn: 1326 case FocusIn:
1413 if (!R->TermWin.focus) { 1327 if (!R->TermWin.focus) {
1414 R->TermWin.focus = 1; 1328 R->TermWin.focus = 1;
… …
1556 break; 1470 break;
1557 1471
1558 case MotionNotify: 1472 case MotionNotify:
1559#ifdef POINTER_BLANK 1473#ifdef POINTER_BLANK
1560 if (R->hidden_pointer) 1474 if (R->hidden_pointer)
1561 rxvt_pointer_unblank(aR); 1475 R->pointer_unblank ();
1562#endif 1476#endif
1563#if MENUBAR 1477#if MENUBAR
1564 if (isMenuBarWindow(ev->xany.window)) { 1478 if (isMenuBarWindow(ev->xany.window)) {
1565 rxvt_menubar_control(aR_ &(ev->xbutton)); 1479 rxvt_menubar_control(aR_ &(ev->xbutton));
1566 break; 1480 break;
… …
1757 */ 1671 */
1758 if ((R->scrollBar.style == R_SB_NEXT 1672 if ((R->scrollBar.style == R_SB_NEXT
1759 && scrollbarnext_upButton(ev->y)) 1673 && scrollbarnext_upButton(ev->y))
1760 || (R->scrollBar.style == R_SB_RXVT 1674 || (R->scrollBar.style == R_SB_RXVT
1761 && scrollbarrxvt_upButton(ev->y))) 1675 && scrollbarrxvt_upButton(ev->y)))
1762 rxvt_tt_printf(aR_ "\033[A"); 1676 R->tt_printf("\033[A");
1763 else if ((R->scrollBar.style == R_SB_NEXT 1677 else if ((R->scrollBar.style == R_SB_NEXT
1764 && scrollbarnext_dnButton(ev->y)) 1678 && scrollbarnext_dnButton(ev->y))
1765 || (R->scrollBar.style == R_SB_RXVT 1679 || (R->scrollBar.style == R_SB_RXVT
1766 && scrollbarrxvt_dnButton(ev->y))) 1680 && scrollbarrxvt_dnButton(ev->y)))
1767 rxvt_tt_printf(aR_ "\033[B"); 1681 R->tt_printf("\033[B");
1768 else 1682 else
1769 switch (ev->button) { 1683 switch (ev->button) {
1770 case Button2: 1684 case Button2:
1771 rxvt_tt_printf(aR_ "\014"); 1685 R->tt_printf("\014");
1772 break; 1686 break;
1773 case Button1: 1687 case Button1:
1774 rxvt_tt_printf(aR_ "\033[6~"); 1688 R->tt_printf("\033[6~");
1775 break; 1689 break;
1776 case Button3: 1690 case Button3:
1777 rxvt_tt_printf(aR_ "\033[5~"); 1691 R->tt_printf("\033[5~");
1778 break; 1692 break;
1779 } 1693 }
1780 } 1694 }
1781 else 1695 else
1782#endif /* NO_SCROLLBAR_REPORT */ 1696#endif /* NO_SCROLLBAR_REPORT */
… …
2183 return stream; 2097 return stream;
2184} 2098}
2185 2099
2186/* EXTPROTO */ 2100/* EXTPROTO */
2187int 2101int
2188rxvt_pclose_printer(FILE *stream) 2102rxvt_pclose_printer (FILE *stream)
2189{ 2103{
2190 fflush(stream); 2104 fflush (stream);
2191/* pclose() reported not to work on SunOS 4.1.3 */ 2105/* pclose() reported not to work on SunOS 4.1.3 */
2192# if defined (__sun__) /* TODO: RESOLVE THIS */ 2106# if defined (__sun__) /* TODO: RESOLVE THIS */
2193/* pclose works provided SIGCHLD handler uses waitpid */ 2107/* pclose works provided SIGCHLD handler uses waitpid */
2194 return pclose(stream); /* return fclose (stream); */ 2108 return pclose (stream); /* return fclose (stream); */
2195# else 2109# else
2196 return pclose(stream); 2110 return pclose (stream);
2197# endif 2111# endif
2198} 2112}
2199 2113
2200/* 2114/*
2201 * simulate attached vt100 printer 2115 * simulate attached vt100 printer
… …
2264rxvt_process_nonprinting(pR_ unsigned char ch) 2178rxvt_process_nonprinting(pR_ unsigned char ch)
2265{ 2179{
2266 switch (ch) { 2180 switch (ch) {
2267 case C0_ENQ: /* terminal Status */ 2181 case C0_ENQ: /* terminal Status */
2268 if (R->rs[Rs_answerbackstring]) 2182 if (R->rs[Rs_answerbackstring])
2269 rxvt_tt_write(aR_ 2183 R->tt_write(
2270 (const unsigned char *)R->rs[Rs_answerbackstring], 2184 (const unsigned char *)R->rs[Rs_answerbackstring],
2271 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2185 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272 else 2186 else
2273 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2187 R->tt_write((unsigned char *)VT100_ANS,
2274 (unsigned int)STRLEN(VT100_ANS)); 2188 (unsigned int)STRLEN(VT100_ANS));
2275 break; 2189 break;
2276 case C0_BEL: /* bell */ 2190 case C0_BEL: /* bell */
2277 rxvt_scr_bell(aR); 2191 rxvt_scr_bell(aR);
2278 break; 2192 break;
… …
2341 row = rxvt_cmd_getc(aR) - ' '; 2255 row = rxvt_cmd_getc(aR) - ' ';
2342 col = rxvt_cmd_getc(aR) - ' '; 2256 col = rxvt_cmd_getc(aR) - ' ';
2343 rxvt_scr_gotorc(aR_ row, col, 0); 2257 rxvt_scr_gotorc(aR_ row, col, 0);
2344 break; 2258 break;
2345 case 'Z': /* identify the terminal type */ 2259 case 'Z': /* identify the terminal type */
2346 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2260 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2347 break; 2261 break;
2348 case '<': /* turn off VT52 mode */ 2262 case '<': /* turn off VT52 mode */
2349 PrivMode(0, PrivMode_vt52); 2263 PrivMode(0, PrivMode_vt52);
2350 break; 2264 break;
2351 case 'F': /* use special graphics character set */ 2265 case 'F': /* use special graphics character set */
… …
2458 rxvt_process_dcs_seq(aR); 2372 rxvt_process_dcs_seq(aR);
2459 break; 2373 break;
2460 2374
2461 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2375 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462 case C1_SCI: /* ESC Z */ 2376 case C1_SCI: /* ESC Z */
2463 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2377 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2378 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465 break; /* steal obsolete ESC [ c */ 2379 break; /* steal obsolete ESC [ c */
2466 2380
2467 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2381 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468 case C1_CSI: /* ESC [ */ 2382 case C1_CSI: /* ESC [ */
… …
2589 */ 2503 */
2590 if (priv) { 2504 if (priv) {
2591 switch (priv) { 2505 switch (priv) {
2592 case '>': 2506 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2507 if (ch == CSI_DA) /* secondary device attributes */
2594 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2508 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2509 break;
2596 case '?': 2510 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2511 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2512 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599 break; 2513 break;
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2620 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2621 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2708 break; 2622 break;
2709 2623
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2624 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2625 R->tt_write((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2626 (unsigned int)(sizeof(VT100_ANS) - 1));
2713 break; 2627 break;
2714 2628
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2629 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 rxvt_process_sgr_mode(aR_ nargs, arg); 2630 rxvt_process_sgr_mode(aR_ nargs, arg);
2717 break; 2631 break;
2718 2632
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2633 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) { 2634 switch (arg[0]) {
2721 case 5: /* DSR requested */ 2635 case 5: /* DSR requested */
2722 rxvt_tt_printf(aR_ "\033[0n"); 2636 R->tt_printf("\033[0n");
2723 break; 2637 break;
2724 case 6: /* CPR requested */ 2638 case 6: /* CPR requested */
2725 rxvt_scr_report_position(aR); 2639 rxvt_scr_report_position(aR);
2726 break; 2640 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2641#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2642 case 7: /* unofficial extension */
2729 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2643 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730 break; 2644 break;
2731#endif 2645#endif
2732 case 8: /* unofficial extension */ 2646 case 8: /* unofficial extension */
2733 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2647 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2648 break;
… …
2803 break; 2717 break;
2804#endif 2718#endif
2805 2719
2806 case CSI_78: /* DECREQTPARM */ 2720 case CSI_78: /* DECREQTPARM */
2807 if (arg[0] == 0 || arg[0] == 1) 2721 if (arg[0] == 0 || arg[0] == 1)
2808 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2722 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2809 /* FALLTHROUGH */ 2723 /* FALLTHROUGH */
2810 2724
2811 default: 2725 default:
2812 break; 2726 break;
2813 } 2727 }
… …
2867 /* 2781 /*
2868 * reports - some output format copied from XTerm 2782 * reports - some output format copied from XTerm
2869 */ 2783 */
2870 case 11: /* report window state */ 2784 case 11: /* report window state */
2871 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2785 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2786 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873 break; 2787 break;
2874 case 13: /* report window position */ 2788 case 13: /* report window position */
2875 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2790 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877 -wattr.border_width, -wattr.border_width, 2791 -wattr.border_width, -wattr.border_width,
2878 &x, &y, &wdummy); 2792 &x, &y, &wdummy);
2879 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2793 R->tt_printf("\033[3;%d;%dt", x, y);
2880 break; 2794 break;
2881 case 14: /* report window size (pixels) */ 2795 case 14: /* report window size (pixels) */
2882 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2796 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2797 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884 break; 2798 break;
2885 case 18: /* report window size (chars) */ 2799 case 18: /* report window size (chars) */
2886 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2800 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2887 break; 2801 break;
2888#if 0 /* XXX: currently disabled due to security concerns */ 2802#if 0 /* XXX: currently disabled due to security concerns */
2889 case 20: /* report icon label */ 2803 case 20: /* report icon label */
2890 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2804 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2805 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892 break; 2806 break;
2893 case 21: /* report window title */ 2807 case 21: /* report window title */
2894 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2808 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2809 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896 break; 2810 break;
2897#endif 2811#endif
2898 } 2812 }
2899} 2813}
2900#endif 2814#endif
… …
3443{ 3357{
3444 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3358 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445 3359
3446#ifndef RXVT_GRAPHICS 3360#ifndef RXVT_GRAPHICS
3447 if (cmd == 'Q') { /* query graphics */ 3361 if (cmd == 'Q') { /* query graphics */
3448 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3362 R->tt_printf("\033G0\n"); /* no graphics */
3449 return; 3363 return;
3450 } 3364 }
3451/* swallow other graphics sequences until terminating ':' */ 3365/* swallow other graphics sequences until terminating ':' */
3452 do 3366 do
3453 ch = rxvt_cmd_getc(aR); 3367 ch = rxvt_cmd_getc(aR);
… …
3456 unsigned int nargs; 3370 unsigned int nargs;
3457 int args[NGRX_PTS]; 3371 int args[NGRX_PTS];
3458 unsigned char *text = NULL; 3372 unsigned char *text = NULL;
3459 3373
3460 if (cmd == 'Q') { /* query graphics */ 3374 if (cmd == 'Q') { /* query graphics */
3461 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3375 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462 return; 3376 return;
3463 } 3377 }
3464 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3378 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465 int neg; 3379 int neg;
3466 3380
… …
3500 3414
3501/* 3415/*
3502 * Send printf() formatted output to the command. 3416 * Send printf() formatted output to the command.
3503 * Only use for small amounts of data. 3417 * Only use for small amounts of data.
3504 */ 3418 */
3505/* EXTPROTO */
3506void 3419void
3507rxvt_tt_printf(pR_ const char *fmt,...) 3420rxvt_term::tt_printf (const char *fmt,...)
3508{ 3421{
3509 va_list arg_ptr; 3422 va_list arg_ptr;
3510 unsigned char buf[256]; 3423 unsigned char buf[256];
3511 3424
3512 va_start(arg_ptr, fmt); 3425 va_start (arg_ptr, fmt);
3513 vsprintf((char *)buf, fmt, arg_ptr); 3426 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514 va_end(arg_ptr); 3427 va_end (arg_ptr);
3515 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3428 tt_write (buf, STRLEN (buf));
3516} 3429}
3517 3430
3518/* ---------------------------------------------------------------------- */ 3431/* ---------------------------------------------------------------------- */
3519/* Addresses pasting large amounts of data and rxvt hang
3520 * code pinched from xterm (v_write()) and applied originally to
3521 * rxvt-2.18 - Hops
3522 * Write data to the pty as typed by the user, pasted with the mouse, 3432/* Write data to the pty as typed by the user, pasted with the mouse,
3523 * or generated by us in response to a query ESC sequence. 3433 * or generated by us in response to a query ESC sequence.
3524 */ 3434 */
3525/* EXTPROTO */
3526void 3435void
3527rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3436rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528{ 3437{
3529#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3438 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3530 int riten;
3531 unsigned int p;
3532 unsigned char *v_buffer, /* start of physical buffer */
3533 *v_bufstr, /* start of current buffer pending */
3534 *v_bufptr, /* end of current buffer pending */
3535 *v_bufend; /* end of physical buffer */
3536 3439
3537 if (R->v_bufstr == NULL && len > 0) { 3440 if (len)
3538 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3539 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3540 v_bufend = v_buffer + p;
3541 } else {
3542 v_buffer = R->v_buffer;
3543 v_bufstr = R->v_bufstr;
3544 v_bufptr = R->v_bufptr;
3545 v_bufend = R->v_bufend;
3546 } 3441 {
3442 if (v_buflen == 0)
3443 {
3444 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3445 if (written == len)
3446 return;
3547 3447
3548 /* 3448 data += written;
3549 * Append to the block we already have. Always doing this simplifies the 3449 len -= written;
3550 * code, and isn't too bad, either. If this is a short block, it isn't 3450 }
3551 * too expensive, and if this is a long block, we won't be able to write 3451
3552 * it all anyway. 3452
3553 */ 3453 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554 if (len > 0) { 3454
3555 if (v_bufend < v_bufptr + len) { /* run out of room */ 3455 memcpy (v_buffer + v_buflen, data, len);
3556 if (v_bufstr != v_buffer) { 3456 v_buflen += len;
3557 /* there is unused space, move everything down */
3558 MEMMOVE(v_buffer, v_bufstr,
3559 (unsigned int)(v_bufptr - v_bufstr));
3560 v_bufptr -= v_bufstr - v_buffer;
3561 v_bufstr = v_buffer;
3562 } 3457 }
3563 if (v_bufend < v_bufptr + len) {
3564 /* still won't fit: get more space */
3565 /* use most basic realloc because an error is not fatal. */
3566 unsigned int size = v_bufptr - v_buffer;
3567 unsigned int reallocto;
3568 3458
3569 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3459 for (;;)
3570 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3460 {
3571 /* save across realloc */ 3461 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572 if (v_buffer) { 3462
3573 v_bufstr = v_buffer; 3463 if (written > 0)
3574 v_bufptr = v_buffer + size; 3464 {
3575 v_bufend = v_buffer + reallocto; 3465 v_buflen -= written;
3576 } else { /* no memory: ignore entire write request */ 3466
3577 rxvt_print_error("data loss: cannot allocate buffer space"); 3467 if (v_buflen == 0)
3578 v_buffer = v_bufstr; /* restore clobbered pointer */ 3468 {
3579 } 3469 free (v_buffer);
3470 v_buffer = 0;
3471 v_buflen = 0;
3472
3473 pty_ev.set (EVENT_READ);
3474 return;
3475 }
3476
3477 memmove (v_buffer, v_buffer + written, v_buflen);
3478 }
3479 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3480 // original code just ignores this...
3481 destroy ();
3482 else
3483 {
3484 pty_ev.set (EVENT_READ | EVENT_WRITE);
3485 return;
3486 }
3580 } 3487 }
3581 }
3582 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3583 MEMCPY(v_bufptr, d, len);
3584 v_bufptr += len;
3585 }
3586 }
3587
3588 /*
3589 * Write out as much of the buffer as we can.
3590 * Be careful not to overflow the pty's input silo.
3591 * We are conservative here and only write a small amount at a time.
3592 *
3593 * If we can't push all the data into the pty yet, we expect write
3594 * to return a non-negative number less than the length requested
3595 * (if some data written) or -1 and set errno to EAGAIN,
3596 * EWOULDBLOCK, or EINTR (if no data written).
3597 *
3598 * (Not all systems do this, sigh, so the code is actually
3599 * a little more forgiving.)
3600 */
3601 if ((p = v_bufptr - v_bufstr) > 0) {
3602 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3603 if (riten < 0)
3604 riten = 0;
3605 v_bufstr += riten;
3606 if (v_bufstr >= v_bufptr) /* we wrote it all */
3607 v_bufstr = v_bufptr = v_buffer;
3608 }
3609 /*
3610 * If we have lots of unused memory allocated, return it
3611 */
3612 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3613 /* save pointers across realloc */
3614 unsigned int start = v_bufstr - v_buffer;
3615 unsigned int size = v_bufptr - v_buffer;
3616 unsigned int reallocto;
3617
3618 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3619 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3620 if (v_buffer) {
3621 v_bufstr = v_buffer + start;
3622 v_bufptr = v_buffer + size;
3623 v_bufend = v_buffer + reallocto;
3624 } else {
3625 /* should we print a warning if couldn't return memory? */
3626 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3627 }
3628 }
3629 R->v_buffer = v_buffer;
3630 R->v_bufstr = v_bufstr;
3631 R->v_bufptr = v_bufptr;
3632 R->v_bufend = v_bufend;
3633} 3488}
3489
3634/*----------------------- end-of-file (C source) -----------------------*/ 3490/*----------------------- end-of-file (C source) -----------------------*/
3635 3491

Diff Legend

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