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.3 by pcg, Tue Nov 25 11:52:42 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.3 2003/11/25 11:52:42 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() */
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 623rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633{ 624{
634 unsigned int n, s; 625 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->cmdbuf_base, 626 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->cmdbuf_endp, 627 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->cmdbuf_ptr; 628 *cmdbuf_ptr = R->cmdbuf_ptr;
638 629
639 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 632 if (n > 0 && s < count) {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 633 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
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}
751
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 }
706} 888}
707 889
708// read the next character, currently handles UTF-8 890// read the next character, currently handles UTF-8
709// will probably handle all sorts of other stuff in the future 891// will probably handle all sorts of other stuff in the future
710static uint32_t 892uint32_t
711next_char (pR) 893rxvt_term::next_char ()
712{ 894{
713 mbstate &s = R->mbstate; 895 struct mbstate &s = mbstate;
714 896
715 while (R->cmdbuf_ptr < R->cmdbuf_endp) 897 while (cmdbuf_ptr < cmdbuf_endp)
716 { 898 {
717 uint8_t ch = *R->cmdbuf_ptr; 899 uint8_t ch = *cmdbuf_ptr;
718 900
719 if (s.cnt) 901 if (s.cnt)
720 { 902 {
721 if ((ch & 0xc0) == 0x80) 903 if ((ch & 0xc0) == 0x80)
722 { 904 {
723 R->cmdbuf_ptr++; 905 cmdbuf_ptr++;
724 906
725 /* continuation */ 907 /* continuation */
726 s.reg = (s.reg << 6) | (ch & 0x7f); 908 s.reg = (s.reg << 6) | (ch & 0x7f);
727 909
728 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ 910 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
737 } 919 }
738 } 920 }
739 921
740 if ((ch & 0xc0) == 0xc0) 922 if ((ch & 0xc0) == 0xc0)
741 { 923 {
742 R->cmdbuf_ptr++; 924 cmdbuf_ptr++;
743 925
744 /* first byte */ 926 /* first byte */
745 s.orig = ch; /* for broken encodings */ 927 s.orig = ch; /* for broken encodings */
746 s.reg = ch; 928 s.reg = ch;
747 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
750 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
751 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
752 } 934 }
753 else 935 else
754 { 936 {
755 R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 937 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756 return ch; 938 return ch;
757 } 939 }
758 } 940 }
759 941
760 return NOCHAR; 942 return NOCHAR;
761}
762
763void
764rxvt_term::pty_cb (io_watcher &w, short revents)
765{
766 int n;
767 unsigned int count;
768
769 if (count = (cmdbuf_endp - cmdbuf_ptr))
770 {
771 memmove (cmdbuf_base, cmdbuf_ptr, count);
772 cmdbuf_ptr = cmdbuf_base;
773 cmdbuf_endp = cmdbuf_ptr + count;
774 }
775
776
777 for (count = BUFSIZ - count; count; count -= n, cmdbuf_endp += n)
778 if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0)
779 continue;
780 else if (n == 0 || (n < 0 && errno == EAGAIN))
781 break;
782 else
783 {
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786 }
787
788 if (count != BUFSIZ) /* some characters read in */
789 {
790 uint32_t c = next_char (this);
791
792#if 0
793 if (c != NOCHAR)
794 return c;
795#endif
796 }
797} 943}
798 944
799/* rxvt_cmd_getc() - Return next input character */ 945/* rxvt_cmd_getc() - Return next input character */
800/* 946/*
801 * Return the next input character after first passing any keyboard input 947 * Return the next input character after first passing any keyboard input
803 */ 949 */
804/* INTPROTO */ 950/* INTPROTO */
805uint32_t 951uint32_t
806rxvt_cmd_getc(pR) 952rxvt_cmd_getc(pR)
807{ 953{
954 for (;;)
955 {
956 uint32_t c = R->next_char ();
957 if (c != NOCHAR)
958 return c;
959
960 // incomplete sequences should occur rarely, still, a better solution
961 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (R->cmd_fd, F_SETFL, 0);
963 R->pty_fill ();
964 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
965 }
966
967#if 0
808#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
809 fd_set readfds; 969 fd_set readfds;
810 int quick_timeout, select_res; 970 int quick_timeout, select_res;
811 int want_motion_time, want_keypress_time; 971 int want_motion_time, want_keypress_time;
812 struct timeval value; 972 struct timeval value;
813#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
814 struct timeval tp; 974 struct timeval tp;
815#endif 975#endif
816 976
817 uint32_t c = next_char (aR);
818 if (c != NOCHAR)
819 return c;
820
821 for (;;) { 977 for (;;) {
822 /* loop until we can return something */ 978 /* loop until we can return something */
823 979
824 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 980 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825 rxvt_tt_write(aR_ NULL, 0); 981 R->tt_write(NULL, 0);
826
827#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
828 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
829#endif
830#if defined(CURSOR_BLINK)
831 want_keypress_time = 0;
832#endif
833#if defined(POINTER_BLANK)
834 want_motion_time = 0;
835#endif
836
837 if (XPending (R->Xdisplay))
838 {
839 R->process_x_events ();
840
841 /* in case button actions pushed chars to cmdbuf */
842 if (R->cmdbuf_ptr < R->cmdbuf_endp)
843 return *R->cmdbuf_ptr++;
844 }
845
846#if defined(CURSOR_BLINK)
847 if (want_keypress_time) {
848 (void)gettimeofday(&tp, NULL);
849 R->lastcursorchange.tv_sec = tp.tv_sec;
850 R->lastcursorchange.tv_usec = tp.tv_usec;
851 }
852#endif
853#if defined(POINTER_BLANK)
854 if (want_motion_time) {
855 if (!tp.tv_sec)
856 (void)gettimeofday(&tp, NULL);
857 R->lastmotion.tv_sec = tp.tv_sec;
858 R->lastmotion.tv_usec = tp.tv_usec;
859 }
860#endif
861
862/*
863 * the command input buffer is empty and we have no pending X events
864 */
865 quick_timeout = 0;
866 982
867#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868 if (R->mouse_slip_wheel_speed) { 984 if (R->mouse_slip_wheel_speed) {
869 quick_timeout = 1; 985 quick_timeout = 1;
870 if (!R->mouse_slip_wheel_delay-- 986 if (!R->mouse_slip_wheel_delay--
900 R->want_refresh = 1; 1016 R->want_refresh = 1;
901 } 1017 }
902 } 1018 }
903#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904 1020
905 FD_ZERO(&readfds);
906 FD_SET(R->cmd_fd, &readfds);
907 FD_SET(R->Xfd, &readfds);
908 value.tv_usec = TIMEOUT_USEC;
909 value.tv_sec = 0;
910
911 if (!R->TermWin.mapped)
912 quick_timeout = 0;
913 else {
914 quick_timeout |= R->want_refresh;
915#ifdef TRANSPARENT 1021#ifdef TRANSPARENT
916 quick_timeout |= R->want_full_refresh; 1022 quick_timeout |= R->want_full_refresh;
917#endif 1023#endif
918 }
919
920#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
921 {
922 int set_quick_timeout = 0;
923 long csdiff, psdiff;
924
925#define BLINK_TIME 500000L
926 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
927# if defined(CURSOR_BLINK)
928 if (R->Options & Opt_cursorBlink) {
929 if (!tp.tv_sec) /* didn't get it before so get it now */
930 (void)gettimeofday(&tp, NULL);
931
932 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
933 + tp.tv_usec - R->lastcursorchange.tv_usec;
934 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
935 R->lastcursorchange.tv_sec = tp.tv_sec;
936 R->lastcursorchange.tv_usec = tp.tv_usec;
937 R->hidden_cursor = !R->hidden_cursor;
938 csdiff = 0;
939 } else
940 csdiff = BLINK_TIME - csdiff;
941 set_quick_timeout = 1;
942 }
943# endif 1024#endif
944# if defined(POINTER_BLANK)
945 /*
946 * If we haven't moved the pointer for a while
947 */
948 if ((R->Options & Opt_pointerBlank)
949 && (R->pointerBlankDelay > 0)
950 && (R->hidden_pointer == 0)) {
951 long pdelay;
952
953 if (!tp.tv_sec) /* didn't get it before so get it now */
954 (void)gettimeofday(&tp, NULL);
955 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
956 + tp.tv_usec - R->lastmotion.tv_usec;
957 pdelay = R->pointerBlankDelay * 1000000L;
958 if (psdiff >= pdelay)
959 rxvt_pointer_blank(aR);
960 else {
961 set_quick_timeout = 1;
962 psdiff = pdelay - psdiff;
963 }
964 }
965# endif
966 if (!quick_timeout && set_quick_timeout) {
967 MIN_IT(csdiff, psdiff);
968 value.tv_sec = csdiff / 1000000L;
969 value.tv_usec = csdiff % 1000000L;
970 quick_timeout = 1;
971 }
972 }
973#endif
974
975 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
976 (quick_timeout ? &value : NULL))) == 0) {
977 /* select statement timed out - we're not hard and fast scrolling */
978 R->refresh_limit = 1;
979 }
980#if defined(CURSOR_BLINK)
981 if (R->Options & Opt_cursorBlink)
982 R->want_refresh = 1;
983#endif
984
985 /* See if we can read new data from the application */
986 if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) {
987 int n;
988 unsigned int count;
989
990 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
991 for (count = BUFSIZ; count; count -= n, R->cmdbuf_endp += n)
992 if ((n = read(R->cmd_fd, R->cmdbuf_endp, count)) > 0)
993 continue;
994 else if (n == 0 || (n < 0 && errno == EAGAIN))
995 break;
996 else {
997 rxvt_clean_exit();
998 exit(EXIT_FAILURE); /* bad order of events? */
999 }
1000
1001 if (count != BUFSIZ) /* some characters read in */
1002 {
1003 uint32_t c = next_char (aR);
1004 if (c != NOCHAR)
1005 return c;
1006 }
1007 }
1008#ifdef TRANSPARENT
1009 if (R->want_full_refresh) {
1010 R->want_full_refresh = 0;
1011 rxvt_scr_clear(aR);
1012 rxvt_scr_touch(aR_ False);
1013 R->want_refresh = 1;
1014 }
1015#endif
1016 if (R->want_refresh) {
1017 rxvt_scr_refresh(aR_ R->refresh_type);
1018 rxvt_scrollbar_show(aR_ 1);
1019#ifdef USE_XIM
1020 rxvt_IMSendSpot(aR);
1021#endif
1022 }
1023 }
1024/* NOTREACHED */
1025} 1025}
1026/*}}} */
1027 1026
1028/* EXTPROTO */
1029void 1027void
1030rxvt_pointer_unblank(pR) 1028rxvt_term::pointer_unblank ()
1031{ 1029{
1032 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033 rxvt_recolour_cursor(aR); 1031 rxvt_recolour_cursor (this);
1032
1034#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
1035 R->hidden_pointer = 0; 1034 hidden_pointer = 0;
1036 if (R->pointerBlankDelay > 0) {
1037 struct timeval tp;
1038 1035
1039 (void)gettimeofday(&tp, NULL); 1036 if (Options & Opt_pointerBlank)
1040 R->lastmotion.tv_sec = tp.tv_sec; 1037 pointer_ev.start (NOW + pointerBlankDelay);
1041 R->lastmotion.tv_usec = tp.tv_usec;
1042 }
1043#endif 1038#endif
1044} 1039}
1045 1040
1046#ifdef POINTER_BLANK 1041#ifdef POINTER_BLANK
1047/* INTPROTO */
1048void 1042void
1049rxvt_pointer_blank(pR) 1043rxvt_term::pointer_blank ()
1050{ 1044{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank))
1048 return;
1049
1051 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052 XFlush(R->Xdisplay); 1051 XFlush (Xdisplay);
1052
1053 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 ();
1054} 1062}
1055#endif 1063#endif
1056 1064
1057/* INTPROTO */ 1065/* INTPROTO */
1058void 1066void
1111 fprintf(stderr, "]: <%d>, %d/%d\n", 1119 fprintf(stderr, "]: <%d>, %d/%d\n",
1112 button_number, 1120 button_number,
1113 x + 1, 1121 x + 1,
1114 y + 1); 1122 y + 1);
1115#else 1123#else
1116 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1124 R->tt_printf("\033[M%c%c%c",
1117 (32 + button_number + key_state), 1125 (32 + button_number + key_state),
1118 (32 + x + 1), 1126 (32 + x + 1),
1119 (32 + y + 1)); 1127 (32 + y + 1));
1120#endif 1128#endif
1121} 1129}
1254 break; 1262 break;
1255 1263
1256 case ClientMessage: 1264 case ClientMessage:
1257 if (ev->xclient.format == 32 1265 if (ev->xclient.format == 32
1258 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1266 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259 exit(EXIT_SUCCESS); 1267 R->destroy ();
1260#ifdef OFFIX_DND 1268#ifdef OFFIX_DND
1261 /* OffiX Dnd (drag 'n' drop) protocol */ 1269 /* OffiX Dnd (drag 'n' drop) protocol */
1262 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1270 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263 && (ev->xclient.data.l[0] == DndFile 1271 && (ev->xclient.data.l[0] == DndFile
1264 || ev->xclient.data.l[0] == DndDir 1272 || ev->xclient.data.l[0] == DndDir
1265 || ev->xclient.data.l[0] == DndLink)) { 1273 || ev->xclient.data.l[0] == DndLink)) {
1266 /* Get Dnd data */ 1274 /* Get Dnd data */
1267 Atom ActualType; 1275 Atom ActualType;
1299 * in the GraphicsExpose parts, which means that after each refresh, 1307 * in the GraphicsExpose parts, which means that after each refresh,
1300 * we need to wait for the graphics expose or Noexpose events, 1308 * we need to wait for the graphics expose or Noexpose events,
1301 * which ought to make things real slow! 1309 * which ought to make things real slow!
1302 */ 1310 */
1303 case VisibilityNotify: 1311 case VisibilityNotify:
1304 switch (ev->xvisibility.state) { 1312 switch (ev->xvisibility.state)
1313 {
1305 case VisibilityUnobscured: 1314 case VisibilityUnobscured:
1306 R->refresh_type = FAST_REFRESH; 1315 R->refresh_type = FAST_REFRESH;
1307 break; 1316 break;
1308 case VisibilityPartiallyObscured: 1317 case VisibilityPartiallyObscured:
1309 R->refresh_type = SLOW_REFRESH; 1318 R->refresh_type = SLOW_REFRESH;
1310 break; 1319 break;
1311 default: 1320 default:
1312 R->refresh_type = NO_REFRESH; 1321 R->refresh_type = NO_REFRESH;
1313 break; 1322 break;
1314 } 1323 }
1315 break; 1324 break;
1316 1325
1317 case FocusIn: 1326 case FocusIn:
1318 if (!R->TermWin.focus) { 1327 if (!R->TermWin.focus) {
1319 R->TermWin.focus = 1; 1328 R->TermWin.focus = 1;
1320 R->want_refresh = 1; 1329 R->want_refresh = 1;
1321#ifdef USE_XIM 1330#ifdef USE_XIM
1322 if (R->Input_Context != NULL) 1331 if (R->Input_Context != NULL)
1323 XSetICFocus(R->Input_Context); 1332 XSetICFocus(R->Input_Context);
1324#endif 1333#endif
1334#ifdef CURSOR_BLINK
1335 if (R->Options & Opt_cursorBlink)
1336 R->blink_ev.start (NOW + BLINK_INTERVAL);
1337#endif
1325 } 1338 }
1326 break; 1339 break;
1327 1340
1328 case FocusOut: 1341 case FocusOut:
1329 if (R->TermWin.focus) { 1342 if (R->TermWin.focus) {
1330 R->TermWin.focus = 0; 1343 R->TermWin.focus = 0;
1331 R->want_refresh = 1; 1344 R->want_refresh = 1;
1332#ifdef USE_XIM 1345#ifdef USE_XIM
1333 if (R->Input_Context != NULL) 1346 if (R->Input_Context != NULL)
1334 XUnsetICFocus(R->Input_Context); 1347 XUnsetICFocus(R->Input_Context);
1348#endif
1349#ifdef CURSOR_BLINK
1350 if (R->Options & Opt_cursorBlink)
1351 R->blink_ev.stop ();
1352 R->hidden_cursor = 0;
1335#endif 1353#endif
1336 } 1354 }
1337 break; 1355 break;
1338 1356
1339 case ConfigureNotify: 1357 case ConfigureNotify:
1452 break; 1470 break;
1453 1471
1454 case MotionNotify: 1472 case MotionNotify:
1455#ifdef POINTER_BLANK 1473#ifdef POINTER_BLANK
1456 if (R->hidden_pointer) 1474 if (R->hidden_pointer)
1457 rxvt_pointer_unblank(aR); 1475 R->pointer_unblank ();
1458#endif 1476#endif
1459#if MENUBAR 1477#if MENUBAR
1460 if (isMenuBarWindow(ev->xany.window)) { 1478 if (isMenuBarWindow(ev->xany.window)) {
1461 rxvt_menubar_control(aR_ &(ev->xbutton)); 1479 rxvt_menubar_control(aR_ &(ev->xbutton));
1462 break; 1480 break;
1653 */ 1671 */
1654 if ((R->scrollBar.style == R_SB_NEXT 1672 if ((R->scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_upButton(ev->y)) 1673 && scrollbarnext_upButton(ev->y))
1656 || (R->scrollBar.style == R_SB_RXVT 1674 || (R->scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_upButton(ev->y))) 1675 && scrollbarrxvt_upButton(ev->y)))
1658 rxvt_tt_printf(aR_ "\033[A"); 1676 R->tt_printf("\033[A");
1659 else if ((R->scrollBar.style == R_SB_NEXT 1677 else if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_dnButton(ev->y)) 1678 && scrollbarnext_dnButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1679 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_dnButton(ev->y))) 1680 && scrollbarrxvt_dnButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[B"); 1681 R->tt_printf("\033[B");
1664 else 1682 else
1665 switch (ev->button) { 1683 switch (ev->button) {
1666 case Button2: 1684 case Button2:
1667 rxvt_tt_printf(aR_ "\014"); 1685 R->tt_printf("\014");
1668 break; 1686 break;
1669 case Button1: 1687 case Button1:
1670 rxvt_tt_printf(aR_ "\033[6~"); 1688 R->tt_printf("\033[6~");
1671 break; 1689 break;
1672 case Button3: 1690 case Button3:
1673 rxvt_tt_printf(aR_ "\033[5~"); 1691 R->tt_printf("\033[5~");
1674 break; 1692 break;
1675 } 1693 }
1676 } 1694 }
1677 else 1695 else
1678#endif /* NO_SCROLLBAR_REPORT */ 1696#endif /* NO_SCROLLBAR_REPORT */
2079 return stream; 2097 return stream;
2080} 2098}
2081 2099
2082/* EXTPROTO */ 2100/* EXTPROTO */
2083int 2101int
2084rxvt_pclose_printer(FILE *stream) 2102rxvt_pclose_printer (FILE *stream)
2085{ 2103{
2086 fflush(stream); 2104 fflush (stream);
2087/* pclose() reported not to work on SunOS 4.1.3 */ 2105/* pclose() reported not to work on SunOS 4.1.3 */
2088# if defined (__sun__) /* TODO: RESOLVE THIS */ 2106# if defined (__sun__) /* TODO: RESOLVE THIS */
2089/* pclose works provided SIGCHLD handler uses waitpid */ 2107/* pclose works provided SIGCHLD handler uses waitpid */
2090 return pclose(stream); /* return fclose (stream); */ 2108 return pclose (stream); /* return fclose (stream); */
2091# else 2109# else
2092 return pclose(stream); 2110 return pclose (stream);
2093# endif 2111# endif
2094} 2112}
2095 2113
2096/* 2114/*
2097 * simulate attached vt100 printer 2115 * simulate attached vt100 printer
2160rxvt_process_nonprinting(pR_ unsigned char ch) 2178rxvt_process_nonprinting(pR_ unsigned char ch)
2161{ 2179{
2162 switch (ch) { 2180 switch (ch) {
2163 case C0_ENQ: /* terminal Status */ 2181 case C0_ENQ: /* terminal Status */
2164 if (R->rs[Rs_answerbackstring]) 2182 if (R->rs[Rs_answerbackstring])
2165 rxvt_tt_write(aR_ 2183 R->tt_write(
2166 (const unsigned char *)R->rs[Rs_answerbackstring], 2184 (const unsigned char *)R->rs[Rs_answerbackstring],
2167 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2185 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168 else 2186 else
2169 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2187 R->tt_write((unsigned char *)VT100_ANS,
2170 (unsigned int)STRLEN(VT100_ANS)); 2188 (unsigned int)STRLEN(VT100_ANS));
2171 break; 2189 break;
2172 case C0_BEL: /* bell */ 2190 case C0_BEL: /* bell */
2173 rxvt_scr_bell(aR); 2191 rxvt_scr_bell(aR);
2174 break; 2192 break;
2237 row = rxvt_cmd_getc(aR) - ' '; 2255 row = rxvt_cmd_getc(aR) - ' ';
2238 col = rxvt_cmd_getc(aR) - ' '; 2256 col = rxvt_cmd_getc(aR) - ' ';
2239 rxvt_scr_gotorc(aR_ row, col, 0); 2257 rxvt_scr_gotorc(aR_ row, col, 0);
2240 break; 2258 break;
2241 case 'Z': /* identify the terminal type */ 2259 case 'Z': /* identify the terminal type */
2242 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 */
2243 break; 2261 break;
2244 case '<': /* turn off VT52 mode */ 2262 case '<': /* turn off VT52 mode */
2245 PrivMode(0, PrivMode_vt52); 2263 PrivMode(0, PrivMode_vt52);
2246 break; 2264 break;
2247 case 'F': /* use special graphics character set */ 2265 case 'F': /* use special graphics character set */
2354 rxvt_process_dcs_seq(aR); 2372 rxvt_process_dcs_seq(aR);
2355 break; 2373 break;
2356 2374
2357 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2375 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358 case C1_SCI: /* ESC Z */ 2376 case C1_SCI: /* ESC Z */
2359 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2377 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2378 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361 break; /* steal obsolete ESC [ c */ 2379 break; /* steal obsolete ESC [ c */
2362 2380
2363 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2381 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364 case C1_CSI: /* ESC [ */ 2382 case C1_CSI: /* ESC [ */
2485 */ 2503 */
2486 if (priv) { 2504 if (priv) {
2487 switch (priv) { 2505 switch (priv) {
2488 case '>': 2506 case '>':
2489 if (ch == CSI_DA) /* secondary device attributes */ 2507 if (ch == CSI_DA) /* secondary device attributes */
2490 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2508 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491 break; 2509 break;
2492 case '?': 2510 case '?':
2493 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2511 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2494 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2512 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495 break; 2513 break;
2602 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2620 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603 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);
2604 break; 2622 break;
2605 2623
2606 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2624 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2625 R->tt_write((const unsigned char *)VT100_ANS,
2608 (unsigned int)(sizeof(VT100_ANS) - 1)); 2626 (unsigned int)(sizeof(VT100_ANS) - 1));
2609 break; 2627 break;
2610 2628
2611 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2629 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612 rxvt_process_sgr_mode(aR_ nargs, arg); 2630 rxvt_process_sgr_mode(aR_ nargs, arg);
2613 break; 2631 break;
2614 2632
2615 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2633 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616 switch (arg[0]) { 2634 switch (arg[0]) {
2617 case 5: /* DSR requested */ 2635 case 5: /* DSR requested */
2618 rxvt_tt_printf(aR_ "\033[0n"); 2636 R->tt_printf("\033[0n");
2619 break; 2637 break;
2620 case 6: /* CPR requested */ 2638 case 6: /* CPR requested */
2621 rxvt_scr_report_position(aR); 2639 rxvt_scr_report_position(aR);
2622 break; 2640 break;
2623#if defined (ENABLE_DISPLAY_ANSWER) 2641#if defined (ENABLE_DISPLAY_ANSWER)
2624 case 7: /* unofficial extension */ 2642 case 7: /* unofficial extension */
2625 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2643 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626 break; 2644 break;
2627#endif 2645#endif
2628 case 8: /* unofficial extension */ 2646 case 8: /* unofficial extension */
2629 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2647 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630 break; 2648 break;
2699 break; 2717 break;
2700#endif 2718#endif
2701 2719
2702 case CSI_78: /* DECREQTPARM */ 2720 case CSI_78: /* DECREQTPARM */
2703 if (arg[0] == 0 || arg[0] == 1) 2721 if (arg[0] == 0 || arg[0] == 1)
2704 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);
2705 /* FALLTHROUGH */ 2723 /* FALLTHROUGH */
2706 2724
2707 default: 2725 default:
2708 break; 2726 break;
2709 } 2727 }
2763 /* 2781 /*
2764 * reports - some output format copied from XTerm 2782 * reports - some output format copied from XTerm
2765 */ 2783 */
2766 case 11: /* report window state */ 2784 case 11: /* report window state */
2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2785 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2786 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769 break; 2787 break;
2770 case 13: /* report window position */ 2788 case 13: /* report window position */
2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2790 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773 -wattr.border_width, -wattr.border_width, 2791 -wattr.border_width, -wattr.border_width,
2774 &x, &y, &wdummy); 2792 &x, &y, &wdummy);
2775 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2793 R->tt_printf("\033[3;%d;%dt", x, y);
2776 break; 2794 break;
2777 case 14: /* report window size (pixels) */ 2795 case 14: /* report window size (pixels) */
2778 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2796 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2797 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780 break; 2798 break;
2781 case 18: /* report window size (chars) */ 2799 case 18: /* report window size (chars) */
2782 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);
2783 break; 2801 break;
2784#if 0 /* XXX: currently disabled due to security concerns */ 2802#if 0 /* XXX: currently disabled due to security concerns */
2785 case 20: /* report icon label */ 2803 case 20: /* report icon label */
2786 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2804 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2805 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788 break; 2806 break;
2789 case 21: /* report window title */ 2807 case 21: /* report window title */
2790 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2808 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2809 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792 break; 2810 break;
2793#endif 2811#endif
2794 } 2812 }
2795} 2813}
2796#endif 2814#endif
3339{ 3357{
3340 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3358 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341 3359
3342#ifndef RXVT_GRAPHICS 3360#ifndef RXVT_GRAPHICS
3343 if (cmd == 'Q') { /* query graphics */ 3361 if (cmd == 'Q') { /* query graphics */
3344 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3362 R->tt_printf("\033G0\n"); /* no graphics */
3345 return; 3363 return;
3346 } 3364 }
3347/* swallow other graphics sequences until terminating ':' */ 3365/* swallow other graphics sequences until terminating ':' */
3348 do 3366 do
3349 ch = rxvt_cmd_getc(aR); 3367 ch = rxvt_cmd_getc(aR);
3352 unsigned int nargs; 3370 unsigned int nargs;
3353 int args[NGRX_PTS]; 3371 int args[NGRX_PTS];
3354 unsigned char *text = NULL; 3372 unsigned char *text = NULL;
3355 3373
3356 if (cmd == 'Q') { /* query graphics */ 3374 if (cmd == 'Q') { /* query graphics */
3357 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3375 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358 return; 3376 return;
3359 } 3377 }
3360 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3378 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361 int neg; 3379 int neg;
3362 3380
3392} 3410}
3393/*}}} */ 3411/*}}} */
3394 3412
3395/* ------------------------------------------------------------------------- */ 3413/* ------------------------------------------------------------------------- */
3396 3414
3397/*{{{ Read and process output from the application */
3398/* LIBPROTO */
3399void
3400rxvt_main_loop(pR)
3401{
3402 uint32_t ch, *str, buf[BUFSIZ];
3403 int nlines, refreshnow;
3404
3405 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
3406
3407 /* once we know the shell is running, send the screen size. Again! */
3408 ch = rxvt_cmd_getc(aR); /* wait for something */
3409 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid);
3410
3411 refreshnow = 0;
3412 for (;;) {
3413 if (ch == NOCHAR)
3414 ch = rxvt_cmd_getc(aR);
3415
3416 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
3417 {
3418 /* Read a text string from the input buffer */
3419 nlines = 0;
3420 str = buf;
3421 *str++ = ch;
3422 for (;;)
3423 {
3424 ch = next_char (aR);
3425
3426 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
3427 break;
3428 else
3429 {
3430 *str++ = ch;
3431
3432 if (ch == '\n')
3433 {
3434 nlines++;
3435 R->refresh_count++;
3436 if (!(R->Options & Opt_jumpScroll)
3437 || (R->refresh_count >= (R->refresh_limit
3438 * (R->TermWin.nrow - 1))))
3439 {
3440 refreshnow = 1;
3441 ch = NOCHAR;
3442 break;
3443 }
3444 }
3445
3446 if (str >= buf + BUFSIZ)
3447 {
3448 ch = NOCHAR;
3449 break;
3450 }
3451 }
3452 }
3453
3454 rxvt_scr_add_lines(aR_ buf, nlines, str - buf);
3455
3456 /*
3457 * If there have been a lot of new lines, then update the screen
3458 * What the heck I'll cheat and only refresh less than every page-full.
3459 * the number of pages between refreshes is R->refresh_limit, which
3460 * is incremented here because we must be doing flat-out scrolling.
3461 *
3462 * refreshing should be correct for small scrolls, because of the
3463 * time-out
3464 */
3465
3466 //TODO: REFRESH_PERIOD is one, fix it
3467 if (refreshnow)
3468 {
3469 refreshnow = 0;
3470
3471 if ((R->Options & Opt_jumpScroll) && R->refresh_limit < REFRESH_PERIOD)
3472 R->refresh_limit++;
3473
3474 rxvt_scr_refresh(aR_ R->refresh_type);
3475 }
3476
3477 }
3478 else
3479 {
3480 switch (ch)
3481 {
3482 default:
3483 rxvt_process_nonprinting(aR_ ch);
3484 break;
3485 case C0_ESC: /* escape char */
3486 rxvt_process_escape_seq(aR);
3487 break;
3488 /* case 0x9b: */ /* CSI */
3489 /* rxvt_process_csi_seq(aR); */
3490 }
3491
3492 ch = NOCHAR;
3493 }
3494 }
3495/* NOTREACHED */
3496}
3497
3498/* 3415/*
3499 * Send printf() formatted output to the command. 3416 * Send printf() formatted output to the command.
3500 * Only use for small amounts of data. 3417 * Only use for small amounts of data.
3501 */ 3418 */
3502/* EXTPROTO */
3503void 3419void
3504rxvt_tt_printf(pR_ const char *fmt,...) 3420rxvt_term::tt_printf (const char *fmt,...)
3505{ 3421{
3506 va_list arg_ptr; 3422 va_list arg_ptr;
3507 unsigned char buf[256]; 3423 unsigned char buf[256];
3508 3424
3509 va_start(arg_ptr, fmt); 3425 va_start (arg_ptr, fmt);
3510 vsprintf((char *)buf, fmt, arg_ptr); 3426 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511 va_end(arg_ptr); 3427 va_end (arg_ptr);
3512 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3428 tt_write (buf, STRLEN (buf));
3513} 3429}
3514 3430
3515/* ---------------------------------------------------------------------- */ 3431/* ---------------------------------------------------------------------- */
3516/* Addresses pasting large amounts of data and rxvt hang
3517 * code pinched from xterm (v_write()) and applied originally to
3518 * rxvt-2.18 - Hops
3519 * 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,
3520 * or generated by us in response to a query ESC sequence. 3433 * or generated by us in response to a query ESC sequence.
3521 */ 3434 */
3522/* EXTPROTO */
3523void 3435void
3524rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3436rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525{ 3437{
3526#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3438 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3527 int riten;
3528 unsigned int p;
3529 unsigned char *v_buffer, /* start of physical buffer */
3530 *v_bufstr, /* start of current buffer pending */
3531 *v_bufptr, /* end of current buffer pending */
3532 *v_bufend; /* end of physical buffer */
3533 3439
3534 if (R->v_bufstr == NULL && len > 0) { 3440 if (len)
3535 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3536 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3537 v_bufend = v_buffer + p;
3538 } else {
3539 v_buffer = R->v_buffer;
3540 v_bufstr = R->v_bufstr;
3541 v_bufptr = R->v_bufptr;
3542 v_bufend = R->v_bufend;
3543 } 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;
3544 3447
3545 /* 3448 data += written;
3546 * Append to the block we already have. Always doing this simplifies the 3449 len -= written;
3547 * code, and isn't too bad, either. If this is a short block, it isn't 3450 }
3548 * too expensive, and if this is a long block, we won't be able to write 3451
3549 * it all anyway. 3452
3550 */ 3453 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551 if (len > 0) { 3454
3552 if (v_bufend < v_bufptr + len) { /* run out of room */ 3455 memcpy (v_buffer + v_buflen, data, len);
3553 if (v_bufstr != v_buffer) { 3456 v_buflen += len;
3554 /* there is unused space, move everything down */
3555 MEMMOVE(v_buffer, v_bufstr,
3556 (unsigned int)(v_bufptr - v_bufstr));
3557 v_bufptr -= v_bufstr - v_buffer;
3558 v_bufstr = v_buffer;
3559 } 3457 }
3560 if (v_bufend < v_bufptr + len) {
3561 /* still won't fit: get more space */
3562 /* use most basic realloc because an error is not fatal. */
3563 unsigned int size = v_bufptr - v_buffer;
3564 unsigned int reallocto;
3565 3458
3566 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3459 for (;;)
3567 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3460 {
3568 /* save across realloc */ 3461 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569 if (v_buffer) { 3462
3570 v_bufstr = v_buffer; 3463 if (written > 0)
3571 v_bufptr = v_buffer + size; 3464 {
3572 v_bufend = v_buffer + reallocto; 3465 v_buflen -= written;
3573 } else { /* no memory: ignore entire write request */ 3466
3574 rxvt_print_error("data loss: cannot allocate buffer space"); 3467 if (v_buflen == 0)
3575 v_buffer = v_bufstr; /* restore clobbered pointer */ 3468 {
3576 } 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 }
3577 } 3487 }
3578 }
3579 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3580 MEMCPY(v_bufptr, d, len);
3581 v_bufptr += len;
3582 }
3583 }
3584
3585 /*
3586 * Write out as much of the buffer as we can.
3587 * Be careful not to overflow the pty's input silo.
3588 * We are conservative here and only write a small amount at a time.
3589 *
3590 * If we can't push all the data into the pty yet, we expect write
3591 * to return a non-negative number less than the length requested
3592 * (if some data written) or -1 and set errno to EAGAIN,
3593 * EWOULDBLOCK, or EINTR (if no data written).
3594 *
3595 * (Not all systems do this, sigh, so the code is actually
3596 * a little more forgiving.)
3597 */
3598 if ((p = v_bufptr - v_bufstr) > 0) {
3599 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3600 if (riten < 0)
3601 riten = 0;
3602 v_bufstr += riten;
3603 if (v_bufstr >= v_bufptr) /* we wrote it all */
3604 v_bufstr = v_bufptr = v_buffer;
3605 }
3606 /*
3607 * If we have lots of unused memory allocated, return it
3608 */
3609 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3610 /* save pointers across realloc */
3611 unsigned int start = v_bufstr - v_buffer;
3612 unsigned int size = v_bufptr - v_buffer;
3613 unsigned int reallocto;
3614
3615 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3616 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3617 if (v_buffer) {
3618 v_bufstr = v_buffer + start;
3619 v_bufptr = v_buffer + size;
3620 v_bufend = v_buffer + reallocto;
3621 } else {
3622 /* should we print a warning if couldn't return memory? */
3623 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3624 }
3625 }
3626 R->v_buffer = v_buffer;
3627 R->v_bufstr = v_bufstr;
3628 R->v_bufptr = v_bufptr;
3629 R->v_bufend = v_bufend;
3630} 3488}
3489
3631/*----------------------- end-of-file (C source) -----------------------*/ 3490/*----------------------- end-of-file (C source) -----------------------*/
3632 3491

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines