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.31 by pcg, Thu Jan 29 23:26:01 2004 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.31 2004/01/29 23:26:01 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[KBUFSZ];
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.
74 * 74 *
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 && 0)
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 scr_clear ();
685 scr_touch (false);
686 want_refresh = 1;
687 }
688#endif
689
690 if (want_refresh)
691 {
692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM
695 rxvt_IMSendSpot (this);
696#endif
697 }
698
699 XFlush (Xdisplay);
700}
701
702void
703rxvt_term::check_cb (check_watcher &w)
704{
705 SET_R (this);
706 SET_LOCALE (locale);
707
708 flush ();
709}
710
711void
661rxvt_term::process_x_events () 712rxvt_term::process_x_events ()
662{ 713{
663 do 714 do
664 { 715 {
665 XEvent xev; 716 XEvent xev;
666 717
667 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
719
668#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
670 && xev.type == KeyPress) { 722 {
671 if (hidden_cursor) { 723 if (hidden_cursor)
724 {
672 hidden_cursor = 0; 725 hidden_cursor = 0;
673 want_refresh = 1; 726 want_refresh = 1;
674 } 727 }
675 want_keypress_time = 1; 728
729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
676 } 730 }
677#endif 731#endif
678 732
679#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
681 && (pointerBlankDelay > 0)) { 735 {
682 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 737 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 738 || xev.type == ButtonRelease)
685 if (hidden_pointer) 739 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 740 pointer_unblank ();
687 want_motion_time = 1; 741
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 742 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 743 pointer_blank ();
691 } 744 }
692#endif 745#endif
693 746
694#ifdef USE_XIM 747#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 748 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 749#endif
697 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
698 } 751 }
699 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
700} 753}
701 754
755#ifdef CURSOR_BLINK
756void
757rxvt_term::cursor_blink_cb (time_watcher &w)
758{
759 hidden_cursor = !hidden_cursor;
760 want_refresh = 1;
761
762 w.start (w.at + BLINK_INTERVAL);
763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_term::text_blink_cb (time_watcher &w)
769{
770 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 {
772 hidden_text = !hidden_text;
773 want_refresh = 1;
774 w.start (w.at + TEXT_BLINK_INTERVAL);
775 }
776}
777#endif
778
702void 779void
703rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
704{ 781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
705 process_x_events (); 785 process_x_events ();
786}
787
788bool
789rxvt_term::pty_fill ()
790{
791 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
792
793 memmove (cmdbuf_base, cmdbuf_ptr, n);
794 cmdbuf_ptr = cmdbuf_base;
795 cmdbuf_endp = cmdbuf_ptr + n;
796
797 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
798
799 if (n > 0)
800 {
801 cmdbuf_endp += n;
802 return true;
803 }
804 else if (n < 0 && errno != EAGAIN)
805 destroy ();
806
807 return false;
808}
809
810void
811rxvt_term::pty_cb (io_watcher &w, short revents)
812{
813 SET_R (this);
814 SET_LOCALE (locale);
815
816 if (revents & EVENT_WRITE)
817 tt_write (0, 0);
818 else if (revents & EVENT_READ)
819 {
820 bool flag = true;
821
822 // loop, but don't allow a single term to monopolize us
823 // the number of loops is fully arbitrary, and thus wrong
824 while (flag && pty_fill ())
825 {
826 if (!seen_input)
827 {
828 seen_input = 1;
829 /* once we know the shell is running, send the screen size. Again! */
830 tt_winch ();
831 }
832
833 uint32_t ch = NOCHAR;
834
835 for (;;)
836 {
837 if (ch == NOCHAR)
838 ch = next_char ();
839
840 if (ch == NOCHAR) // TODO: improve
841 break;
842
843 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
844 {
845 /* Read a text string from the input buffer */
846 uint32_t buf[BUFSIZ];
847 bool refreshnow = false;
848 int nlines = 0;
849 uint32_t *str = buf;
850
851 *str++ = ch;
852
853 for (;;)
854 {
855 ch = next_char ();
856
857 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
858 break;
859 else
860 {
861 *str++ = ch;
862
863 if (ch == '\n')
864 {
865 nlines++;
866 refresh_count++;
867
868 if (!(Options & Opt_jumpScroll)
869 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
870 {
871 refreshnow = true;
872 flag = false;
873 ch = NOCHAR;
874 break;
875 }
876 }
877
878 if (str >= buf + BUFSIZ)
879 {
880 ch = NOCHAR;
881 break;
882 }
883 }
884 }
885
886 rxvt_scr_add_lines (this, buf, nlines, str - buf);
887
888 /*
889 * If there have been a lot of new lines, then update the screen
890 * What the heck I'll cheat and only refresh less than every page-full.
891 * the number of pages between refreshes is refresh_limit, which
892 * is incremented here because we must be doing flat-out scrolling.
893 *
894 * refreshing should be correct for small scrolls, because of the
895 * time-out
896 */
897 if (refreshnow)
898 {
899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
900 refresh_limit++;
901
902 scr_refresh (refresh_type);
903 }
904
905 }
906 else
907 {
908 switch (ch)
909 {
910 default:
911 rxvt_process_nonprinting (this, ch);
912 break;
913 case C0_ESC: /* escape char */
914 rxvt_process_escape_seq (this);
915 break;
916 /*case 0x9b: */ /* CSI */
917 /* rxvt_process_csi_seq (this); */
918 }
919
920 ch = NOCHAR;
921 }
922 }
923 }
924 }
706} 925}
707 926
708// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
709// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
710static uint32_t 929uint32_t
711next_char (pR) 930rxvt_term::next_char ()
712{ 931{
713 mbstate &s = R->mbstate;
714
715 while (R->cmdbuf_ptr < R->cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
716 { 933 {
717 uint8_t ch = *R->cmdbuf_ptr; 934 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++; 935 return *cmdbuf_ptr++;
743 936
744 /* first byte */ 937 wchar_t wc;
745 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
746 s.reg = ch; 939
747 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
748 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
749 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
750 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
751 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
752 } 945
753 else 946 // assume wchar == unicode
754 { 947 cmdbuf_ptr += len;
755 R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756 return ch; 948 return wc;
757 }
758 } 949 }
759 950
760 return NOCHAR; 951 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} 952}
798 953
799/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
800/* 955/*
801 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
… …
803 */ 958 */
804/* INTPROTO */ 959/* INTPROTO */
805uint32_t 960uint32_t
806rxvt_cmd_getc(pR) 961rxvt_cmd_getc(pR)
807{ 962{
963 for (;;)
964 {
965 uint32_t c = R->next_char ();
966 if (c != NOCHAR)
967 return c;
968
969 // incomplete sequences should occur rarely, still, a better solution
970 // would be preferred. either setjmp/longjmp or better design.
971 fcntl (R->cmd_fd, F_SETFL, 0);
972 R->pty_fill ();
973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
974 }
975
976#if 0
808#define TIMEOUT_USEC 5000 977#define TIMEOUT_USEC 5000
809 fd_set readfds; 978 fd_set readfds;
810 int quick_timeout, select_res; 979 int quick_timeout, select_res;
811 int want_motion_time, want_keypress_time; 980 int want_motion_time, want_keypress_time;
812 struct timeval value; 981 struct timeval value;
813#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 982#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
814 struct timeval tp; 983 struct timeval tp;
815#endif 984#endif
816 985
817 uint32_t c = next_char (aR);
818 if (c != NOCHAR)
819 return c;
820
821 for (;;) { 986 for (;;) {
822 /* loop until we can return something */ 987 /* loop until we can return something */
823 988
824 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825 rxvt_tt_write(aR_ NULL, 0); 990 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 991
867#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
869 quick_timeout = 1; 994 quick_timeout = 1;
870 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
… …
880 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
881 quick_timeout = 1; 1006 quick_timeout = 1;
882 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
883 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
884 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
885 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
886 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
887 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
888 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
889 R->want_refresh = 1; 1014 R->want_refresh = 1;
890 } 1015 }
… …
900 R->want_refresh = 1; 1025 R->want_refresh = 1;
901 } 1026 }
902 } 1027 }
903#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904 1029
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 1030#ifdef TRANSPARENT
916 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
917#endif 1032#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 1033#endif
1034}
1035
944# if defined(POINTER_BLANK) 1036#ifdef 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}
1026/*}}} */
1027
1028/* EXTPROTO */
1029void 1037void
1030rxvt_pointer_unblank(pR) 1038rxvt_term::pointer_unblank ()
1031{ 1039{
1032 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033 rxvt_recolour_cursor(aR); 1041 recolour_cursor ();
1034#ifdef POINTER_BLANK 1042
1035 R->hidden_pointer = 0; 1043 hidden_pointer = 0;
1036 if (R->pointerBlankDelay > 0) {
1037 struct timeval tp;
1038 1044
1039 (void)gettimeofday(&tp, NULL); 1045 if (Options & Opt_pointerBlank)
1040 R->lastmotion.tv_sec = tp.tv_sec; 1046 pointer_ev.start (NOW + pointerBlankDelay);
1041 R->lastmotion.tv_usec = tp.tv_usec;
1042 }
1043#endif
1044} 1047}
1045 1048
1046#ifdef POINTER_BLANK
1047/* INTPROTO */
1048void 1049void
1049rxvt_pointer_blank(pR) 1050rxvt_term::pointer_blank ()
1050{ 1051{
1052 if (!(Options & Opt_pointerBlank))
1053 return;
1054
1051 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052 XFlush(R->Xdisplay); 1056 XFlush (Xdisplay);
1057
1053 R->hidden_pointer = 1; 1058 hidden_pointer = 1;
1059}
1060
1061void
1062rxvt_term::pointer_cb (time_watcher &w)
1063{
1064 SET_R (this);
1065 SET_LOCALE (locale);
1066
1067 pointer_blank ();
1054} 1068}
1055#endif 1069#endif
1056 1070
1057/* INTPROTO */ 1071/* INTPROTO */
1058void 1072void
… …
1061 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1062 int x, y; 1076 int x, y;
1063 1077
1064 x = ev->x; 1078 x = ev->x;
1065 y = ev->y; 1079 y = ev->y;
1066 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1067 1081
1068 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1069 button_number = 3; 1083 button_number = 3;
1070 } else { 1084 } else {
1071 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1111 fprintf(stderr, "]: <%d>, %d/%d\n", 1125 fprintf(stderr, "]: <%d>, %d/%d\n",
1112 button_number, 1126 button_number,
1113 x + 1, 1127 x + 1,
1114 y + 1); 1128 y + 1);
1115#else 1129#else
1116 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1130 R->tt_printf("\033[M%c%c%c",
1117 (32 + button_number + key_state), 1131 (32 + button_number + key_state),
1118 (32 + x + 1), 1132 (32 + x + 1),
1119 (32 + y + 1)); 1133 (32 + y + 1));
1120#endif 1134#endif
1121} 1135}
… …
1138{ 1152{
1139 int i, want_timeout; 1153 int i, want_timeout;
1140 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1141 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1142 unsigned int unused_mask; 1156 unsigned int unused_mask;
1143 struct timeval tp;
1144 1157
1145#ifdef DEBUG_X 1158#ifdef DEBUG_X
1146 const char *const eventnames[] = 1159 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1148 "", 1161 "",
… …
1179 "SelectionNotify", 1192 "SelectionNotify",
1180 "ColormapNotify", 1193 "ColormapNotify",
1181 "ClientMessage", 1194 "ClientMessage",
1182 "MappingNotify" 1195 "MappingNotify"
1183 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1184 struct tm *ltt; 1201 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); 1202 (void)gettimeofday(&tp, NULL);
1201
1202#ifdef DEBUG_X
1203 ltt = localtime(&(tp.tv_sec)); 1203 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)); 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));
1205#endif 1205#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 1206
1227 switch (ev->type) { 1207 switch (ev->type) {
1228 case KeyPress: 1208 case KeyPress:
1229 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1230 break; 1210 break;
… …
1254 break; 1234 break;
1255 1235
1256 case ClientMessage: 1236 case ClientMessage:
1257 if (ev->xclient.format == 32 1237 if (ev->xclient.format == 32
1258 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259 exit(EXIT_SUCCESS); 1239 R->destroy ();
1260#ifdef OFFIX_DND 1240#ifdef OFFIX_DND
1261 /* OffiX Dnd (drag 'n' drop) protocol */ 1241 /* OffiX Dnd (drag 'n' drop) protocol */
1262 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263 && (ev->xclient.data.l[0] == DndFile 1243 && (ev->xclient.data.l[0] == DndFile
1264 || ev->xclient.data.l[0] == DndDir 1244 || ev->xclient.data.l[0] == DndDir
1265 || ev->xclient.data.l[0] == DndLink)) { 1245 || ev->xclient.data.l[0] == DndLink)) {
1266 /* Get Dnd data */ 1246 /* Get Dnd data */
1267 Atom ActualType; 1247 Atom ActualType;
… …
1299 * in the GraphicsExpose parts, which means that after each refresh, 1279 * in the GraphicsExpose parts, which means that after each refresh,
1300 * we need to wait for the graphics expose or Noexpose events, 1280 * we need to wait for the graphics expose or Noexpose events,
1301 * which ought to make things real slow! 1281 * which ought to make things real slow!
1302 */ 1282 */
1303 case VisibilityNotify: 1283 case VisibilityNotify:
1304 switch (ev->xvisibility.state) { 1284 switch (ev->xvisibility.state)
1285 {
1305 case VisibilityUnobscured: 1286 case VisibilityUnobscured:
1306 R->refresh_type = FAST_REFRESH; 1287 R->refresh_type = FAST_REFRESH;
1307 break; 1288 break;
1308 case VisibilityPartiallyObscured: 1289 case VisibilityPartiallyObscured:
1309 R->refresh_type = SLOW_REFRESH; 1290 R->refresh_type = SLOW_REFRESH;
1310 break; 1291 break;
1311 default: 1292 default:
1312 R->refresh_type = NO_REFRESH; 1293 R->refresh_type = NO_REFRESH;
1313 break; 1294 break;
1314 } 1295 }
1315 break; 1296 break;
1316 1297
1317 case FocusIn: 1298 case FocusIn:
1318 if (!R->TermWin.focus) { 1299 if (!R->TermWin.focus) {
1319 R->TermWin.focus = 1; 1300 R->TermWin.focus = 1;
1320 R->want_refresh = 1; 1301 R->want_refresh = 1;
1321#ifdef USE_XIM 1302#ifdef USE_XIM
1322 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1323 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1324#endif 1305#endif
1306#ifdef CURSOR_BLINK
1307 if (R->Options & Opt_cursorBlink)
1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1309#endif
1325 } 1310 }
1326 break; 1311 break;
1327 1312
1328 case FocusOut: 1313 case FocusOut:
1329 if (R->TermWin.focus) { 1314 if (R->TermWin.focus) {
1330 R->TermWin.focus = 0; 1315 R->TermWin.focus = 0;
1331 R->want_refresh = 1; 1316 R->want_refresh = 1;
1332#ifdef USE_XIM 1317#ifdef USE_XIM
1333 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1334 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1320#endif
1321#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink)
1323 R->cursor_blink_ev.stop ();
1324 R->hidden_cursor = 0;
1335#endif 1325#endif
1336 } 1326 }
1337 break; 1327 break;
1338 1328
1339 case ConfigureNotify: 1329 case ConfigureNotify:
… …
1346 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1347 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1348 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1349 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1350 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1351 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1352 (unsigned int)height, 1);
1353 } 1342 }
1354#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1355 else { 1344 else {
1356 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1357 } 1346 }
… …
1380 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1381 break; 1370 break;
1382 1371
1383 case UnmapNotify: 1372 case UnmapNotify:
1384 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1385 break; 1377 break;
1386 1378
1387 case MapNotify: 1379 case MapNotify:
1388 R->TermWin.mapped = 1; 1380 R->TermWin.mapped = 1;
1381#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif
1389 break; 1384 break;
1390 1385
1391 case PropertyNotify: 1386 case PropertyNotify:
1392 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1393 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1416 1411
1417 case GraphicsExpose: 1412 case GraphicsExpose:
1418 case Expose: 1413 case Expose:
1419 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1420#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1421 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1422 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1423#else 1418#else
1424 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1425 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1426 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1427 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1428 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1429#endif 1424#endif
1430 R->want_refresh = 1; 1425 R->want_refresh = 1;
1431 } else { 1426 } else {
… …
1436 &unused_xevent)) ; 1431 &unused_xevent)) ;
1437 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1438 GraphicsExpose, 1433 GraphicsExpose,
1439 &unused_xevent)) ; 1434 &unused_xevent)) ;
1440 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1441 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1442 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1443 } 1438 }
1444#ifdef MENUBAR 1439#ifdef MENUBAR
1445 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1446 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
… …
1452 break; 1447 break;
1453 1448
1454 case MotionNotify: 1449 case MotionNotify:
1455#ifdef POINTER_BLANK 1450#ifdef POINTER_BLANK
1456 if (R->hidden_pointer) 1451 if (R->hidden_pointer)
1457 rxvt_pointer_unblank(aR); 1452 R->pointer_unblank ();
1458#endif 1453#endif
1459#if MENUBAR 1454#if MENUBAR
1460 if (isMenuBarWindow(ev->xany.window)) { 1455 if (isMenuBarWindow(ev->xany.window)) {
1461 rxvt_menubar_control(aR_ &(ev->xbutton)); 1456 rxvt_menubar_control(aR_ &(ev->xbutton));
1462 break; 1457 break;
… …
1476 &unused_mask); 1471 &unused_mask);
1477#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1478 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1479 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1480#endif 1475#endif
1481 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1482 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1483#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1484 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1485 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1486 int dist; 1481 int dist;
… …
1535 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1536 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1537 &unused_mask); 1532 &unused_mask);
1538 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1539 scrollbar_size()); 1534 scrollbar_size());
1540 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1541 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1542 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1543 } 1538 }
1544 break; 1539 break;
1545 } 1540 }
… …
1547 1542
1548/* INTPROTO */ 1543/* INTPROTO */
1549void 1544void
1550rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1551{ 1546{
1552 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1553 1548
1554 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1555 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1556 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1557/* 1552/*
… …
1559 */ 1554 */
1560 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1561 { 1556 {
1562#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1563 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1564 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1565 else 1560 else
1566#endif 1561#endif
1567 { 1562 {
1568 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1569 if (reportmode) 1564 if (reportmode)
… …
1604 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1605 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1606 switch (ev->button) 1601 switch (ev->button)
1607 { 1602 {
1608 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1609 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1610 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1611 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1612 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1613 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1614 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1615 break; 1623 break;
1616 1624
1617 case Button3: 1625 case Button3:
1618 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1619 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1620 else 1628 else
1621 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1622 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1623 break; 1631 break;
1624 } 1632 }
1625 } 1633 }
1626 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1631/* 1639/*
1632 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1633 */ 1641 */
1634 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1635 { 1643 {
1636 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1637 /* 1645 /*
1638 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1639 * move up if mouse is above slider 1647 * move up if mouse is above slider
1640 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1641 * 1649 *
… …
1653 */ 1661 */
1654 if ((R->scrollBar.style == R_SB_NEXT 1662 if ((R->scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_upButton(ev->y)) 1663 && scrollbarnext_upButton(ev->y))
1656 || (R->scrollBar.style == R_SB_RXVT 1664 || (R->scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_upButton(ev->y))) 1665 && scrollbarrxvt_upButton(ev->y)))
1658 rxvt_tt_printf(aR_ "\033[A"); 1666 R->tt_printf("\033[A");
1659 else if ((R->scrollBar.style == R_SB_NEXT 1667 else if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_dnButton(ev->y)) 1668 && scrollbarnext_dnButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1669 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_dnButton(ev->y))) 1670 && scrollbarrxvt_dnButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[B"); 1671 R->tt_printf("\033[B");
1664 else 1672 else
1665 switch (ev->button) { 1673 switch (ev->button) {
1666 case Button2: 1674 case Button2:
1667 rxvt_tt_printf(aR_ "\014"); 1675 R->tt_printf("\014");
1668 break; 1676 break;
1669 case Button1: 1677 case Button1:
1670 rxvt_tt_printf(aR_ "\033[6~"); 1678 R->tt_printf("\033[6~");
1671 break; 1679 break;
1672 case Button3: 1680 case Button3:
1673 rxvt_tt_printf(aR_ "\033[5~"); 1681 R->tt_printf("\033[5~");
1674 break; 1682 break;
1675 } 1683 }
1676 } 1684 }
1677 else 1685 else
1678#endif /* NO_SCROLLBAR_REPORT */ 1686#endif /* NO_SCROLLBAR_REPORT */
… …
1694#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1695 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1696#endif 1704#endif
1697 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1698 if (upordown < 0) 1706 if (upordown < 0)
1699 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1700 else 1708 else
1701 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1702 } 1710 }
1703 } else 1711 } else
1704 switch (ev->button) { 1712 switch (ev->button) {
1705 case Button2: 1713 case Button2:
1706 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
… …
1718 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1719 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1720 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1721 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1722 scrollbar_size()); 1730 scrollbar_size());
1723 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1724 break; 1732 break;
1725 1733
1726 case Button1: 1734 case Button1:
1727 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1728 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
… …
1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1742# else 1750# else
1743 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1744# endif 1752# endif
1745 else 1753 else
1746 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1747 } else { 1755 } else {
1748 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1749 (R->TermWin.nrow 1757 (R->TermWin.nrow
1750 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1751 / scrollbar_size())); 1759 / scrollbar_size()));
… …
1773 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1774 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1775 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1776 1784
1777 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1778 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1779 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1780#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1781 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1782#endif 1790#endif
1783 } 1791 }
… …
1820 * when overriding mouse reporting 1828 * when overriding mouse reporting
1821 */ 1829 */
1822 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1823 && R->bypass_keystate 1831 && R->bypass_keystate
1824 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1825 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1826 1834
1827 switch (ev->button) { 1835 switch (ev->button) {
1828 case Button1: 1836 case Button1:
1829 case Button3: 1837 case Button3:
1830 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1834 break; 1842 break;
1835#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1836 case Button4: 1844 case Button4:
1837 case Button5: 1845 case Button5:
1838 { 1846 {
1839 int i, v; 1847 int i;
1848 page_dirn v;
1840 1849
1841 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1842 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1843 i = 1; 1852 i = 1;
1844 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1852 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1853 } 1862 }
1854# endif 1863# endif
1855# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1856 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1857 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1858 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1859# else 1868# else
1860 for (; i--;) 1869 while (i--)
1861 { 1870 {
1862 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1863 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1864 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1865 } 1874 }
1866# endif 1875# endif
1867 } 1876 }
1868 break; 1877 break;
… …
2019 n = 0; 2028 n = 0;
2020 if (pchanged) { 2029 if (pchanged) {
2021 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2022 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 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")); 2032 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) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2025 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2026 break; 2035 break;
2027 } 2036 }
2028 } 2037 }
2029 } 2038 }
… …
2079 return stream; 2088 return stream;
2080} 2089}
2081 2090
2082/* EXTPROTO */ 2091/* EXTPROTO */
2083int 2092int
2084rxvt_pclose_printer(FILE *stream) 2093rxvt_pclose_printer (FILE *stream)
2085{ 2094{
2086 fflush(stream); 2095 fflush (stream);
2087/* pclose() reported not to work on SunOS 4.1.3 */ 2096/* pclose() reported not to work on SunOS 4.1.3 */
2088# if defined (__sun__) /* TODO: RESOLVE THIS */ 2097# if defined (__sun__) /* TODO: RESOLVE THIS */
2089/* pclose works provided SIGCHLD handler uses waitpid */ 2098/* pclose works provided SIGCHLD handler uses waitpid */
2090 return pclose(stream); /* return fclose (stream); */ 2099 return pclose (stream); /* return fclose (stream); */
2091# else 2100# else
2092 return pclose(stream); 2101 return pclose (stream);
2093# endif 2102# endif
2094} 2103}
2095 2104
2096/* 2105/*
2097 * simulate attached vt100 printer 2106 * simulate attached vt100 printer
… …
2160rxvt_process_nonprinting(pR_ unsigned char ch) 2169rxvt_process_nonprinting(pR_ unsigned char ch)
2161{ 2170{
2162 switch (ch) { 2171 switch (ch) {
2163 case C0_ENQ: /* terminal Status */ 2172 case C0_ENQ: /* terminal Status */
2164 if (R->rs[Rs_answerbackstring]) 2173 if (R->rs[Rs_answerbackstring])
2165 rxvt_tt_write(aR_ 2174 R->tt_write(
2166 (const unsigned char *)R->rs[Rs_answerbackstring], 2175 (const unsigned char *)R->rs[Rs_answerbackstring],
2167 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168 else 2177 else
2169 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2178 R->tt_write((unsigned char *)VT100_ANS,
2170 (unsigned int)STRLEN(VT100_ANS)); 2179 (unsigned int)STRLEN(VT100_ANS));
2171 break; 2180 break;
2172 case C0_BEL: /* bell */ 2181 case C0_BEL: /* bell */
2173 rxvt_scr_bell(aR); 2182 rxvt_scr_bell(aR);
2174 break; 2183 break;
… …
2222 break; 2231 break;
2223 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2224 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2225 break; 2234 break;
2226 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2227 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2228 break; 2237 break;
2229 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2230 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2231 break; 2240 break;
2232 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2237 row = rxvt_cmd_getc(aR) - ' '; 2246 row = rxvt_cmd_getc(aR) - ' ';
2238 col = rxvt_cmd_getc(aR) - ' '; 2247 col = rxvt_cmd_getc(aR) - ' ';
2239 rxvt_scr_gotorc(aR_ row, col, 0); 2248 rxvt_scr_gotorc(aR_ row, col, 0);
2240 break; 2249 break;
2241 case 'Z': /* identify the terminal type */ 2250 case 'Z': /* identify the terminal type */
2242 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2251 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2243 break; 2252 break;
2244 case '<': /* turn off VT52 mode */ 2253 case '<': /* turn off VT52 mode */
2245 PrivMode(0, PrivMode_vt52); 2254 PrivMode(0, PrivMode_vt52);
2246 break; 2255 break;
2247 case 'F': /* use special graphics character set */ 2256 case 'F': /* use special graphics character set */
… …
2354 rxvt_process_dcs_seq(aR); 2363 rxvt_process_dcs_seq(aR);
2355 break; 2364 break;
2356 2365
2357 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358 case C1_SCI: /* ESC Z */ 2367 case C1_SCI: /* ESC Z */
2359 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2368 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361 break; /* steal obsolete ESC [ c */ 2370 break; /* steal obsolete ESC [ c */
2362 2371
2363 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364 case C1_CSI: /* ESC [ */ 2373 case C1_CSI: /* ESC [ */
… …
2485 */ 2494 */
2486 if (priv) { 2495 if (priv) {
2487 switch (priv) { 2496 switch (priv) {
2488 case '>': 2497 case '>':
2489 if (ch == CSI_DA) /* secondary device attributes */ 2498 if (ch == CSI_DA) /* secondary device attributes */
2490 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491 break; 2500 break;
2492 case '?': 2501 case '?':
2493 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2494 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495 break; 2504 break;
… …
2567 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2568 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2569 break; 2578 break;
2570 2579
2571 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2572 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2573 break; 2582 break;
2574 2583
2575 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2576 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2577 break; 2586 break;
… …
2598 2607
2599 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2600 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2601 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2602 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2604 break; 2613 break;
2605 2614
2606 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2608 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
2609 break; 2618 break;
2610 2619
2611 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612 rxvt_process_sgr_mode(aR_ nargs, arg); 2621 rxvt_process_sgr_mode(aR_ nargs, arg);
2613 break; 2622 break;
2614 2623
2615 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616 switch (arg[0]) { 2625 switch (arg[0]) {
2617 case 5: /* DSR requested */ 2626 case 5: /* DSR requested */
2618 rxvt_tt_printf(aR_ "\033[0n"); 2627 R->tt_printf("\033[0n");
2619 break; 2628 break;
2620 case 6: /* CPR requested */ 2629 case 6: /* CPR requested */
2621 rxvt_scr_report_position(aR); 2630 rxvt_scr_report_position(aR);
2622 break; 2631 break;
2623#if defined (ENABLE_DISPLAY_ANSWER) 2632#if defined (ENABLE_DISPLAY_ANSWER)
2624 case 7: /* unofficial extension */ 2633 case 7: /* unofficial extension */
2625 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626 break; 2635 break;
2627#endif 2636#endif
2628 case 8: /* unofficial extension */ 2637 case 8: /* unofficial extension */
2629 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630 break; 2639 break;
… …
2699 break; 2708 break;
2700#endif 2709#endif
2701 2710
2702 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2703 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2704 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2705 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2706 2715
2707 default: 2716 default:
2708 break; 2717 break;
2709 } 2718 }
… …
2747 break; 2756 break;
2748 case 6: /* lower window */ 2757 case 6: /* lower window */
2749 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2750 break; 2759 break;
2751 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2752 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2753 break; 2762 break;
2754 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2755 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2756 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2757 break; 2766 break;
… …
2763 /* 2772 /*
2764 * reports - some output format copied from XTerm 2773 * reports - some output format copied from XTerm
2765 */ 2774 */
2766 case 11: /* report window state */ 2775 case 11: /* report window state */
2767 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769 break; 2778 break;
2770 case 13: /* report window position */ 2779 case 13: /* report window position */
2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773 -wattr.border_width, -wattr.border_width, 2782 -wattr.border_width, -wattr.border_width,
2774 &x, &y, &wdummy); 2783 &x, &y, &wdummy);
2775 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2784 R->tt_printf("\033[3;%d;%dt", x, y);
2776 break; 2785 break;
2777 case 14: /* report window size (pixels) */ 2786 case 14: /* report window size (pixels) */
2778 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780 break; 2789 break;
2781 case 18: /* report window size (chars) */ 2790 case 18: /* report window size (chars) */
2782 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2791 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2783 break; 2792 break;
2784#if 0 /* XXX: currently disabled due to security concerns */ 2793#if 0 /* XXX: currently disabled due to security concerns */
2785 case 20: /* report icon label */ 2794 case 20: /* report icon label */
2786 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788 break; 2797 break;
2789 case 21: /* report window title */ 2798 case 21: /* report window title */
2790 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792 break; 2801 break;
2793#endif 2802#endif
2794 } 2803 }
2795} 2804}
2796#endif 2805#endif
… …
2968 if (*str != ';') { 2977 if (*str != ';') {
2969#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2970 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2971 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2972#endif 2981#endif
2973 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2974 } 2983 }
2975 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
2976 str++; 2985 str++;
2977#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
2978 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
2980 } 2989 }
2981 if (changed) { 2990 if (changed) {
2982#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
2983 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
2984#endif 2993#endif
2985 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
2986 } 2995 }
2987 break; 2996 break;
2988 2997
2989 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
2990 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3156 break; 3165 break;
3157#endif 3166#endif
3158#ifdef scrollBar_esc 3167#ifdef scrollBar_esc
3159 case scrollBar_esc: 3168 case scrollBar_esc:
3160 if (rxvt_scrollbar_mapping(aR_ state)) { 3169 if (rxvt_scrollbar_mapping(aR_ state)) {
3161 rxvt_resize_all_windows(aR_ 0, 0, 0); 3170 R->resize_all_windows (0, 0, 0);
3162 rxvt_scr_touch(aR_ True); 3171 R->scr_touch (true);
3163 } 3172 }
3164 break; 3173 break;
3165#endif 3174#endif
3166 case 25: /* visible/invisible cursor */ 3175 case 25: /* visible/invisible cursor */
3167 rxvt_scr_cursor_visible(aR_ state); 3176 rxvt_scr_cursor_visible(aR_ state);
… …
3193 else 3202 else
3194 R->Options &= ~Opt_scrollTtyKeypress; 3203 R->Options &= ~Opt_scrollTtyKeypress;
3195 break; 3204 break;
3196 case 1047: /* secondary screen w/ clearing */ 3205 case 1047: /* secondary screen w/ clearing */
3197 if (R->current_screen != PRIMARY) 3206 if (R->current_screen != PRIMARY)
3198 rxvt_scr_erase_screen(aR_ 2); 3207 R->scr_erase_screen (2);
3199 rxvt_scr_change_screen(aR_ state); 3208 rxvt_scr_change_screen(aR_ state);
3200 /* FALLTHROUGH */ 3209 /* FALLTHROUGH */
3201 default: 3210 default:
3202 break; 3211 break;
3203 } 3212 }
… …
3339{ 3348{
3340 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3349 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341 3350
3342#ifndef RXVT_GRAPHICS 3351#ifndef RXVT_GRAPHICS
3343 if (cmd == 'Q') { /* query graphics */ 3352 if (cmd == 'Q') { /* query graphics */
3344 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3353 R->tt_printf("\033G0\n"); /* no graphics */
3345 return; 3354 return;
3346 } 3355 }
3347/* swallow other graphics sequences until terminating ':' */ 3356/* swallow other graphics sequences until terminating ':' */
3348 do 3357 do
3349 ch = rxvt_cmd_getc(aR); 3358 ch = rxvt_cmd_getc(aR);
… …
3352 unsigned int nargs; 3361 unsigned int nargs;
3353 int args[NGRX_PTS]; 3362 int args[NGRX_PTS];
3354 unsigned char *text = NULL; 3363 unsigned char *text = NULL;
3355 3364
3356 if (cmd == 'Q') { /* query graphics */ 3365 if (cmd == 'Q') { /* query graphics */
3357 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3366 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358 return; 3367 return;
3359 } 3368 }
3360 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3369 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361 int neg; 3370 int neg;
3362 3371
… …
3377 } 3386 }
3378 3387
3379 if ((cmd == 'T') && (nargs >= 5)) { 3388 if ((cmd == 'T') && (nargs >= 5)) {
3380 int i, len = args[4]; 3389 int i, len = args[4];
3381 3390
3382 text = rxvt_malloc((len + 1) * sizeof(char)); 3391 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3383 3392
3384 if (text != NULL) { 3393 if (text != NULL) {
3385 for (i = 0; i < len; i++) 3394 for (i = 0; i < len; i++)
3386 text[i] = rxvt_cmd_getc(aR); 3395 text[i] = rxvt_cmd_getc(aR);
3387 text[len] = '\0'; 3396 text[len] = '\0';
… …
3392} 3401}
3393/*}}} */ 3402/*}}} */
3394 3403
3395/* ------------------------------------------------------------------------- */ 3404/* ------------------------------------------------------------------------- */
3396 3405
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/* 3406/*
3499 * Send printf() formatted output to the command. 3407 * Send printf() formatted output to the command.
3500 * Only use for small amounts of data. 3408 * Only use for small amounts of data.
3501 */ 3409 */
3502/* EXTPROTO */
3503void 3410void
3504rxvt_tt_printf(pR_ const char *fmt,...) 3411rxvt_term::tt_printf (const char *fmt,...)
3505{ 3412{
3506 va_list arg_ptr; 3413 va_list arg_ptr;
3507 unsigned char buf[256]; 3414 unsigned char buf[256];
3508 3415
3509 va_start(arg_ptr, fmt); 3416 va_start (arg_ptr, fmt);
3510 vsprintf((char *)buf, fmt, arg_ptr); 3417 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511 va_end(arg_ptr); 3418 va_end (arg_ptr);
3512 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3419 tt_write (buf, STRLEN (buf));
3513} 3420}
3514 3421
3515/* ---------------------------------------------------------------------- */ 3422/* ---------------------------------------------------------------------- */
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, 3423/* 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. 3424 * or generated by us in response to a query ESC sequence.
3521 */ 3425 */
3522/* EXTPROTO */
3523void 3426void
3524rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3427rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525{ 3428{
3526#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3429 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 3430
3534 if (R->v_bufstr == NULL && len > 0) { 3431 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 } 3432 {
3433 if (v_buflen == 0)
3434 {
3435 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3436 if (written == len)
3437 return;
3544 3438
3545 /* 3439 data += written;
3546 * Append to the block we already have. Always doing this simplifies the 3440 len -= written;
3547 * code, and isn't too bad, either. If this is a short block, it isn't 3441 }
3548 * too expensive, and if this is a long block, we won't be able to write 3442
3549 * it all anyway. 3443
3550 */ 3444 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551 if (len > 0) { 3445
3552 if (v_bufend < v_bufptr + len) { /* run out of room */ 3446 memcpy (v_buffer + v_buflen, data, len);
3553 if (v_bufstr != v_buffer) { 3447 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 } 3448 }
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 3449
3566 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3450 for (;;)
3567 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3451 {
3568 /* save across realloc */ 3452 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569 if (v_buffer) { 3453
3570 v_bufstr = v_buffer; 3454 if (written > 0)
3571 v_bufptr = v_buffer + size; 3455 {
3572 v_bufend = v_buffer + reallocto; 3456 v_buflen -= written;
3573 } else { /* no memory: ignore entire write request */ 3457
3574 rxvt_print_error("data loss: cannot allocate buffer space"); 3458 if (v_buflen == 0)
3575 v_buffer = v_bufstr; /* restore clobbered pointer */ 3459 {
3576 } 3460 free (v_buffer);
3461 v_buffer = 0;
3462 v_buflen = 0;
3463
3464 pty_ev.set (EVENT_READ);
3465 return;
3466 }
3467
3468 memmove (v_buffer, v_buffer + written, v_buflen);
3469 }
3470 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3471 // original code just ignores this...
3472 destroy ();
3473 else
3474 {
3475 pty_ev.set (EVENT_READ | EVENT_WRITE);
3476 return;
3477 }
3577 } 3478 }
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} 3479}
3480
3631/*----------------------- end-of-file (C source) -----------------------*/ 3481/*----------------------- end-of-file (C source) -----------------------*/
3632 3482

Diff Legend

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