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.20 by pcg, Thu Dec 18 07:31:18 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.20 2003/12/18 07:31:18 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>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
61 unsigned int newlen; 63 unsigned int newlen;
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66#ifdef USE_XIM
67 int valid_keysym; 68 int valid_keysym;
68#endif
69 unsigned char *kbuf = R->kbuf; 69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
… …
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 81 if (R->numlock_state || (ev->state & R->ModNumLockMask))
82 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 83 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 84 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 85 }
86
87 kbuf[0] = 0;
88
84#ifdef USE_XIM 89#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 90 if (R->Input_Context)
91 {
86 Status status_return; 92 Status status_return;
87 93
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8)
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
92#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
95#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
96 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
127 }
98 } else { 128 else
129#endif
130 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 132 valid_keysym = !len;
102 } 133 }
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 134
120#ifdef USE_XIM
121 if (valid_keysym) 135 if (valid_keysym)
122#endif
123 { 136 {
124/* for some backwards compatibility */ 137/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
127 if (ctrl) { 140 if (ctrl)
128# else 141# else
129 if (meta) { 142 if (meta)
130# endif 143# endif
144 {
131 if (keysym == R->ks_bigfont) { 145 if (keysym == R->ks_bigfont)
146 {
132 rxvt_change_font(aR_ 0, FONT_UP); 147 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 148 return;
149 }
134 } else if (keysym == R->ks_smallfont) { 150 else if (keysym == R->ks_smallfont)
151 {
135 rxvt_change_font(aR_ 0, FONT_DN); 152 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 153 return;
137 } 154 }
138 } 155 }
139#endif 156#endif
140 157
141 if (R->TermWin.saveLines) { 158 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 254 /* escape prefix */
238 if (meta) 255 if (meta)
239# ifdef META8_OPTION 256# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 257 if (R->meta_char == C0_ESC)
241# endif 258# endif
242 rxvt_tt_write(aR_ &ch, 1); 259 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 260 R->tt_write (kbuf0, l);
244 return; 261 return;
245 } else 262 } else
246#endif 263#endif
247 { 264 {
248 newlen = 1; 265 newlen = 1;
… …
572 if (R->greek_mode) 589 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 590 len = greek_xlat(kbuf, len);
574#endif 591#endif
575 /* nil */ ; 592 /* nil */ ;
576 } 593 }
577 } 594 }
578 595
579 if (len <= 0) 596 if (len <= 0)
580 return; /* not mapped */ 597 return; /* not mapped */
581 598
582 if (R->Options & Opt_scrollTtyKeypress) 599 if (R->Options & Opt_scrollTtyKeypress)
… …
605 && (R->meta_char == C0_ESC) 622 && (R->meta_char == C0_ESC)
606#endif 623#endif
607 ) { 624 ) {
608 const unsigned char ch = C0_ESC; 625 const unsigned char ch = C0_ESC;
609 626
610 rxvt_tt_write(aR_ &ch, 1); 627 R->tt_write(&ch, 1);
611 } 628 }
612#ifdef DEBUG_CMD 629#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 630 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 631 char *p;
615 int i; 632 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
621 } 638 }
622#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 640 R->tt_write(kbuf, (unsigned int)len);
624} 641}
625/*}}} */ 642/*}}} */
626 643
627#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633{ 650{
634 unsigned int n, s; 651 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->cmdbuf_base, 652 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->cmdbuf_endp, 653 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->cmdbuf_ptr; 654 *cmdbuf_ptr = R->cmdbuf_ptr;
638 655
639 n = cmdbuf_ptr - cmdbuf_base; 656 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 658 if (n > 0 && s < count) {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 659 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
… …
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
659 676
660void 677void
678rxvt_term::flush ()
679{
680#ifdef TRANSPARENT
681 if (want_full_refresh)
682 {
683 want_full_refresh = 0;
684 rxvt_scr_clear (this);
685 rxvt_scr_touch (this, False);
686 want_refresh = 1;
687 }
688#endif
689
690 if (want_refresh)
691 {
692 rxvt_scr_refresh (this, refresh_type);
693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM
695 rxvt_IMSendSpot (this);
696#endif
697 }
698
699 XFlush (Xdisplay);
700#if 0
701 if (XPending (Xdisplay)) process_x_events ();
702 if (XPending (Xdisplay)) process_x_events ();
703#endif
704}
705
706void
707rxvt_term::check_cb (check_watcher &w)
708{
709 SET_R (this);
710 SET_LOCALE (locale);
711
712 flush ();
713}
714
715void
661rxvt_term::process_x_events () 716rxvt_term::process_x_events ()
662{ 717{
663 do 718 do
664 { 719 {
665 XEvent xev; 720 XEvent xev;
666 721
667 XNextEvent (Xdisplay, &xev); 722 XNextEvent (Xdisplay, &xev);
723
668#if defined(CURSOR_BLINK) 724#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 725 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) { 726 && xev.type == KeyPress)
727 {
671 if (hidden_cursor) { 728 if (hidden_cursor)
729 {
672 hidden_cursor = 0; 730 hidden_cursor = 0;
673 want_refresh = 1; 731 want_refresh = 1;
674 } 732 }
675 want_keypress_time = 1; 733
734 blink_ev.start (NOW + BLINK_INTERVAL);
676 } 735 }
677#endif 736#endif
678 737
679#if defined(POINTER_BLANK) 738#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 739 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) { 740 && (pointerBlankDelay > 0))
741 {
682 if (xev.type == MotionNotify 742 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 743 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 744 || xev.type == ButtonRelease)
685 if (hidden_pointer) 745 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 746 pointer_unblank ();
687 want_motion_time = 1; 747
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 748 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 749 pointer_blank ();
691 } 750 }
692#endif 751#endif
693 752
694#ifdef USE_XIM 753#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 754 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 755#endif
… …
698 } 757 }
699 while (XPending (Xdisplay)); 758 while (XPending (Xdisplay));
700} 759}
701 760
702void 761void
762rxvt_term::blink_cb (time_watcher &w)
763{
764 w.at += BLINK_INTERVAL;
765 hidden_cursor = !hidden_cursor;
766 want_refresh = 1;
767}
768
769void
703rxvt_term::x_cb (io_watcher &w, short revents) 770rxvt_term::x_cb (io_watcher &w, short revents)
704{ 771{
772 SET_R (this);
773 SET_LOCALE (locale);
774
705 process_x_events (); 775 process_x_events ();
776}
777
778bool
779rxvt_term::pty_fill ()
780{
781 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
782
783 memmove (cmdbuf_base, cmdbuf_ptr, n);
784 cmdbuf_ptr = cmdbuf_base;
785 cmdbuf_endp = cmdbuf_ptr + n;
786
787 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
788
789 if (n > 0)
790 {
791 cmdbuf_endp += n;
792 return true;
793 }
794 else if (n < 0 && errno != EAGAIN)
795 destroy ();
796
797 return false;
798}
799
800void
801rxvt_term::pty_cb (io_watcher &w, short revents)
802{
803 SET_R (this);
804 SET_LOCALE (locale);
805
806 if (revents & EVENT_WRITE)
807 tt_write (0, 0);
808 else if (revents & EVENT_READ)
809 {
810 bool flag = true;
811
812 // loop, but don't allow a single term to monopolize us
813 // the number of loops is fully arbitrary, and thus wrong
814 while (flag && pty_fill ())
815 {
816 if (!seen_input)
817 {
818 seen_input = 1;
819 /* once we know the shell is running, send the screen size. Again! */
820 tt_winch ();
821 }
822
823 uint32_t ch = NOCHAR;
824
825 for (;;)
826 {
827 if (ch == NOCHAR)
828 ch = next_char ();
829
830 if (ch == NOCHAR) // TODO: improve
831 break;
832
833 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
834 {
835 /* Read a text string from the input buffer */
836 uint32_t buf[BUFSIZ];
837 bool refreshnow = false;
838 int nlines = 0;
839 uint32_t *str = buf;
840
841 *str++ = ch;
842
843 for (;;)
844 {
845 ch = next_char ();
846
847 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
848 break;
849 else
850 {
851 *str++ = ch;
852
853 if (ch == '\n')
854 {
855 nlines++;
856 refresh_count++;
857
858 if (!(Options & Opt_jumpScroll)
859 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
860 {
861 refreshnow = true;
862 flag = false;
863 ch = NOCHAR;
864 break;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 rxvt_scr_add_lines (this, buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 rxvt_scr_refresh (this, refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 rxvt_process_nonprinting (this, ch);
902 break;
903 case C0_ESC: /* escape char */
904 rxvt_process_escape_seq (this);
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* rxvt_process_csi_seq (this); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
706} 915}
707 916
708// read the next character, currently handles UTF-8 917// read the next character, currently handles UTF-8
709// will probably handle all sorts of other stuff in the future 918// will probably handle all sorts of other stuff in the future
710static uint32_t 919uint32_t
711next_char (pR) 920rxvt_term::next_char ()
712{ 921{
713 mbstate &s = R->mbstate;
714
715 while (R->cmdbuf_ptr < R->cmdbuf_endp) 922 while (cmdbuf_ptr < cmdbuf_endp)
716 { 923 {
717 uint8_t ch = *R->cmdbuf_ptr; 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
718
719 if (s.cnt)
720 {
721 if ((ch & 0xc0) == 0x80)
722 {
723 R->cmdbuf_ptr++;
724
725 /* continuation */
726 s.reg = (s.reg << 6) | (ch & 0x7f);
727
728 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
729 return s.reg;
730
731 continue;
732 }
733 else
734 {
735 s.cnt = 0;
736 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
737 }
738 }
739
740 if ((ch & 0xc0) == 0xc0)
741 {
742 R->cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
743 926
744 /* first byte */ 927 wchar_t wc;
745 s.orig = ch; /* for broken encodings */ 928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
746 s.reg = ch; 929
747 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 930 if (len == (size_t)-2)
748 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 931 return NOCHAR;
749 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 932
750 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 933 if (len == (size_t)-1)
751 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
752 } 935
753 else 936 // assume wchar == unicode
754 { 937 cmdbuf_ptr += len;
755 R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756 return ch; 938 return wc;
757 }
758 } 939 }
759 940
760 return NOCHAR; 941 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} 942}
798 943
799/* rxvt_cmd_getc() - Return next input character */ 944/* rxvt_cmd_getc() - Return next input character */
800/* 945/*
801 * Return the next input character after first passing any keyboard input 946 * Return the next input character after first passing any keyboard input
… …
803 */ 948 */
804/* INTPROTO */ 949/* INTPROTO */
805uint32_t 950uint32_t
806rxvt_cmd_getc(pR) 951rxvt_cmd_getc(pR)
807{ 952{
953 for (;;)
954 {
955 uint32_t c = R->next_char ();
956 if (c != NOCHAR)
957 return c;
958
959 // incomplete sequences should occur rarely, still, a better solution
960 // would be preferred. either setjmp/longjmp or better design.
961 fcntl (R->cmd_fd, F_SETFL, 0);
962 R->pty_fill ();
963 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
964 }
965
966#if 0
808#define TIMEOUT_USEC 5000 967#define TIMEOUT_USEC 5000
809 fd_set readfds; 968 fd_set readfds;
810 int quick_timeout, select_res; 969 int quick_timeout, select_res;
811 int want_motion_time, want_keypress_time; 970 int want_motion_time, want_keypress_time;
812 struct timeval value; 971 struct timeval value;
813#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 972#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
814 struct timeval tp; 973 struct timeval tp;
815#endif 974#endif
816 975
817 uint32_t c = next_char (aR);
818 if (c != NOCHAR)
819 return c;
820
821 for (;;) { 976 for (;;) {
822 /* loop until we can return something */ 977 /* loop until we can return something */
823 978
824 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 979 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825 rxvt_tt_write(aR_ NULL, 0); 980 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 981
867#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 982#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868 if (R->mouse_slip_wheel_speed) { 983 if (R->mouse_slip_wheel_speed) {
869 quick_timeout = 1; 984 quick_timeout = 1;
870 if (!R->mouse_slip_wheel_delay-- 985 if (!R->mouse_slip_wheel_delay--
… …
900 R->want_refresh = 1; 1015 R->want_refresh = 1;
901 } 1016 }
902 } 1017 }
903#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1018#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904 1019
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 1020#ifdef TRANSPARENT
916 quick_timeout |= R->want_full_refresh; 1021 quick_timeout |= R->want_full_refresh;
917#endif 1022#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 1023#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} 1024}
1026/*}}} */
1027 1025
1028/* EXTPROTO */
1029void 1026void
1030rxvt_pointer_unblank(pR) 1027rxvt_term::pointer_unblank ()
1031{ 1028{
1032 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033 rxvt_recolour_cursor(aR); 1030 recolour_cursor ();
1031
1034#ifdef POINTER_BLANK 1032#ifdef POINTER_BLANK
1035 R->hidden_pointer = 0; 1033 hidden_pointer = 0;
1036 if (R->pointerBlankDelay > 0) {
1037 struct timeval tp;
1038 1034
1039 (void)gettimeofday(&tp, NULL); 1035 if (Options & Opt_pointerBlank)
1040 R->lastmotion.tv_sec = tp.tv_sec; 1036 pointer_ev.start (NOW + pointerBlankDelay);
1041 R->lastmotion.tv_usec = tp.tv_usec;
1042 }
1043#endif 1037#endif
1044} 1038}
1045 1039
1046#ifdef POINTER_BLANK 1040#ifdef POINTER_BLANK
1047/* INTPROTO */
1048void 1041void
1049rxvt_pointer_blank(pR) 1042rxvt_term::pointer_blank ()
1050{ 1043{
1044 pointer_ev.stop ();
1045
1046 if (!(Options & Opt_pointerBlank))
1047 return;
1048
1051 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1049 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052 XFlush(R->Xdisplay); 1050 XFlush (Xdisplay);
1051
1053 R->hidden_pointer = 1; 1052 hidden_pointer = 1;
1053}
1054
1055void
1056rxvt_term::pointer_cb (time_watcher &w)
1057{
1058 SET_R (this);
1059 SET_LOCALE (locale);
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}
… …
1138{ 1146{
1139 int i, want_timeout; 1147 int i, want_timeout;
1140 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1141 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1142 unsigned int unused_mask; 1150 unsigned int unused_mask;
1143 struct timeval tp;
1144 1151
1145#ifdef DEBUG_X 1152#ifdef DEBUG_X
1146 const char *const eventnames[] = 1153 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1148 "", 1155 "",
… …
1179 "SelectionNotify", 1186 "SelectionNotify",
1180 "ColormapNotify", 1187 "ColormapNotify",
1181 "ClientMessage", 1188 "ClientMessage",
1182 "MappingNotify" 1189 "MappingNotify"
1183 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1184 struct tm *ltt; 1195 struct tm *ltt;
1185#endif
1186
1187 /*
1188 * check if we need to get the time for any timeouts
1189 */
1190
1191 for (i = NUM_TIMEOUTS; i--; )
1192 if (R->timeout[i].tv_sec) {
1193 want_timeout = 1;
1194 break;
1195 }
1196
1197#ifndef DEBUG_X
1198 if (want_timeout)
1199#endif
1200 (void)gettimeofday(&tp, NULL); 1196 (void)gettimeofday(&tp, NULL);
1201
1202#ifdef DEBUG_X
1203 ltt = localtime(&(tp.tv_sec)); 1197 ltt = localtime(&(tp.tv_sec));
1204 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));
1205#endif 1199#endif
1206
1207 /* X event timeouts */
1208 if (want_timeout)
1209 for (i = NUM_TIMEOUTS; i--; ) {
1210 if (R->timeout[i].tv_sec == 0)
1211 continue;
1212 if ((tp.tv_sec < R->timeout[i].tv_sec)
1213 || (tp.tv_sec == R->timeout[i].tv_sec
1214 && tp.tv_usec < R->timeout[i].tv_usec))
1215 continue;
1216 R->timeout[i].tv_sec = 0;
1217 switch(i) {
1218 case TIMEOUT_INCR:
1219 rxvt_print_error("data loss: timeout on INCR selection paste");
1220 R->selection_wait = Sel_none;
1221 break;
1222 default:
1223 break;
1224 }
1225 }
1226 1200
1227 switch (ev->type) { 1201 switch (ev->type) {
1228 case KeyPress: 1202 case KeyPress:
1229 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1230 break; 1204 break;
… …
1254 break; 1228 break;
1255 1229
1256 case ClientMessage: 1230 case ClientMessage:
1257 if (ev->xclient.format == 32 1231 if (ev->xclient.format == 32
1258 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259 exit(EXIT_SUCCESS); 1233 R->destroy ();
1260#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1261 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1262 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263 && (ev->xclient.data.l[0] == DndFile 1237 && (ev->xclient.data.l[0] == DndFile
1264 || ev->xclient.data.l[0] == DndDir 1238 || ev->xclient.data.l[0] == DndDir
1265 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev->xclient.data.l[0] == DndLink)) {
1266 /* Get Dnd data */ 1240 /* Get Dnd data */
1267 Atom ActualType; 1241 Atom ActualType;
… …
1299 * in the GraphicsExpose parts, which means that after each refresh, 1273 * in the GraphicsExpose parts, which means that after each refresh,
1300 * we need to wait for the graphics expose or Noexpose events, 1274 * we need to wait for the graphics expose or Noexpose events,
1301 * which ought to make things real slow! 1275 * which ought to make things real slow!
1302 */ 1276 */
1303 case VisibilityNotify: 1277 case VisibilityNotify:
1304 switch (ev->xvisibility.state) { 1278 switch (ev->xvisibility.state)
1279 {
1305 case VisibilityUnobscured: 1280 case VisibilityUnobscured:
1306 R->refresh_type = FAST_REFRESH; 1281 R->refresh_type = FAST_REFRESH;
1307 break; 1282 break;
1308 case VisibilityPartiallyObscured: 1283 case VisibilityPartiallyObscured:
1309 R->refresh_type = SLOW_REFRESH; 1284 R->refresh_type = SLOW_REFRESH;
1310 break; 1285 break;
1311 default: 1286 default:
1312 R->refresh_type = NO_REFRESH; 1287 R->refresh_type = NO_REFRESH;
1313 break; 1288 break;
1314 } 1289 }
1315 break; 1290 break;
1316 1291
1317 case FocusIn: 1292 case FocusIn:
1318 if (!R->TermWin.focus) { 1293 if (!R->TermWin.focus) {
1319 R->TermWin.focus = 1; 1294 R->TermWin.focus = 1;
1320 R->want_refresh = 1; 1295 R->want_refresh = 1;
1321#ifdef USE_XIM 1296#ifdef USE_XIM
1322 if (R->Input_Context != NULL) 1297 if (R->Input_Context != NULL)
1323 XSetICFocus(R->Input_Context); 1298 XSetICFocus(R->Input_Context);
1324#endif 1299#endif
1300#ifdef CURSOR_BLINK
1301 if (R->Options & Opt_cursorBlink)
1302 R->blink_ev.start (NOW + BLINK_INTERVAL);
1303#endif
1325 } 1304 }
1326 break; 1305 break;
1327 1306
1328 case FocusOut: 1307 case FocusOut:
1329 if (R->TermWin.focus) { 1308 if (R->TermWin.focus) {
1330 R->TermWin.focus = 0; 1309 R->TermWin.focus = 0;
1331 R->want_refresh = 1; 1310 R->want_refresh = 1;
1332#ifdef USE_XIM 1311#ifdef USE_XIM
1333 if (R->Input_Context != NULL) 1312 if (R->Input_Context != NULL)
1334 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;
1335#endif 1319#endif
1336 } 1320 }
1337 break; 1321 break;
1338 1322
1339 case ConfigureNotify: 1323 case ConfigureNotify:
… …
1436 &unused_xevent)) ; 1420 &unused_xevent)) ;
1437 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1438 GraphicsExpose, 1422 GraphicsExpose,
1439 &unused_xevent)) ; 1423 &unused_xevent)) ;
1440 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev->xany.window)) {
1441 scrollbar_setIdle(); 1425 R->scrollBar.setIdle();
1442 rxvt_scrollbar_show(aR_ 0); 1426 rxvt_scrollbar_show(aR_ 0);
1443 } 1427 }
1444#ifdef MENUBAR 1428#ifdef MENUBAR
1445 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1446 rxvt_menubar_expose(aR); 1430 rxvt_menubar_expose(aR);
… …
1452 break; 1436 break;
1453 1437
1454 case MotionNotify: 1438 case MotionNotify:
1455#ifdef POINTER_BLANK 1439#ifdef POINTER_BLANK
1456 if (R->hidden_pointer) 1440 if (R->hidden_pointer)
1457 rxvt_pointer_unblank(aR); 1441 R->pointer_unblank ();
1458#endif 1442#endif
1459#if MENUBAR 1443#if MENUBAR
1460 if (isMenuBarWindow(ev->xany.window)) { 1444 if (isMenuBarWindow(ev->xany.window)) {
1461 rxvt_menubar_control(aR_ &(ev->xbutton)); 1445 rxvt_menubar_control(aR_ &(ev->xbutton));
1462 break; 1446 break;
… …
1559 */ 1543 */
1560 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1561 { 1545 {
1562#if RXVT_GRAPHICS 1546#if RXVT_GRAPHICS
1563 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1564 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress (ev->x, ev->y);
1565 else 1549 else
1566#endif 1550#endif
1567 { 1551 {
1568 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1569 if (reportmode) 1553 if (reportmode)
… …
1631/* 1615/*
1632 * Scrollbar window processing of button press 1616 * Scrollbar window processing of button press
1633 */ 1617 */
1634 if (isScrollbarWindow(ev->window)) 1618 if (isScrollbarWindow(ev->window))
1635 { 1619 {
1636 scrollbar_setIdle(); 1620 R->scrollBar.setIdle ();
1637 /* 1621 /*
1638 * Rxvt-style scrollbar: 1622 * Rxvt-style scrollbar:
1639 * move up if mouse is above slider 1623 * move up if mouse is above slider
1640 * move dn if mouse is below slider 1624 * move dn if mouse is below slider
1641 * 1625 *
… …
1653 */ 1637 */
1654 if ((R->scrollBar.style == R_SB_NEXT 1638 if ((R->scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_upButton(ev->y)) 1639 && scrollbarnext_upButton(ev->y))
1656 || (R->scrollBar.style == R_SB_RXVT 1640 || (R->scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_upButton(ev->y))) 1641 && scrollbarrxvt_upButton(ev->y)))
1658 rxvt_tt_printf(aR_ "\033[A"); 1642 R->tt_printf("\033[A");
1659 else if ((R->scrollBar.style == R_SB_NEXT 1643 else if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_dnButton(ev->y)) 1644 && scrollbarnext_dnButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1645 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_dnButton(ev->y))) 1646 && scrollbarrxvt_dnButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[B"); 1647 R->tt_printf("\033[B");
1664 else 1648 else
1665 switch (ev->button) { 1649 switch (ev->button) {
1666 case Button2: 1650 case Button2:
1667 rxvt_tt_printf(aR_ "\014"); 1651 R->tt_printf("\014");
1668 break; 1652 break;
1669 case Button1: 1653 case Button1:
1670 rxvt_tt_printf(aR_ "\033[6~"); 1654 R->tt_printf("\033[6~");
1671 break; 1655 break;
1672 case Button3: 1656 case Button3:
1673 rxvt_tt_printf(aR_ "\033[5~"); 1657 R->tt_printf("\033[5~");
1674 break; 1658 break;
1675 } 1659 }
1676 } 1660 }
1677 else 1661 else
1678#endif /* NO_SCROLLBAR_REPORT */ 1662#endif /* NO_SCROLLBAR_REPORT */
… …
1694#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1695 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1696#endif 1680#endif
1697 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1698 if (upordown < 0) 1682 if (upordown < 0)
1699 scrollbar_setUp(); 1683 R->scrollBar.setUp ();
1700 else 1684 else
1701 scrollbar_setDn(); 1685 R->scrollBar.setDn ();
1702 } 1686 }
1703 } else 1687 } else
1704 switch (ev->button) { 1688 switch (ev->button) {
1705 case Button2: 1689 case Button2:
1706 switch (R->scrollbar_align) { 1690 switch (R->scrollbar_align) {
… …
1718 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1719 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1720 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1721 scrollbar_position(ev->y) - R->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1722 scrollbar_size()); 1706 scrollbar_size());
1723 scrollbar_setMotion(); 1707 R->scrollBar.setMotion ();
1724 break; 1708 break;
1725 1709
1726 case Button1: 1710 case Button1:
1727 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1728 R->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
… …
1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1742# else 1726# else
1743 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1744# endif 1728# endif
1745 else 1729 else
1746 scrollbar_setMotion(); 1730 R->scrollBar.setMotion ();
1747 } else { 1731 } else {
1748 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1749 (R->TermWin.nrow 1733 (R->TermWin.nrow
1750 * scrollbar_position(ev->y) 1734 * scrollbar_position(ev->y)
1751 / scrollbar_size())); 1735 / scrollbar_size()));
… …
1773 R->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1774 if (!R->bypass_keystate) 1758 if (!R->bypass_keystate)
1775 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1776 1760
1777 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1778 scrollbar_setIdle(); 1762 R->scrollBar.setIdle ();
1779 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1780#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1781 R->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1782#endif 1766#endif
1783 } 1767 }
… …
1834 break; 1818 break;
1835#ifdef MOUSE_WHEEL 1819#ifdef MOUSE_WHEEL
1836 case Button4: 1820 case Button4:
1837 case Button5: 1821 case Button5:
1838 { 1822 {
1839 int i, v; 1823 int i;
1824 page_dirn v;
1840 1825
1841 v = (ev->button == Button4) ? UP : DN; 1826 v = (ev->button == Button4) ? UP : DN;
1842 if (ev->state & ShiftMask) 1827 if (ev->state & ShiftMask)
1843 i = 1; 1828 i = 1;
1844 else if ((R->Options & Opt_mouseWheelScrollPage)) 1829 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2019 n = 0; 2004 n = 0;
2020 if (pchanged) { 2005 if (pchanged) {
2021 for (; n < (unsigned int)i; n++) { 2006 for (; n < (unsigned int)i; n++) {
2022 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2007 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2023 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2008 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2024 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2009 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2025 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2010 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2026 break; 2011 break;
2027 } 2012 }
2028 } 2013 }
2029 } 2014 }
… …
2079 return stream; 2064 return stream;
2080} 2065}
2081 2066
2082/* EXTPROTO */ 2067/* EXTPROTO */
2083int 2068int
2084rxvt_pclose_printer(FILE *stream) 2069rxvt_pclose_printer (FILE *stream)
2085{ 2070{
2086 fflush(stream); 2071 fflush (stream);
2087/* pclose() reported not to work on SunOS 4.1.3 */ 2072/* pclose() reported not to work on SunOS 4.1.3 */
2088# if defined (__sun__) /* TODO: RESOLVE THIS */ 2073# if defined (__sun__) /* TODO: RESOLVE THIS */
2089/* pclose works provided SIGCHLD handler uses waitpid */ 2074/* pclose works provided SIGCHLD handler uses waitpid */
2090 return pclose(stream); /* return fclose (stream); */ 2075 return pclose (stream); /* return fclose (stream); */
2091# else 2076# else
2092 return pclose(stream); 2077 return pclose (stream);
2093# endif 2078# endif
2094} 2079}
2095 2080
2096/* 2081/*
2097 * simulate attached vt100 printer 2082 * simulate attached vt100 printer
… …
2160rxvt_process_nonprinting(pR_ unsigned char ch) 2145rxvt_process_nonprinting(pR_ unsigned char ch)
2161{ 2146{
2162 switch (ch) { 2147 switch (ch) {
2163 case C0_ENQ: /* terminal Status */ 2148 case C0_ENQ: /* terminal Status */
2164 if (R->rs[Rs_answerbackstring]) 2149 if (R->rs[Rs_answerbackstring])
2165 rxvt_tt_write(aR_ 2150 R->tt_write(
2166 (const unsigned char *)R->rs[Rs_answerbackstring], 2151 (const unsigned char *)R->rs[Rs_answerbackstring],
2167 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2152 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168 else 2153 else
2169 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2154 R->tt_write((unsigned char *)VT100_ANS,
2170 (unsigned int)STRLEN(VT100_ANS)); 2155 (unsigned int)STRLEN(VT100_ANS));
2171 break; 2156 break;
2172 case C0_BEL: /* bell */ 2157 case C0_BEL: /* bell */
2173 rxvt_scr_bell(aR); 2158 rxvt_scr_bell(aR);
2174 break; 2159 break;
… …
2237 row = rxvt_cmd_getc(aR) - ' '; 2222 row = rxvt_cmd_getc(aR) - ' ';
2238 col = rxvt_cmd_getc(aR) - ' '; 2223 col = rxvt_cmd_getc(aR) - ' ';
2239 rxvt_scr_gotorc(aR_ row, col, 0); 2224 rxvt_scr_gotorc(aR_ row, col, 0);
2240 break; 2225 break;
2241 case 'Z': /* identify the terminal type */ 2226 case 'Z': /* identify the terminal type */
2242 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2227 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2243 break; 2228 break;
2244 case '<': /* turn off VT52 mode */ 2229 case '<': /* turn off VT52 mode */
2245 PrivMode(0, PrivMode_vt52); 2230 PrivMode(0, PrivMode_vt52);
2246 break; 2231 break;
2247 case 'F': /* use special graphics character set */ 2232 case 'F': /* use special graphics character set */
… …
2354 rxvt_process_dcs_seq(aR); 2339 rxvt_process_dcs_seq(aR);
2355 break; 2340 break;
2356 2341
2357 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2342 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358 case C1_SCI: /* ESC Z */ 2343 case C1_SCI: /* ESC Z */
2359 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2344 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2345 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361 break; /* steal obsolete ESC [ c */ 2346 break; /* steal obsolete ESC [ c */
2362 2347
2363 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2348 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364 case C1_CSI: /* ESC [ */ 2349 case C1_CSI: /* ESC [ */
… …
2485 */ 2470 */
2486 if (priv) { 2471 if (priv) {
2487 switch (priv) { 2472 switch (priv) {
2488 case '>': 2473 case '>':
2489 if (ch == CSI_DA) /* secondary device attributes */ 2474 if (ch == CSI_DA) /* secondary device attributes */
2490 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2475 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491 break; 2476 break;
2492 case '?': 2477 case '?':
2493 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2494 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2479 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495 break; 2480 break;
… …
2598 2583
2599 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2600 arg[0] = -arg[0]; 2585 arg[0] = -arg[0];
2601 /* FALLTHROUGH */ 2586 /* FALLTHROUGH */
2602 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2588 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2604 break; 2589 break;
2605 2590
2606 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2592 R->tt_write((const unsigned char *)VT100_ANS,
2608 (unsigned int)(sizeof(VT100_ANS) - 1)); 2593 (unsigned int)(sizeof(VT100_ANS) - 1));
2609 break; 2594 break;
2610 2595
2611 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612 rxvt_process_sgr_mode(aR_ nargs, arg); 2597 rxvt_process_sgr_mode(aR_ nargs, arg);
2613 break; 2598 break;
2614 2599
2615 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616 switch (arg[0]) { 2601 switch (arg[0]) {
2617 case 5: /* DSR requested */ 2602 case 5: /* DSR requested */
2618 rxvt_tt_printf(aR_ "\033[0n"); 2603 R->tt_printf("\033[0n");
2619 break; 2604 break;
2620 case 6: /* CPR requested */ 2605 case 6: /* CPR requested */
2621 rxvt_scr_report_position(aR); 2606 rxvt_scr_report_position(aR);
2622 break; 2607 break;
2623#if defined (ENABLE_DISPLAY_ANSWER) 2608#if defined (ENABLE_DISPLAY_ANSWER)
2624 case 7: /* unofficial extension */ 2609 case 7: /* unofficial extension */
2625 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2610 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626 break; 2611 break;
2627#endif 2612#endif
2628 case 8: /* unofficial extension */ 2613 case 8: /* unofficial extension */
2629 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2614 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630 break; 2615 break;
… …
2699 break; 2684 break;
2700#endif 2685#endif
2701 2686
2702 case CSI_78: /* DECREQTPARM */ 2687 case CSI_78: /* DECREQTPARM */
2703 if (arg[0] == 0 || arg[0] == 1) 2688 if (arg[0] == 0 || arg[0] == 1)
2704 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2689 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2705 /* FALLTHROUGH */ 2690 /* FALLTHROUGH */
2706 2691
2707 default: 2692 default:
2708 break; 2693 break;
2709 } 2694 }
… …
2763 /* 2748 /*
2764 * reports - some output format copied from XTerm 2749 * reports - some output format copied from XTerm
2765 */ 2750 */
2766 case 11: /* report window state */ 2751 case 11: /* report window state */
2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2752 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2753 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769 break; 2754 break;
2770 case 13: /* report window position */ 2755 case 13: /* report window position */
2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2756 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2757 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773 -wattr.border_width, -wattr.border_width, 2758 -wattr.border_width, -wattr.border_width,
2774 &x, &y, &wdummy); 2759 &x, &y, &wdummy);
2775 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2760 R->tt_printf("\033[3;%d;%dt", x, y);
2776 break; 2761 break;
2777 case 14: /* report window size (pixels) */ 2762 case 14: /* report window size (pixels) */
2778 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2763 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2764 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780 break; 2765 break;
2781 case 18: /* report window size (chars) */ 2766 case 18: /* report window size (chars) */
2782 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2767 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2783 break; 2768 break;
2784#if 0 /* XXX: currently disabled due to security concerns */ 2769#if 0 /* XXX: currently disabled due to security concerns */
2785 case 20: /* report icon label */ 2770 case 20: /* report icon label */
2786 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2771 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2772 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788 break; 2773 break;
2789 case 21: /* report window title */ 2774 case 21: /* report window title */
2790 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2775 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2776 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792 break; 2777 break;
2793#endif 2778#endif
2794 } 2779 }
2795} 2780}
2796#endif 2781#endif
… …
3339{ 3324{
3340 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3325 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341 3326
3342#ifndef RXVT_GRAPHICS 3327#ifndef RXVT_GRAPHICS
3343 if (cmd == 'Q') { /* query graphics */ 3328 if (cmd == 'Q') { /* query graphics */
3344 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3329 R->tt_printf("\033G0\n"); /* no graphics */
3345 return; 3330 return;
3346 } 3331 }
3347/* swallow other graphics sequences until terminating ':' */ 3332/* swallow other graphics sequences until terminating ':' */
3348 do 3333 do
3349 ch = rxvt_cmd_getc(aR); 3334 ch = rxvt_cmd_getc(aR);
… …
3352 unsigned int nargs; 3337 unsigned int nargs;
3353 int args[NGRX_PTS]; 3338 int args[NGRX_PTS];
3354 unsigned char *text = NULL; 3339 unsigned char *text = NULL;
3355 3340
3356 if (cmd == 'Q') { /* query graphics */ 3341 if (cmd == 'Q') { /* query graphics */
3357 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3342 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358 return; 3343 return;
3359 } 3344 }
3360 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3345 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361 int neg; 3346 int neg;
3362 3347
… …
3377 } 3362 }
3378 3363
3379 if ((cmd == 'T') && (nargs >= 5)) { 3364 if ((cmd == 'T') && (nargs >= 5)) {
3380 int i, len = args[4]; 3365 int i, len = args[4];
3381 3366
3382 text = rxvt_malloc((len + 1) * sizeof(char)); 3367 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3383 3368
3384 if (text != NULL) { 3369 if (text != NULL) {
3385 for (i = 0; i < len; i++) 3370 for (i = 0; i < len; i++)
3386 text[i] = rxvt_cmd_getc(aR); 3371 text[i] = rxvt_cmd_getc(aR);
3387 text[len] = '\0'; 3372 text[len] = '\0';
… …
3392} 3377}
3393/*}}} */ 3378/*}}} */
3394 3379
3395/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3396 3381
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/* 3382/*
3499 * Send printf() formatted output to the command. 3383 * Send printf() formatted output to the command.
3500 * Only use for small amounts of data. 3384 * Only use for small amounts of data.
3501 */ 3385 */
3502/* EXTPROTO */
3503void 3386void
3504rxvt_tt_printf(pR_ const char *fmt,...) 3387rxvt_term::tt_printf (const char *fmt,...)
3505{ 3388{
3506 va_list arg_ptr; 3389 va_list arg_ptr;
3507 unsigned char buf[256]; 3390 unsigned char buf[256];
3508 3391
3509 va_start(arg_ptr, fmt); 3392 va_start (arg_ptr, fmt);
3510 vsprintf((char *)buf, fmt, arg_ptr); 3393 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511 va_end(arg_ptr); 3394 va_end (arg_ptr);
3512 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3395 tt_write (buf, STRLEN (buf));
3513} 3396}
3514 3397
3515/* ---------------------------------------------------------------------- */ 3398/* ---------------------------------------------------------------------- */
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, 3399/* 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. 3400 * or generated by us in response to a query ESC sequence.
3521 */ 3401 */
3522/* EXTPROTO */
3523void 3402void
3524rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3403rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525{ 3404{
3526#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3405 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 3406
3534 if (R->v_bufstr == NULL && len > 0) { 3407 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 } 3408 {
3409 if (v_buflen == 0)
3410 {
3411 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3412 if (written == len)
3413 return;
3544 3414
3545 /* 3415 data += written;
3546 * Append to the block we already have. Always doing this simplifies the 3416 len -= written;
3547 * code, and isn't too bad, either. If this is a short block, it isn't 3417 }
3548 * too expensive, and if this is a long block, we won't be able to write 3418
3549 * it all anyway. 3419
3550 */ 3420 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551 if (len > 0) { 3421
3552 if (v_bufend < v_bufptr + len) { /* run out of room */ 3422 memcpy (v_buffer + v_buflen, data, len);
3553 if (v_bufstr != v_buffer) { 3423 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 } 3424 }
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 3425
3566 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3426 for (;;)
3567 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3427 {
3568 /* save across realloc */ 3428 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569 if (v_buffer) { 3429
3570 v_bufstr = v_buffer; 3430 if (written > 0)
3571 v_bufptr = v_buffer + size; 3431 {
3572 v_bufend = v_buffer + reallocto; 3432 v_buflen -= written;
3573 } else { /* no memory: ignore entire write request */ 3433
3574 rxvt_print_error("data loss: cannot allocate buffer space"); 3434 if (v_buflen == 0)
3575 v_buffer = v_bufstr; /* restore clobbered pointer */ 3435 {
3576 } 3436 free (v_buffer);
3437 v_buffer = 0;
3438 v_buflen = 0;
3439
3440 pty_ev.set (EVENT_READ);
3441 return;
3442 }
3443
3444 memmove (v_buffer, v_buffer + written, v_buflen);
3445 }
3446 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3447 // original code just ignores this...
3448 destroy ();
3449 else
3450 {
3451 pty_ev.set (EVENT_READ | EVENT_WRITE);
3452 return;
3453 }
3577 } 3454 }
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} 3455}
3456
3631/*----------------------- end-of-file (C source) -----------------------*/ 3457/*----------------------- end-of-file (C source) -----------------------*/
3632 3458

Diff Legend

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