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.15 by pcg, Tue Dec 16 23:04:13 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.15 2003/12/16 23:04:13 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);
696
668#if defined(CURSOR_BLINK) 697#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 698 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) { 699 && xev.type == KeyPress)
700 {
671 if (hidden_cursor) { 701 if (hidden_cursor)
702 {
672 hidden_cursor = 0; 703 hidden_cursor = 0;
673 want_refresh = 1; 704 want_refresh = 1;
674 } 705 }
675 want_keypress_time = 1; 706
707 blink_ev.start (NOW + BLINK_INTERVAL);
676 } 708 }
677#endif 709#endif
678 710
679#if defined(POINTER_BLANK) 711#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 712 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) { 713 && (pointerBlankDelay > 0))
714 {
682 if (xev.type == MotionNotify 715 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 716 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 717 || xev.type == ButtonRelease)
685 if (hidden_pointer) 718 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 719 pointer_unblank ();
687 want_motion_time = 1; 720
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 721 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 722 pointer_blank ();
691 } 723 }
692#endif 724#endif
693 725
694#ifdef USE_XIM 726#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 727 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 728#endif
… …
698 } 730 }
699 while (XPending (Xdisplay)); 731 while (XPending (Xdisplay));
700} 732}
701 733
702void 734void
735rxvt_term::blink_cb (time_watcher &w)
736{
737 SET_R (this);
738
739 w.at += BLINK_INTERVAL;
740 hidden_cursor = !hidden_cursor;
741 want_refresh = 1;
742}
743
744void
703rxvt_term::x_cb (io_watcher &w, short revents) 745rxvt_term::x_cb (io_watcher &w, short revents)
704{ 746{
747 SET_R (this);
748
705 process_x_events (); 749 process_x_events ();
750}
706 751
707 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 }
708} 888}
709 889
710// read the next character, currently handles UTF-8 890// read the next character, currently handles UTF-8
711// will probably handle all sorts of other stuff in the future 891// will probably handle all sorts of other stuff in the future
712uint32_t 892uint32_t
… …
760 } 940 }
761 941
762 return NOCHAR; 942 return NOCHAR;
763} 943}
764 944
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 */ 945/* rxvt_cmd_getc() - Return next input character */
917/* 946/*
918 * Return the next input character after first passing any keyboard input 947 * Return the next input character after first passing any keyboard input
919 * to the command. 948 * to the command.
920 */ 949 */
… …
929 return c; 958 return c;
930 959
931 // incomplete sequences should occur rarely, still, a better solution 960 // incomplete sequences should occur rarely, still, a better solution
932 // would be preferred. either setjmp/longjmp or better design. 961 // would be preferred. either setjmp/longjmp or better design.
933 fcntl (R->cmd_fd, F_SETFL, 0); 962 fcntl (R->cmd_fd, F_SETFL, 0);
934 R->pty_fill (1); 963 R->pty_fill ();
935 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 964 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936 } 965 }
937 966
967#if 0
938#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
939 fd_set readfds; 969 fd_set readfds;
940 int quick_timeout, select_res; 970 int quick_timeout, select_res;
941 int want_motion_time, want_keypress_time; 971 int want_motion_time, want_keypress_time;
942 struct timeval value; 972 struct timeval value;
… …
946 976
947 for (;;) { 977 for (;;) {
948 /* loop until we can return something */ 978 /* loop until we can return something */
949 979
950 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 980 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951 rxvt_tt_write(aR_ NULL, 0); 981 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 982
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (R->mouse_slip_wheel_speed) { 984 if (R->mouse_slip_wheel_speed) {
995 quick_timeout = 1; 985 quick_timeout = 1;
996 if (!R->mouse_slip_wheel_delay-- 986 if (!R->mouse_slip_wheel_delay--
… …
1026 R->want_refresh = 1; 1016 R->want_refresh = 1;
1027 } 1017 }
1028 } 1018 }
1029#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030 1020
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 1021#ifdef TRANSPARENT
1042 quick_timeout |= R->want_full_refresh; 1022 quick_timeout |= R->want_full_refresh;
1043#endif 1023#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 1024#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} 1025}
1112 1026
1113/* EXTPROTO */
1114void 1027void
1115rxvt_pointer_unblank(pR) 1028rxvt_term::pointer_unblank ()
1116{ 1029{
1117 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118 rxvt_recolour_cursor(aR); 1031 rxvt_recolour_cursor (this);
1032
1119#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
1120 R->hidden_pointer = 0; 1034 hidden_pointer = 0;
1121 if (R->pointerBlankDelay > 0) {
1122 struct timeval tp;
1123 1035
1124 (void)gettimeofday(&tp, NULL); 1036 if (Options & Opt_pointerBlank)
1125 R->lastmotion.tv_sec = tp.tv_sec; 1037 pointer_ev.start (NOW + pointerBlankDelay);
1126 R->lastmotion.tv_usec = tp.tv_usec;
1127 }
1128#endif 1038#endif
1129} 1039}
1130 1040
1131#ifdef POINTER_BLANK 1041#ifdef POINTER_BLANK
1132/* INTPROTO */
1133void 1042void
1134rxvt_pointer_blank(pR) 1043rxvt_term::pointer_blank ()
1135{ 1044{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank))
1048 return;
1049
1136 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137 XFlush(R->Xdisplay); 1051 XFlush (Xdisplay);
1052
1138 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 ();
1139} 1062}
1140#endif 1063#endif
1141 1064
1142/* INTPROTO */ 1065/* INTPROTO */
1143void 1066void
… …
1196 fprintf(stderr, "]: <%d>, %d/%d\n", 1119 fprintf(stderr, "]: <%d>, %d/%d\n",
1197 button_number, 1120 button_number,
1198 x + 1, 1121 x + 1,
1199 y + 1); 1122 y + 1);
1200#else 1123#else
1201 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1124 R->tt_printf("\033[M%c%c%c",
1202 (32 + button_number + key_state), 1125 (32 + button_number + key_state),
1203 (32 + x + 1), 1126 (32 + x + 1),
1204 (32 + y + 1)); 1127 (32 + y + 1));
1205#endif 1128#endif
1206} 1129}
… …
1223{ 1146{
1224 int i, want_timeout; 1147 int i, want_timeout;
1225 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1226 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1227 unsigned int unused_mask; 1150 unsigned int unused_mask;
1228 struct timeval tp;
1229 1151
1230#ifdef DEBUG_X 1152#ifdef DEBUG_X
1231 const char *const eventnames[] = 1153 const char *const eventnames[] =
1232 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1233 "", 1155 "",
… …
1264 "SelectionNotify", 1186 "SelectionNotify",
1265 "ColormapNotify", 1187 "ColormapNotify",
1266 "ClientMessage", 1188 "ClientMessage",
1267 "MappingNotify" 1189 "MappingNotify"
1268 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1269 struct tm *ltt; 1195 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); 1196 (void)gettimeofday(&tp, NULL);
1286
1287#ifdef DEBUG_X
1288 ltt = localtime(&(tp.tv_sec)); 1197 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)); 1198 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 1199#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 1200
1312 switch (ev->type) { 1201 switch (ev->type) {
1313 case KeyPress: 1202 case KeyPress:
1314 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1315 break; 1204 break;
… …
1339 break; 1228 break;
1340 1229
1341 case ClientMessage: 1230 case ClientMessage:
1342 if (ev->xclient.format == 32 1231 if (ev->xclient.format == 32
1343 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344 exit(EXIT_SUCCESS); 1233 R->destroy ();
1345#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1346 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1347 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348 && (ev->xclient.data.l[0] == DndFile 1237 && (ev->xclient.data.l[0] == DndFile
1349 || ev->xclient.data.l[0] == DndDir 1238 || ev->xclient.data.l[0] == DndDir
1350 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev->xclient.data.l[0] == DndLink)) {
1351 /* Get Dnd data */ 1240 /* Get Dnd data */
1352 Atom ActualType; 1241 Atom ActualType;
… …
1384 * in the GraphicsExpose parts, which means that after each refresh, 1273 * in the GraphicsExpose parts, which means that after each refresh,
1385 * we need to wait for the graphics expose or Noexpose events, 1274 * we need to wait for the graphics expose or Noexpose events,
1386 * which ought to make things real slow! 1275 * which ought to make things real slow!
1387 */ 1276 */
1388 case VisibilityNotify: 1277 case VisibilityNotify:
1389 switch (ev->xvisibility.state) { 1278 switch (ev->xvisibility.state)
1279 {
1390 case VisibilityUnobscured: 1280 case VisibilityUnobscured:
1391 R->refresh_type = FAST_REFRESH; 1281 R->refresh_type = FAST_REFRESH;
1392 break; 1282 break;
1393 case VisibilityPartiallyObscured: 1283 case VisibilityPartiallyObscured:
1394 R->refresh_type = SLOW_REFRESH; 1284 R->refresh_type = SLOW_REFRESH;
1395 break; 1285 break;
1396 default: 1286 default:
1397 R->refresh_type = NO_REFRESH; 1287 R->refresh_type = NO_REFRESH;
1398 break; 1288 break;
1399 } 1289 }
1400 break; 1290 break;
1401 1291
1402 case FocusIn: 1292 case FocusIn:
1403 if (!R->TermWin.focus) { 1293 if (!R->TermWin.focus) {
1404 R->TermWin.focus = 1; 1294 R->TermWin.focus = 1;
1405 R->want_refresh = 1; 1295 R->want_refresh = 1;
1406#ifdef USE_XIM 1296#ifdef USE_XIM
1407 if (R->Input_Context != NULL) 1297 if (R->Input_Context != NULL)
1408 XSetICFocus(R->Input_Context); 1298 XSetICFocus(R->Input_Context);
1409#endif 1299#endif
1300#ifdef CURSOR_BLINK
1301 if (R->Options & Opt_cursorBlink)
1302 R->blink_ev.start (NOW + BLINK_INTERVAL);
1303#endif
1410 } 1304 }
1411 break; 1305 break;
1412 1306
1413 case FocusOut: 1307 case FocusOut:
1414 if (R->TermWin.focus) { 1308 if (R->TermWin.focus) {
1415 R->TermWin.focus = 0; 1309 R->TermWin.focus = 0;
1416 R->want_refresh = 1; 1310 R->want_refresh = 1;
1417#ifdef USE_XIM 1311#ifdef USE_XIM
1418 if (R->Input_Context != NULL) 1312 if (R->Input_Context != NULL)
1419 XUnsetICFocus(R->Input_Context); 1313 XUnsetICFocus(R->Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (R->Options & Opt_cursorBlink)
1317 R->blink_ev.stop ();
1318 R->hidden_cursor = 0;
1420#endif 1319#endif
1421 } 1320 }
1422 break; 1321 break;
1423 1322
1424 case ConfigureNotify: 1323 case ConfigureNotify:
… …
1537 break; 1436 break;
1538 1437
1539 case MotionNotify: 1438 case MotionNotify:
1540#ifdef POINTER_BLANK 1439#ifdef POINTER_BLANK
1541 if (R->hidden_pointer) 1440 if (R->hidden_pointer)
1542 rxvt_pointer_unblank(aR); 1441 R->pointer_unblank ();
1543#endif 1442#endif
1544#if MENUBAR 1443#if MENUBAR
1545 if (isMenuBarWindow(ev->xany.window)) { 1444 if (isMenuBarWindow(ev->xany.window)) {
1546 rxvt_menubar_control(aR_ &(ev->xbutton)); 1445 rxvt_menubar_control(aR_ &(ev->xbutton));
1547 break; 1446 break;
… …
1738 */ 1637 */
1739 if ((R->scrollBar.style == R_SB_NEXT 1638 if ((R->scrollBar.style == R_SB_NEXT
1740 && scrollbarnext_upButton(ev->y)) 1639 && scrollbarnext_upButton(ev->y))
1741 || (R->scrollBar.style == R_SB_RXVT 1640 || (R->scrollBar.style == R_SB_RXVT
1742 && scrollbarrxvt_upButton(ev->y))) 1641 && scrollbarrxvt_upButton(ev->y)))
1743 rxvt_tt_printf(aR_ "\033[A"); 1642 R->tt_printf("\033[A");
1744 else if ((R->scrollBar.style == R_SB_NEXT 1643 else if ((R->scrollBar.style == R_SB_NEXT
1745 && scrollbarnext_dnButton(ev->y)) 1644 && scrollbarnext_dnButton(ev->y))
1746 || (R->scrollBar.style == R_SB_RXVT 1645 || (R->scrollBar.style == R_SB_RXVT
1747 && scrollbarrxvt_dnButton(ev->y))) 1646 && scrollbarrxvt_dnButton(ev->y)))
1748 rxvt_tt_printf(aR_ "\033[B"); 1647 R->tt_printf("\033[B");
1749 else 1648 else
1750 switch (ev->button) { 1649 switch (ev->button) {
1751 case Button2: 1650 case Button2:
1752 rxvt_tt_printf(aR_ "\014"); 1651 R->tt_printf("\014");
1753 break; 1652 break;
1754 case Button1: 1653 case Button1:
1755 rxvt_tt_printf(aR_ "\033[6~"); 1654 R->tt_printf("\033[6~");
1756 break; 1655 break;
1757 case Button3: 1656 case Button3:
1758 rxvt_tt_printf(aR_ "\033[5~"); 1657 R->tt_printf("\033[5~");
1759 break; 1658 break;
1760 } 1659 }
1761 } 1660 }
1762 else 1661 else
1763#endif /* NO_SCROLLBAR_REPORT */ 1662#endif /* NO_SCROLLBAR_REPORT */
… …
2164 return stream; 2063 return stream;
2165} 2064}
2166 2065
2167/* EXTPROTO */ 2066/* EXTPROTO */
2168int 2067int
2169rxvt_pclose_printer(FILE *stream) 2068rxvt_pclose_printer (FILE *stream)
2170{ 2069{
2171 fflush(stream); 2070 fflush (stream);
2172/* pclose() reported not to work on SunOS 4.1.3 */ 2071/* pclose() reported not to work on SunOS 4.1.3 */
2173# if defined (__sun__) /* TODO: RESOLVE THIS */ 2072# if defined (__sun__) /* TODO: RESOLVE THIS */
2174/* pclose works provided SIGCHLD handler uses waitpid */ 2073/* pclose works provided SIGCHLD handler uses waitpid */
2175 return pclose(stream); /* return fclose (stream); */ 2074 return pclose (stream); /* return fclose (stream); */
2176# else 2075# else
2177 return pclose(stream); 2076 return pclose (stream);
2178# endif 2077# endif
2179} 2078}
2180 2079
2181/* 2080/*
2182 * simulate attached vt100 printer 2081 * simulate attached vt100 printer
… …
2245rxvt_process_nonprinting(pR_ unsigned char ch) 2144rxvt_process_nonprinting(pR_ unsigned char ch)
2246{ 2145{
2247 switch (ch) { 2146 switch (ch) {
2248 case C0_ENQ: /* terminal Status */ 2147 case C0_ENQ: /* terminal Status */
2249 if (R->rs[Rs_answerbackstring]) 2148 if (R->rs[Rs_answerbackstring])
2250 rxvt_tt_write(aR_ 2149 R->tt_write(
2251 (const unsigned char *)R->rs[Rs_answerbackstring], 2150 (const unsigned char *)R->rs[Rs_answerbackstring],
2252 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2151 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253 else 2152 else
2254 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2153 R->tt_write((unsigned char *)VT100_ANS,
2255 (unsigned int)STRLEN(VT100_ANS)); 2154 (unsigned int)STRLEN(VT100_ANS));
2256 break; 2155 break;
2257 case C0_BEL: /* bell */ 2156 case C0_BEL: /* bell */
2258 rxvt_scr_bell(aR); 2157 rxvt_scr_bell(aR);
2259 break; 2158 break;
… …
2322 row = rxvt_cmd_getc(aR) - ' '; 2221 row = rxvt_cmd_getc(aR) - ' ';
2323 col = rxvt_cmd_getc(aR) - ' '; 2222 col = rxvt_cmd_getc(aR) - ' ';
2324 rxvt_scr_gotorc(aR_ row, col, 0); 2223 rxvt_scr_gotorc(aR_ row, col, 0);
2325 break; 2224 break;
2326 case 'Z': /* identify the terminal type */ 2225 case 'Z': /* identify the terminal type */
2327 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2226 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2328 break; 2227 break;
2329 case '<': /* turn off VT52 mode */ 2228 case '<': /* turn off VT52 mode */
2330 PrivMode(0, PrivMode_vt52); 2229 PrivMode(0, PrivMode_vt52);
2331 break; 2230 break;
2332 case 'F': /* use special graphics character set */ 2231 case 'F': /* use special graphics character set */
… …
2439 rxvt_process_dcs_seq(aR); 2338 rxvt_process_dcs_seq(aR);
2440 break; 2339 break;
2441 2340
2442 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2341 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443 case C1_SCI: /* ESC Z */ 2342 case C1_SCI: /* ESC Z */
2444 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2343 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2344 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446 break; /* steal obsolete ESC [ c */ 2345 break; /* steal obsolete ESC [ c */
2447 2346
2448 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2347 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449 case C1_CSI: /* ESC [ */ 2348 case C1_CSI: /* ESC [ */
… …
2570 */ 2469 */
2571 if (priv) { 2470 if (priv) {
2572 switch (priv) { 2471 switch (priv) {
2573 case '>': 2472 case '>':
2574 if (ch == CSI_DA) /* secondary device attributes */ 2473 if (ch == CSI_DA) /* secondary device attributes */
2575 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2474 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576 break; 2475 break;
2577 case '?': 2476 case '?':
2578 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2477 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2478 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580 break; 2479 break;
… …
2687 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2586 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2587 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2689 break; 2588 break;
2690 2589
2691 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2590 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2591 R->tt_write((const unsigned char *)VT100_ANS,
2693 (unsigned int)(sizeof(VT100_ANS) - 1)); 2592 (unsigned int)(sizeof(VT100_ANS) - 1));
2694 break; 2593 break;
2695 2594
2696 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2595 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697 rxvt_process_sgr_mode(aR_ nargs, arg); 2596 rxvt_process_sgr_mode(aR_ nargs, arg);
2698 break; 2597 break;
2699 2598
2700 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2599 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701 switch (arg[0]) { 2600 switch (arg[0]) {
2702 case 5: /* DSR requested */ 2601 case 5: /* DSR requested */
2703 rxvt_tt_printf(aR_ "\033[0n"); 2602 R->tt_printf("\033[0n");
2704 break; 2603 break;
2705 case 6: /* CPR requested */ 2604 case 6: /* CPR requested */
2706 rxvt_scr_report_position(aR); 2605 rxvt_scr_report_position(aR);
2707 break; 2606 break;
2708#if defined (ENABLE_DISPLAY_ANSWER) 2607#if defined (ENABLE_DISPLAY_ANSWER)
2709 case 7: /* unofficial extension */ 2608 case 7: /* unofficial extension */
2710 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2609 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711 break; 2610 break;
2712#endif 2611#endif
2713 case 8: /* unofficial extension */ 2612 case 8: /* unofficial extension */
2714 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2613 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715 break; 2614 break;
… …
2784 break; 2683 break;
2785#endif 2684#endif
2786 2685
2787 case CSI_78: /* DECREQTPARM */ 2686 case CSI_78: /* DECREQTPARM */
2788 if (arg[0] == 0 || arg[0] == 1) 2687 if (arg[0] == 0 || arg[0] == 1)
2789 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2688 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2790 /* FALLTHROUGH */ 2689 /* FALLTHROUGH */
2791 2690
2792 default: 2691 default:
2793 break; 2692 break;
2794 } 2693 }
… …
2848 /* 2747 /*
2849 * reports - some output format copied from XTerm 2748 * reports - some output format copied from XTerm
2850 */ 2749 */
2851 case 11: /* report window state */ 2750 case 11: /* report window state */
2852 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2751 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2752 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854 break; 2753 break;
2855 case 13: /* report window position */ 2754 case 13: /* report window position */
2856 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2755 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2756 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858 -wattr.border_width, -wattr.border_width, 2757 -wattr.border_width, -wattr.border_width,
2859 &x, &y, &wdummy); 2758 &x, &y, &wdummy);
2860 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2759 R->tt_printf("\033[3;%d;%dt", x, y);
2861 break; 2760 break;
2862 case 14: /* report window size (pixels) */ 2761 case 14: /* report window size (pixels) */
2863 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2762 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2763 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865 break; 2764 break;
2866 case 18: /* report window size (chars) */ 2765 case 18: /* report window size (chars) */
2867 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2766 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2868 break; 2767 break;
2869#if 0 /* XXX: currently disabled due to security concerns */ 2768#if 0 /* XXX: currently disabled due to security concerns */
2870 case 20: /* report icon label */ 2769 case 20: /* report icon label */
2871 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2770 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2771 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873 break; 2772 break;
2874 case 21: /* report window title */ 2773 case 21: /* report window title */
2875 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2774 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2775 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877 break; 2776 break;
2878#endif 2777#endif
2879 } 2778 }
2880} 2779}
2881#endif 2780#endif
… …
3424{ 3323{
3425 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3324 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426 3325
3427#ifndef RXVT_GRAPHICS 3326#ifndef RXVT_GRAPHICS
3428 if (cmd == 'Q') { /* query graphics */ 3327 if (cmd == 'Q') { /* query graphics */
3429 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3328 R->tt_printf("\033G0\n"); /* no graphics */
3430 return; 3329 return;
3431 } 3330 }
3432/* swallow other graphics sequences until terminating ':' */ 3331/* swallow other graphics sequences until terminating ':' */
3433 do 3332 do
3434 ch = rxvt_cmd_getc(aR); 3333 ch = rxvt_cmd_getc(aR);
… …
3437 unsigned int nargs; 3336 unsigned int nargs;
3438 int args[NGRX_PTS]; 3337 int args[NGRX_PTS];
3439 unsigned char *text = NULL; 3338 unsigned char *text = NULL;
3440 3339
3441 if (cmd == 'Q') { /* query graphics */ 3340 if (cmd == 'Q') { /* query graphics */
3442 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3341 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443 return; 3342 return;
3444 } 3343 }
3445 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3344 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446 int neg; 3345 int neg;
3447 3346
… …
3481 3380
3482/* 3381/*
3483 * Send printf() formatted output to the command. 3382 * Send printf() formatted output to the command.
3484 * Only use for small amounts of data. 3383 * Only use for small amounts of data.
3485 */ 3384 */
3486/* EXTPROTO */
3487void 3385void
3488rxvt_tt_printf(pR_ const char *fmt,...) 3386rxvt_term::tt_printf (const char *fmt,...)
3489{ 3387{
3490 va_list arg_ptr; 3388 va_list arg_ptr;
3491 unsigned char buf[256]; 3389 unsigned char buf[256];
3492 3390
3493 va_start(arg_ptr, fmt); 3391 va_start (arg_ptr, fmt);
3494 vsprintf((char *)buf, fmt, arg_ptr); 3392 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495 va_end(arg_ptr); 3393 va_end (arg_ptr);
3496 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3394 tt_write (buf, STRLEN (buf));
3497} 3395}
3498 3396
3499/* ---------------------------------------------------------------------- */ 3397/* ---------------------------------------------------------------------- */
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, 3398/* 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. 3399 * or generated by us in response to a query ESC sequence.
3505 */ 3400 */
3506/* EXTPROTO */
3507void 3401void
3508rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3402rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 3403{
3510#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3404 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 3405
3518 if (R->v_bufstr == NULL && len > 0) { 3406 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 } 3407 {
3408 if (v_buflen == 0)
3409 {
3410 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3411 if (written == len)
3412 return;
3528 3413
3529 /* 3414 data += written;
3530 * Append to the block we already have. Always doing this simplifies the 3415 len -= written;
3531 * code, and isn't too bad, either. If this is a short block, it isn't 3416 }
3532 * too expensive, and if this is a long block, we won't be able to write 3417
3533 * it all anyway. 3418
3534 */ 3419 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535 if (len > 0) { 3420
3536 if (v_bufend < v_bufptr + len) { /* run out of room */ 3421 memcpy (v_buffer + v_buflen, data, len);
3537 if (v_bufstr != v_buffer) { 3422 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 } 3423 }
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 3424
3550 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3425 for (;;)
3551 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3426 {
3552 /* save across realloc */ 3427 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553 if (v_buffer) { 3428
3554 v_bufstr = v_buffer; 3429 if (written > 0)
3555 v_bufptr = v_buffer + size; 3430 {
3556 v_bufend = v_buffer + reallocto; 3431 v_buflen -= written;
3557 } else { /* no memory: ignore entire write request */ 3432
3558 rxvt_print_error("data loss: cannot allocate buffer space"); 3433 if (v_buflen == 0)
3559 v_buffer = v_bufstr; /* restore clobbered pointer */ 3434 {
3560 } 3435 free (v_buffer);
3436 v_buffer = 0;
3437 v_buflen = 0;
3438
3439 pty_ev.set (EVENT_READ);
3440 return;
3441 }
3442
3443 memmove (v_buffer, v_buffer + written, v_buflen);
3444 }
3445 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3446 // original code just ignores this...
3447 destroy ();
3448 else
3449 {
3450 pty_ev.set (EVENT_READ | EVENT_WRITE);
3451 return;
3452 }
3561 } 3453 }
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} 3454}
3455
3615/*----------------------- end-of-file (C source) -----------------------*/ 3456/*----------------------- end-of-file (C source) -----------------------*/
3616 3457

Diff Legend

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