ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.4 by pcg, Tue Nov 25 15:25:16 2003 UTC vs.
Revision 1.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.4 2003/11/25 15:25:16 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() */
… …
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
659 676
660void 677void
661rxvt_term::process_x_events ()
662{
663 do
664 {
665 XEvent xev;
666
667 XNextEvent (Xdisplay, &xev);
668#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) {
671 if (hidden_cursor) {
672 hidden_cursor = 0;
673 want_refresh = 1;
674 }
675 want_keypress_time = 1;
676 }
677#endif
678
679#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) {
682 if (xev.type == MotionNotify
683 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) {
685 if (hidden_pointer)
686 rxvt_pointer_unblank(aR);
687 want_motion_time = 1;
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this);
691 }
692#endif
693
694#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window))
696#endif
697 rxvt_process_x_event (this, &xev);
698 }
699 while (XPending (Xdisplay));
700}
701
702void
703rxvt_term::x_cb (io_watcher &w, short revents)
704{
705 process_x_events ();
706
707 flush ();
708}
709
710// read the next character, currently handles UTF-8
711// will probably handle all sorts of other stuff in the future
712uint32_t
713rxvt_term::next_char ()
714{
715 struct mbstate &s = mbstate;
716
717 while (cmdbuf_ptr < cmdbuf_endp)
718 {
719 uint8_t ch = *cmdbuf_ptr;
720
721 if (s.cnt)
722 {
723 if ((ch & 0xc0) == 0x80)
724 {
725 cmdbuf_ptr++;
726
727 /* continuation */
728 s.reg = (s.reg << 6) | (ch & 0x7f);
729
730 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
731 return s.reg;
732
733 continue;
734 }
735 else
736 {
737 s.cnt = 0;
738 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
739 }
740 }
741
742 if ((ch & 0xc0) == 0xc0)
743 {
744 cmdbuf_ptr++;
745
746 /* first byte */
747 s.orig = ch; /* for broken encodings */
748 s.reg = ch;
749 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
750 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
751 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
752 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
753 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
754 }
755 else
756 {
757 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
758 return ch;
759 }
760 }
761
762 return NOCHAR;
763}
764
765bool
766rxvt_term::pty_fill (size_t count)
767{
768 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
769
770 memmove (cmdbuf_base, cmdbuf_ptr, n);
771 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp = cmdbuf_ptr + n;
773
774 n = read (cmd_fd, cmdbuf_endp, count);
775
776 if (n > 0)
777 {
778 cmdbuf_endp += n;
779 return true;
780 }
781 else if (n < 0 && errno == EAGAIN)
782 return false;
783
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786}
787
788void
789rxvt_term::pty_cb (io_watcher &w, short revents)
790{
791 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
792 {
793 /* once we know the shell is running, send the screen size. Again! */
794 //ch = rxvt_cmd_getc(aR); /* wait for something */
795 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
796
797 uint32_t ch = NOCHAR;
798
799 for (;;)
800 {
801 if (ch == NOCHAR)
802 ch = next_char ();
803
804 if (ch == NOCHAR) // TODO: improve
805 break;
806
807 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
808 {
809 /* Read a text string from the input buffer */
810 uint32_t buf[BUFSIZ];
811 bool refreshnow = false;
812 int nlines = 0;
813 uint32_t *str = buf;
814
815 *str++ = ch;
816
817 for (;;)
818 {
819 ch = next_char ();
820
821 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
822 break;
823 else
824 {
825 *str++ = ch;
826
827 if (ch == '\n')
828 {
829 nlines++;
830 refresh_count++;
831
832 if (!(Options & Opt_jumpScroll)
833 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
834 {
835 refreshnow = true;
836 ch = NOCHAR;
837 break;
838 }
839 }
840
841 if (str >= buf + BUFSIZ)
842 {
843 ch = NOCHAR;
844 break;
845 }
846 }
847 }
848
849 rxvt_scr_add_lines (this, buf, nlines, str - buf);
850
851 /*
852 * If there have been a lot of new lines, then update the screen
853 * What the heck I'll cheat and only refresh less than every page-full.
854 * the number of pages between refreshes is refresh_limit, which
855 * is incremented here because we must be doing flat-out scrolling.
856 *
857 * refreshing should be correct for small scrolls, because of the
858 * time-out
859 */
860 if (refreshnow)
861 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++;
864
865 rxvt_scr_refresh (this, refresh_type);
866 }
867
868 }
869 else
870 {
871 switch (ch)
872 {
873 default:
874 rxvt_process_nonprinting (this, ch);
875 break;
876 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this);
878 break;
879 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */
881 }
882
883 ch = NOCHAR;
884 }
885 }
886 }
887
888 flush ();
889}
890
891void
892rxvt_term::flush () 678rxvt_term::flush ()
893{ 679{
894#ifdef TRANSPARENT 680#ifdef TRANSPARENT
895 if (want_full_refresh) 681 if (want_full_refresh)
896 { 682 {
… …
909 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
910#endif 696#endif
911 } 697 }
912 698
913 XFlush (Xdisplay); 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
716rxvt_term::process_x_events ()
717{
718 do
719 {
720 XEvent xev;
721
722 XNextEvent (Xdisplay, &xev);
723
724#if defined(CURSOR_BLINK)
725 if ((Options & Opt_cursorBlink)
726 && xev.type == KeyPress)
727 {
728 if (hidden_cursor)
729 {
730 hidden_cursor = 0;
731 want_refresh = 1;
732 }
733
734 blink_ev.start (NOW + BLINK_INTERVAL);
735 }
736#endif
737
738#if defined(POINTER_BLANK)
739 if ((Options & Opt_pointerBlank)
740 && (pointerBlankDelay > 0))
741 {
742 if (xev.type == MotionNotify
743 || xev.type == ButtonPress
744 || xev.type == ButtonRelease)
745 if (hidden_pointer)
746 pointer_unblank ();
747
748 if (xev.type == KeyPress && hidden_pointer == 0)
749 pointer_blank ();
750 }
751#endif
752
753#ifdef USE_XIM
754 if (!XFilterEvent (&xev, xev.xany.window))
755#endif
756 rxvt_process_x_event (this, &xev);
757 }
758 while (XPending (Xdisplay));
759}
760
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
770rxvt_term::x_cb (io_watcher &w, short revents)
771{
772 SET_R (this);
773 SET_LOCALE (locale);
774
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 }
915}
916
917// read the next character, currently handles UTF-8
918// will probably handle all sorts of other stuff in the future
919uint32_t
920rxvt_term::next_char ()
921{
922 while (cmdbuf_ptr < cmdbuf_endp)
923 {
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926
927 wchar_t wc;
928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
929
930 if (len == (size_t)-2)
931 return NOCHAR;
932
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
914} 942}
915 943
916/* rxvt_cmd_getc() - Return next input character */ 944/* rxvt_cmd_getc() - Return next input character */
917/* 945/*
918 * Return the next input character after first passing any keyboard input 946 * Return the next input character after first passing any keyboard input
… …
929 return c; 957 return c;
930 958
931 // incomplete sequences should occur rarely, still, a better solution 959 // incomplete sequences should occur rarely, still, a better solution
932 // would be preferred. either setjmp/longjmp or better design. 960 // would be preferred. either setjmp/longjmp or better design.
933 fcntl (R->cmd_fd, F_SETFL, 0); 961 fcntl (R->cmd_fd, F_SETFL, 0);
934 R->pty_fill (1); 962 R->pty_fill ();
935 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 963 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936 } 964 }
937 965
966#if 0
938#define TIMEOUT_USEC 5000 967#define TIMEOUT_USEC 5000
939 fd_set readfds; 968 fd_set readfds;
940 int quick_timeout, select_res; 969 int quick_timeout, select_res;
941 int want_motion_time, want_keypress_time; 970 int want_motion_time, want_keypress_time;
942 struct timeval value; 971 struct timeval value;
… …
946 975
947 for (;;) { 976 for (;;) {
948 /* loop until we can return something */ 977 /* loop until we can return something */
949 978
950 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 979 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951 rxvt_tt_write(aR_ NULL, 0); 980 R->tt_write(NULL, 0);
952
953#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
954 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
955#endif
956#if defined(CURSOR_BLINK)
957 want_keypress_time = 0;
958#endif
959#if defined(POINTER_BLANK)
960 want_motion_time = 0;
961#endif
962
963 if (XPending (R->Xdisplay))
964 {
965 R->process_x_events ();
966
967 /* in case button actions pushed chars to cmdbuf */
968 if (R->cmdbuf_ptr < R->cmdbuf_endp)
969 return *R->cmdbuf_ptr++;
970 }
971
972#if defined(CURSOR_BLINK)
973 if (want_keypress_time) {
974 (void)gettimeofday(&tp, NULL);
975 R->lastcursorchange.tv_sec = tp.tv_sec;
976 R->lastcursorchange.tv_usec = tp.tv_usec;
977 }
978#endif
979#if defined(POINTER_BLANK)
980 if (want_motion_time) {
981 if (!tp.tv_sec)
982 (void)gettimeofday(&tp, NULL);
983 R->lastmotion.tv_sec = tp.tv_sec;
984 R->lastmotion.tv_usec = tp.tv_usec;
985 }
986#endif
987
988/*
989 * the command input buffer is empty and we have no pending X events
990 */
991 quick_timeout = 0;
992 981
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 982#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (R->mouse_slip_wheel_speed) { 983 if (R->mouse_slip_wheel_speed) {
995 quick_timeout = 1; 984 quick_timeout = 1;
996 if (!R->mouse_slip_wheel_delay-- 985 if (!R->mouse_slip_wheel_delay--
… …
1026 R->want_refresh = 1; 1015 R->want_refresh = 1;
1027 } 1016 }
1028 } 1017 }
1029#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1018#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030 1019
1031 FD_ZERO(&readfds);
1032 FD_SET(R->cmd_fd, &readfds);
1033 FD_SET(R->Xfd, &readfds);
1034 value.tv_usec = TIMEOUT_USEC;
1035 value.tv_sec = 0;
1036
1037 if (!R->TermWin.mapped)
1038 quick_timeout = 0;
1039 else {
1040 quick_timeout |= R->want_refresh;
1041#ifdef TRANSPARENT 1020#ifdef TRANSPARENT
1042 quick_timeout |= R->want_full_refresh; 1021 quick_timeout |= R->want_full_refresh;
1043#endif 1022#endif
1044 }
1045
1046#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1047 {
1048 int set_quick_timeout = 0;
1049 long csdiff, psdiff;
1050
1051#define BLINK_TIME 500000L
1052 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1053# if defined(CURSOR_BLINK)
1054 if (R->Options & Opt_cursorBlink) {
1055 if (!tp.tv_sec) /* didn't get it before so get it now */
1056 (void)gettimeofday(&tp, NULL);
1057
1058 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1059 + tp.tv_usec - R->lastcursorchange.tv_usec;
1060 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1061 R->lastcursorchange.tv_sec = tp.tv_sec;
1062 R->lastcursorchange.tv_usec = tp.tv_usec;
1063 R->hidden_cursor = !R->hidden_cursor;
1064 csdiff = 0;
1065 } else
1066 csdiff = BLINK_TIME - csdiff;
1067 set_quick_timeout = 1;
1068 }
1069# endif 1023#endif
1070# if defined(POINTER_BLANK)
1071 /*
1072 * If we haven't moved the pointer for a while
1073 */
1074 if ((R->Options & Opt_pointerBlank)
1075 && (R->pointerBlankDelay > 0)
1076 && (R->hidden_pointer == 0)) {
1077 long pdelay;
1078
1079 if (!tp.tv_sec) /* didn't get it before so get it now */
1080 (void)gettimeofday(&tp, NULL);
1081 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1082 + tp.tv_usec - R->lastmotion.tv_usec;
1083 pdelay = R->pointerBlankDelay * 1000000L;
1084 if (psdiff >= pdelay)
1085 rxvt_pointer_blank(aR);
1086 else {
1087 set_quick_timeout = 1;
1088 psdiff = pdelay - psdiff;
1089 }
1090 }
1091# endif
1092 if (!quick_timeout && set_quick_timeout) {
1093 MIN_IT(csdiff, psdiff);
1094 value.tv_sec = csdiff / 1000000L;
1095 value.tv_usec = csdiff % 1000000L;
1096 quick_timeout = 1;
1097 }
1098 }
1099#endif
1100
1101 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1102 (quick_timeout ? &value : NULL))) == 0) {
1103 /* select statement timed out - we're not hard and fast scrolling */
1104 R->refresh_limit = 1;
1105 }
1106#if defined(CURSOR_BLINK)
1107 if (R->Options & Opt_cursorBlink)
1108 R->want_refresh = 1;
1109#endif
1110 }
1111} 1024}
1112 1025
1113/* EXTPROTO */
1114void 1026void
1115rxvt_pointer_unblank(pR) 1027rxvt_term::pointer_unblank ()
1116{ 1028{
1117 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118 rxvt_recolour_cursor(aR); 1030 recolour_cursor ();
1031
1119#ifdef POINTER_BLANK 1032#ifdef POINTER_BLANK
1120 R->hidden_pointer = 0; 1033 hidden_pointer = 0;
1121 if (R->pointerBlankDelay > 0) {
1122 struct timeval tp;
1123 1034
1124 (void)gettimeofday(&tp, NULL); 1035 if (Options & Opt_pointerBlank)
1125 R->lastmotion.tv_sec = tp.tv_sec; 1036 pointer_ev.start (NOW + pointerBlankDelay);
1126 R->lastmotion.tv_usec = tp.tv_usec;
1127 }
1128#endif 1037#endif
1129} 1038}
1130 1039
1131#ifdef POINTER_BLANK 1040#ifdef POINTER_BLANK
1132/* INTPROTO */
1133void 1041void
1134rxvt_pointer_blank(pR) 1042rxvt_term::pointer_blank ()
1135{ 1043{
1044 pointer_ev.stop ();
1045
1046 if (!(Options & Opt_pointerBlank))
1047 return;
1048
1136 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1049 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137 XFlush(R->Xdisplay); 1050 XFlush (Xdisplay);
1051
1138 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 ();
1139} 1062}
1140#endif 1063#endif
1141 1064
1142/* INTPROTO */ 1065/* INTPROTO */
1143void 1066void
… …
1196 fprintf(stderr, "]: <%d>, %d/%d\n", 1119 fprintf(stderr, "]: <%d>, %d/%d\n",
1197 button_number, 1120 button_number,
1198 x + 1, 1121 x + 1,
1199 y + 1); 1122 y + 1);
1200#else 1123#else
1201 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1124 R->tt_printf("\033[M%c%c%c",
1202 (32 + button_number + key_state), 1125 (32 + button_number + key_state),
1203 (32 + x + 1), 1126 (32 + x + 1),
1204 (32 + y + 1)); 1127 (32 + y + 1));
1205#endif 1128#endif
1206} 1129}
… …
1223{ 1146{
1224 int i, want_timeout; 1147 int i, want_timeout;
1225 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1226 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1227 unsigned int unused_mask; 1150 unsigned int unused_mask;
1228 struct timeval tp;
1229 1151
1230#ifdef DEBUG_X 1152#ifdef DEBUG_X
1231 const char *const eventnames[] = 1153 const char *const eventnames[] =
1232 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1233 "", 1155 "",
… …
1264 "SelectionNotify", 1186 "SelectionNotify",
1265 "ColormapNotify", 1187 "ColormapNotify",
1266 "ClientMessage", 1188 "ClientMessage",
1267 "MappingNotify" 1189 "MappingNotify"
1268 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1269 struct tm *ltt; 1195 struct tm *ltt;
1270#endif
1271
1272 /*
1273 * check if we need to get the time for any timeouts
1274 */
1275
1276 for (i = NUM_TIMEOUTS; i--; )
1277 if (R->timeout[i].tv_sec) {
1278 want_timeout = 1;
1279 break;
1280 }
1281
1282#ifndef DEBUG_X
1283 if (want_timeout)
1284#endif
1285 (void)gettimeofday(&tp, NULL); 1196 (void)gettimeofday(&tp, NULL);
1286
1287#ifdef DEBUG_X
1288 ltt = localtime(&(tp.tv_sec)); 1197 ltt = localtime(&(tp.tv_sec));
1289 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1198 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1290#endif 1199#endif
1291
1292 /* X event timeouts */
1293 if (want_timeout)
1294 for (i = NUM_TIMEOUTS; i--; ) {
1295 if (R->timeout[i].tv_sec == 0)
1296 continue;
1297 if ((tp.tv_sec < R->timeout[i].tv_sec)
1298 || (tp.tv_sec == R->timeout[i].tv_sec
1299 && tp.tv_usec < R->timeout[i].tv_usec))
1300 continue;
1301 R->timeout[i].tv_sec = 0;
1302 switch(i) {
1303 case TIMEOUT_INCR:
1304 rxvt_print_error("data loss: timeout on INCR selection paste");
1305 R->selection_wait = Sel_none;
1306 break;
1307 default:
1308 break;
1309 }
1310 }
1311 1200
1312 switch (ev->type) { 1201 switch (ev->type) {
1313 case KeyPress: 1202 case KeyPress:
1314 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1315 break; 1204 break;
… …
1339 break; 1228 break;
1340 1229
1341 case ClientMessage: 1230 case ClientMessage:
1342 if (ev->xclient.format == 32 1231 if (ev->xclient.format == 32
1343 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344 exit(EXIT_SUCCESS); 1233 R->destroy ();
1345#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1346 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1347 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348 && (ev->xclient.data.l[0] == DndFile 1237 && (ev->xclient.data.l[0] == DndFile
1349 || ev->xclient.data.l[0] == DndDir 1238 || ev->xclient.data.l[0] == DndDir
1350 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev->xclient.data.l[0] == DndLink)) {
1351 /* Get Dnd data */ 1240 /* Get Dnd data */
1352 Atom ActualType; 1241 Atom ActualType;
… …
1384 * in the GraphicsExpose parts, which means that after each refresh, 1273 * in the GraphicsExpose parts, which means that after each refresh,
1385 * we need to wait for the graphics expose or Noexpose events, 1274 * we need to wait for the graphics expose or Noexpose events,
1386 * which ought to make things real slow! 1275 * which ought to make things real slow!
1387 */ 1276 */
1388 case VisibilityNotify: 1277 case VisibilityNotify:
1389 switch (ev->xvisibility.state) { 1278 switch (ev->xvisibility.state)
1279 {
1390 case VisibilityUnobscured: 1280 case VisibilityUnobscured:
1391 R->refresh_type = FAST_REFRESH; 1281 R->refresh_type = FAST_REFRESH;
1392 break; 1282 break;
1393 case VisibilityPartiallyObscured: 1283 case VisibilityPartiallyObscured:
1394 R->refresh_type = SLOW_REFRESH; 1284 R->refresh_type = SLOW_REFRESH;
1395 break; 1285 break;
1396 default: 1286 default:
1397 R->refresh_type = NO_REFRESH; 1287 R->refresh_type = NO_REFRESH;
1398 break; 1288 break;
1399 } 1289 }
1400 break; 1290 break;
1401 1291
1402 case FocusIn: 1292 case FocusIn:
1403 if (!R->TermWin.focus) { 1293 if (!R->TermWin.focus) {
1404 R->TermWin.focus = 1; 1294 R->TermWin.focus = 1;
1405 R->want_refresh = 1; 1295 R->want_refresh = 1;
1406#ifdef USE_XIM 1296#ifdef USE_XIM
1407 if (R->Input_Context != NULL) 1297 if (R->Input_Context != NULL)
1408 XSetICFocus(R->Input_Context); 1298 XSetICFocus(R->Input_Context);
1409#endif 1299#endif
1300#ifdef CURSOR_BLINK
1301 if (R->Options & Opt_cursorBlink)
1302 R->blink_ev.start (NOW + BLINK_INTERVAL);
1303#endif
1410 } 1304 }
1411 break; 1305 break;
1412 1306
1413 case FocusOut: 1307 case FocusOut:
1414 if (R->TermWin.focus) { 1308 if (R->TermWin.focus) {
1415 R->TermWin.focus = 0; 1309 R->TermWin.focus = 0;
1416 R->want_refresh = 1; 1310 R->want_refresh = 1;
1417#ifdef USE_XIM 1311#ifdef USE_XIM
1418 if (R->Input_Context != NULL) 1312 if (R->Input_Context != NULL)
1419 XUnsetICFocus(R->Input_Context); 1313 XUnsetICFocus(R->Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (R->Options & Opt_cursorBlink)
1317 R->blink_ev.stop ();
1318 R->hidden_cursor = 0;
1420#endif 1319#endif
1421 } 1320 }
1422 break; 1321 break;
1423 1322
1424 case ConfigureNotify: 1323 case ConfigureNotify:
… …
1521 &unused_xevent)) ; 1420 &unused_xevent)) ;
1522 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1523 GraphicsExpose, 1422 GraphicsExpose,
1524 &unused_xevent)) ; 1423 &unused_xevent)) ;
1525 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev->xany.window)) {
1526 scrollbar_setIdle(); 1425 R->scrollBar.setIdle();
1527 rxvt_scrollbar_show(aR_ 0); 1426 rxvt_scrollbar_show(aR_ 0);
1528 } 1427 }
1529#ifdef MENUBAR 1428#ifdef MENUBAR
1530 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1531 rxvt_menubar_expose(aR); 1430 rxvt_menubar_expose(aR);
… …
1537 break; 1436 break;
1538 1437
1539 case MotionNotify: 1438 case MotionNotify:
1540#ifdef POINTER_BLANK 1439#ifdef POINTER_BLANK
1541 if (R->hidden_pointer) 1440 if (R->hidden_pointer)
1542 rxvt_pointer_unblank(aR); 1441 R->pointer_unblank ();
1543#endif 1442#endif
1544#if MENUBAR 1443#if MENUBAR
1545 if (isMenuBarWindow(ev->xany.window)) { 1444 if (isMenuBarWindow(ev->xany.window)) {
1546 rxvt_menubar_control(aR_ &(ev->xbutton)); 1445 rxvt_menubar_control(aR_ &(ev->xbutton));
1547 break; 1446 break;
… …
1644 */ 1543 */
1645 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1646 { 1545 {
1647#if RXVT_GRAPHICS 1546#if RXVT_GRAPHICS
1648 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1649 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress (ev->x, ev->y);
1650 else 1549 else
1651#endif 1550#endif
1652 { 1551 {
1653 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1654 if (reportmode) 1553 if (reportmode)
… …
1716/* 1615/*
1717 * Scrollbar window processing of button press 1616 * Scrollbar window processing of button press
1718 */ 1617 */
1719 if (isScrollbarWindow(ev->window)) 1618 if (isScrollbarWindow(ev->window))
1720 { 1619 {
1721 scrollbar_setIdle(); 1620 R->scrollBar.setIdle ();
1722 /* 1621 /*
1723 * Rxvt-style scrollbar: 1622 * Rxvt-style scrollbar:
1724 * move up if mouse is above slider 1623 * move up if mouse is above slider
1725 * move dn if mouse is below slider 1624 * move dn if mouse is below slider
1726 * 1625 *
… …
1738 */ 1637 */
1739 if ((R->scrollBar.style == R_SB_NEXT 1638 if ((R->scrollBar.style == R_SB_NEXT
1740 && scrollbarnext_upButton(ev->y)) 1639 && scrollbarnext_upButton(ev->y))
1741 || (R->scrollBar.style == R_SB_RXVT 1640 || (R->scrollBar.style == R_SB_RXVT
1742 && scrollbarrxvt_upButton(ev->y))) 1641 && scrollbarrxvt_upButton(ev->y)))
1743 rxvt_tt_printf(aR_ "\033[A"); 1642 R->tt_printf("\033[A");
1744 else if ((R->scrollBar.style == R_SB_NEXT 1643 else if ((R->scrollBar.style == R_SB_NEXT
1745 && scrollbarnext_dnButton(ev->y)) 1644 && scrollbarnext_dnButton(ev->y))
1746 || (R->scrollBar.style == R_SB_RXVT 1645 || (R->scrollBar.style == R_SB_RXVT
1747 && scrollbarrxvt_dnButton(ev->y))) 1646 && scrollbarrxvt_dnButton(ev->y)))
1748 rxvt_tt_printf(aR_ "\033[B"); 1647 R->tt_printf("\033[B");
1749 else 1648 else
1750 switch (ev->button) { 1649 switch (ev->button) {
1751 case Button2: 1650 case Button2:
1752 rxvt_tt_printf(aR_ "\014"); 1651 R->tt_printf("\014");
1753 break; 1652 break;
1754 case Button1: 1653 case Button1:
1755 rxvt_tt_printf(aR_ "\033[6~"); 1654 R->tt_printf("\033[6~");
1756 break; 1655 break;
1757 case Button3: 1656 case Button3:
1758 rxvt_tt_printf(aR_ "\033[5~"); 1657 R->tt_printf("\033[5~");
1759 break; 1658 break;
1760 } 1659 }
1761 } 1660 }
1762 else 1661 else
1763#endif /* NO_SCROLLBAR_REPORT */ 1662#endif /* NO_SCROLLBAR_REPORT */
… …
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1781#endif 1680#endif
1782 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1783 if (upordown < 0) 1682 if (upordown < 0)
1784 scrollbar_setUp(); 1683 R->scrollBar.setUp ();
1785 else 1684 else
1786 scrollbar_setDn(); 1685 R->scrollBar.setDn ();
1787 } 1686 }
1788 } else 1687 } else
1789 switch (ev->button) { 1688 switch (ev->button) {
1790 case Button2: 1689 case Button2:
1791 switch (R->scrollbar_align) { 1690 switch (R->scrollbar_align) {
… …
1803 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1804 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1805 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1806 scrollbar_position(ev->y) - R->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1807 scrollbar_size()); 1706 scrollbar_size());
1808 scrollbar_setMotion(); 1707 R->scrollBar.setMotion ();
1809 break; 1708 break;
1810 1709
1811 case Button1: 1710 case Button1:
1812 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1813 R->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
… …
1826 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1827# else 1726# else
1828 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1829# endif 1728# endif
1830 else 1729 else
1831 scrollbar_setMotion(); 1730 R->scrollBar.setMotion ();
1832 } else { 1731 } else {
1833 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1834 (R->TermWin.nrow 1733 (R->TermWin.nrow
1835 * scrollbar_position(ev->y) 1734 * scrollbar_position(ev->y)
1836 / scrollbar_size())); 1735 / scrollbar_size()));
… …
1858 R->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1859 if (!R->bypass_keystate) 1758 if (!R->bypass_keystate)
1860 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1861 1760
1862 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1863 scrollbar_setIdle(); 1762 R->scrollBar.setIdle ();
1864 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1865#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1866 R->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1867#endif 1766#endif
1868 } 1767 }
… …
1919 break; 1818 break;
1920#ifdef MOUSE_WHEEL 1819#ifdef MOUSE_WHEEL
1921 case Button4: 1820 case Button4:
1922 case Button5: 1821 case Button5:
1923 { 1822 {
1924 int i, v; 1823 int i;
1824 page_dirn v;
1925 1825
1926 v = (ev->button == Button4) ? UP : DN; 1826 v = (ev->button == Button4) ? UP : DN;
1927 if (ev->state & ShiftMask) 1827 if (ev->state & ShiftMask)
1928 i = 1; 1828 i = 1;
1929 else if ((R->Options & Opt_mouseWheelScrollPage)) 1829 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2104 n = 0; 2004 n = 0;
2105 if (pchanged) { 2005 if (pchanged) {
2106 for (; n < (unsigned int)i; n++) { 2006 for (; n < (unsigned int)i; n++) {
2107 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2007 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2108 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"));
2109 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2009 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2110 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2010 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2111 break; 2011 break;
2112 } 2012 }
2113 } 2013 }
2114 } 2014 }
… …
2164 return stream; 2064 return stream;
2165} 2065}
2166 2066
2167/* EXTPROTO */ 2067/* EXTPROTO */
2168int 2068int
2169rxvt_pclose_printer(FILE *stream) 2069rxvt_pclose_printer (FILE *stream)
2170{ 2070{
2171 fflush(stream); 2071 fflush (stream);
2172/* pclose() reported not to work on SunOS 4.1.3 */ 2072/* pclose() reported not to work on SunOS 4.1.3 */
2173# if defined (__sun__) /* TODO: RESOLVE THIS */ 2073# if defined (__sun__) /* TODO: RESOLVE THIS */
2174/* pclose works provided SIGCHLD handler uses waitpid */ 2074/* pclose works provided SIGCHLD handler uses waitpid */
2175 return pclose(stream); /* return fclose (stream); */ 2075 return pclose (stream); /* return fclose (stream); */
2176# else 2076# else
2177 return pclose(stream); 2077 return pclose (stream);
2178# endif 2078# endif
2179} 2079}
2180 2080
2181/* 2081/*
2182 * simulate attached vt100 printer 2082 * simulate attached vt100 printer
… …
2245rxvt_process_nonprinting(pR_ unsigned char ch) 2145rxvt_process_nonprinting(pR_ unsigned char ch)
2246{ 2146{
2247 switch (ch) { 2147 switch (ch) {
2248 case C0_ENQ: /* terminal Status */ 2148 case C0_ENQ: /* terminal Status */
2249 if (R->rs[Rs_answerbackstring]) 2149 if (R->rs[Rs_answerbackstring])
2250 rxvt_tt_write(aR_ 2150 R->tt_write(
2251 (const unsigned char *)R->rs[Rs_answerbackstring], 2151 (const unsigned char *)R->rs[Rs_answerbackstring],
2252 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2152 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253 else 2153 else
2254 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2154 R->tt_write((unsigned char *)VT100_ANS,
2255 (unsigned int)STRLEN(VT100_ANS)); 2155 (unsigned int)STRLEN(VT100_ANS));
2256 break; 2156 break;
2257 case C0_BEL: /* bell */ 2157 case C0_BEL: /* bell */
2258 rxvt_scr_bell(aR); 2158 rxvt_scr_bell(aR);
2259 break; 2159 break;
… …
2322 row = rxvt_cmd_getc(aR) - ' '; 2222 row = rxvt_cmd_getc(aR) - ' ';
2323 col = rxvt_cmd_getc(aR) - ' '; 2223 col = rxvt_cmd_getc(aR) - ' ';
2324 rxvt_scr_gotorc(aR_ row, col, 0); 2224 rxvt_scr_gotorc(aR_ row, col, 0);
2325 break; 2225 break;
2326 case 'Z': /* identify the terminal type */ 2226 case 'Z': /* identify the terminal type */
2327 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 */
2328 break; 2228 break;
2329 case '<': /* turn off VT52 mode */ 2229 case '<': /* turn off VT52 mode */
2330 PrivMode(0, PrivMode_vt52); 2230 PrivMode(0, PrivMode_vt52);
2331 break; 2231 break;
2332 case 'F': /* use special graphics character set */ 2232 case 'F': /* use special graphics character set */
… …
2439 rxvt_process_dcs_seq(aR); 2339 rxvt_process_dcs_seq(aR);
2440 break; 2340 break;
2441 2341
2442 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2342 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443 case C1_SCI: /* ESC Z */ 2343 case C1_SCI: /* ESC Z */
2444 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2344 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2345 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446 break; /* steal obsolete ESC [ c */ 2346 break; /* steal obsolete ESC [ c */
2447 2347
2448 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2348 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449 case C1_CSI: /* ESC [ */ 2349 case C1_CSI: /* ESC [ */
… …
2570 */ 2470 */
2571 if (priv) { 2471 if (priv) {
2572 switch (priv) { 2472 switch (priv) {
2573 case '>': 2473 case '>':
2574 if (ch == CSI_DA) /* secondary device attributes */ 2474 if (ch == CSI_DA) /* secondary device attributes */
2575 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2475 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576 break; 2476 break;
2577 case '?': 2477 case '?':
2578 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2479 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580 break; 2480 break;
… …
2683 2583
2684 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2685 arg[0] = -arg[0]; 2585 arg[0] = -arg[0];
2686 /* FALLTHROUGH */ 2586 /* FALLTHROUGH */
2687 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688 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);
2689 break; 2589 break;
2690 2590
2691 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2592 R->tt_write((const unsigned char *)VT100_ANS,
2693 (unsigned int)(sizeof(VT100_ANS) - 1)); 2593 (unsigned int)(sizeof(VT100_ANS) - 1));
2694 break; 2594 break;
2695 2595
2696 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697 rxvt_process_sgr_mode(aR_ nargs, arg); 2597 rxvt_process_sgr_mode(aR_ nargs, arg);
2698 break; 2598 break;
2699 2599
2700 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701 switch (arg[0]) { 2601 switch (arg[0]) {
2702 case 5: /* DSR requested */ 2602 case 5: /* DSR requested */
2703 rxvt_tt_printf(aR_ "\033[0n"); 2603 R->tt_printf("\033[0n");
2704 break; 2604 break;
2705 case 6: /* CPR requested */ 2605 case 6: /* CPR requested */
2706 rxvt_scr_report_position(aR); 2606 rxvt_scr_report_position(aR);
2707 break; 2607 break;
2708#if defined (ENABLE_DISPLAY_ANSWER) 2608#if defined (ENABLE_DISPLAY_ANSWER)
2709 case 7: /* unofficial extension */ 2609 case 7: /* unofficial extension */
2710 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2610 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711 break; 2611 break;
2712#endif 2612#endif
2713 case 8: /* unofficial extension */ 2613 case 8: /* unofficial extension */
2714 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2614 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715 break; 2615 break;
… …
2784 break; 2684 break;
2785#endif 2685#endif
2786 2686
2787 case CSI_78: /* DECREQTPARM */ 2687 case CSI_78: /* DECREQTPARM */
2788 if (arg[0] == 0 || arg[0] == 1) 2688 if (arg[0] == 0 || arg[0] == 1)
2789 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);
2790 /* FALLTHROUGH */ 2690 /* FALLTHROUGH */
2791 2691
2792 default: 2692 default:
2793 break; 2693 break;
2794 } 2694 }
… …
2848 /* 2748 /*
2849 * reports - some output format copied from XTerm 2749 * reports - some output format copied from XTerm
2850 */ 2750 */
2851 case 11: /* report window state */ 2751 case 11: /* report window state */
2852 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2752 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2753 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854 break; 2754 break;
2855 case 13: /* report window position */ 2755 case 13: /* report window position */
2856 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2756 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2757 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858 -wattr.border_width, -wattr.border_width, 2758 -wattr.border_width, -wattr.border_width,
2859 &x, &y, &wdummy); 2759 &x, &y, &wdummy);
2860 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2760 R->tt_printf("\033[3;%d;%dt", x, y);
2861 break; 2761 break;
2862 case 14: /* report window size (pixels) */ 2762 case 14: /* report window size (pixels) */
2863 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2763 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2764 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865 break; 2765 break;
2866 case 18: /* report window size (chars) */ 2766 case 18: /* report window size (chars) */
2867 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);
2868 break; 2768 break;
2869#if 0 /* XXX: currently disabled due to security concerns */ 2769#if 0 /* XXX: currently disabled due to security concerns */
2870 case 20: /* report icon label */ 2770 case 20: /* report icon label */
2871 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2771 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2772 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873 break; 2773 break;
2874 case 21: /* report window title */ 2774 case 21: /* report window title */
2875 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2775 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2776 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877 break; 2777 break;
2878#endif 2778#endif
2879 } 2779 }
2880} 2780}
2881#endif 2781#endif
… …
3424{ 3324{
3425 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3325 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426 3326
3427#ifndef RXVT_GRAPHICS 3327#ifndef RXVT_GRAPHICS
3428 if (cmd == 'Q') { /* query graphics */ 3328 if (cmd == 'Q') { /* query graphics */
3429 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3329 R->tt_printf("\033G0\n"); /* no graphics */
3430 return; 3330 return;
3431 } 3331 }
3432/* swallow other graphics sequences until terminating ':' */ 3332/* swallow other graphics sequences until terminating ':' */
3433 do 3333 do
3434 ch = rxvt_cmd_getc(aR); 3334 ch = rxvt_cmd_getc(aR);
… …
3437 unsigned int nargs; 3337 unsigned int nargs;
3438 int args[NGRX_PTS]; 3338 int args[NGRX_PTS];
3439 unsigned char *text = NULL; 3339 unsigned char *text = NULL;
3440 3340
3441 if (cmd == 'Q') { /* query graphics */ 3341 if (cmd == 'Q') { /* query graphics */
3442 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3342 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443 return; 3343 return;
3444 } 3344 }
3445 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3345 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446 int neg; 3346 int neg;
3447 3347
… …
3462 } 3362 }
3463 3363
3464 if ((cmd == 'T') && (nargs >= 5)) { 3364 if ((cmd == 'T') && (nargs >= 5)) {
3465 int i, len = args[4]; 3365 int i, len = args[4];
3466 3366
3467 text = rxvt_malloc((len + 1) * sizeof(char)); 3367 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3468 3368
3469 if (text != NULL) { 3369 if (text != NULL) {
3470 for (i = 0; i < len; i++) 3370 for (i = 0; i < len; i++)
3471 text[i] = rxvt_cmd_getc(aR); 3371 text[i] = rxvt_cmd_getc(aR);
3472 text[len] = '\0'; 3372 text[len] = '\0';
… …
3481 3381
3482/* 3382/*
3483 * Send printf() formatted output to the command. 3383 * Send printf() formatted output to the command.
3484 * Only use for small amounts of data. 3384 * Only use for small amounts of data.
3485 */ 3385 */
3486/* EXTPROTO */
3487void 3386void
3488rxvt_tt_printf(pR_ const char *fmt,...) 3387rxvt_term::tt_printf (const char *fmt,...)
3489{ 3388{
3490 va_list arg_ptr; 3389 va_list arg_ptr;
3491 unsigned char buf[256]; 3390 unsigned char buf[256];
3492 3391
3493 va_start(arg_ptr, fmt); 3392 va_start (arg_ptr, fmt);
3494 vsprintf((char *)buf, fmt, arg_ptr); 3393 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495 va_end(arg_ptr); 3394 va_end (arg_ptr);
3496 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3395 tt_write (buf, STRLEN (buf));
3497} 3396}
3498 3397
3499/* ---------------------------------------------------------------------- */ 3398/* ---------------------------------------------------------------------- */
3500/* Addresses pasting large amounts of data and rxvt hang
3501 * code pinched from xterm (v_write()) and applied originally to
3502 * rxvt-2.18 - Hops
3503 * Write data to the pty as typed by the user, pasted with the mouse, 3399/* Write data to the pty as typed by the user, pasted with the mouse,
3504 * or generated by us in response to a query ESC sequence. 3400 * or generated by us in response to a query ESC sequence.
3505 */ 3401 */
3506/* EXTPROTO */
3507void 3402void
3508rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3403rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 3404{
3510#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3405 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3511 int riten;
3512 unsigned int p;
3513 unsigned char *v_buffer, /* start of physical buffer */
3514 *v_bufstr, /* start of current buffer pending */
3515 *v_bufptr, /* end of current buffer pending */
3516 *v_bufend; /* end of physical buffer */
3517 3406
3518 if (R->v_bufstr == NULL && len > 0) { 3407 if (len)
3519 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3521 v_bufend = v_buffer + p;
3522 } else {
3523 v_buffer = R->v_buffer;
3524 v_bufstr = R->v_bufstr;
3525 v_bufptr = R->v_bufptr;
3526 v_bufend = R->v_bufend;
3527 } 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;
3528 3414
3529 /* 3415 data += written;
3530 * Append to the block we already have. Always doing this simplifies the 3416 len -= written;
3531 * code, and isn't too bad, either. If this is a short block, it isn't 3417 }
3532 * too expensive, and if this is a long block, we won't be able to write 3418
3533 * it all anyway. 3419
3534 */ 3420 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535 if (len > 0) { 3421
3536 if (v_bufend < v_bufptr + len) { /* run out of room */ 3422 memcpy (v_buffer + v_buflen, data, len);
3537 if (v_bufstr != v_buffer) { 3423 v_buflen += len;
3538 /* there is unused space, move everything down */
3539 MEMMOVE(v_buffer, v_bufstr,
3540 (unsigned int)(v_bufptr - v_bufstr));
3541 v_bufptr -= v_bufstr - v_buffer;
3542 v_bufstr = v_buffer;
3543 } 3424 }
3544 if (v_bufend < v_bufptr + len) {
3545 /* still won't fit: get more space */
3546 /* use most basic realloc because an error is not fatal. */
3547 unsigned int size = v_bufptr - v_buffer;
3548 unsigned int reallocto;
3549 3425
3550 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3426 for (;;)
3551 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3427 {
3552 /* save across realloc */ 3428 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553 if (v_buffer) { 3429
3554 v_bufstr = v_buffer; 3430 if (written > 0)
3555 v_bufptr = v_buffer + size; 3431 {
3556 v_bufend = v_buffer + reallocto; 3432 v_buflen -= written;
3557 } else { /* no memory: ignore entire write request */ 3433
3558 rxvt_print_error("data loss: cannot allocate buffer space"); 3434 if (v_buflen == 0)
3559 v_buffer = v_bufstr; /* restore clobbered pointer */ 3435 {
3560 } 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 }
3561 } 3454 }
3562 }
3563 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3564 MEMCPY(v_bufptr, d, len);
3565 v_bufptr += len;
3566 }
3567 }
3568
3569 /*
3570 * Write out as much of the buffer as we can.
3571 * Be careful not to overflow the pty's input silo.
3572 * We are conservative here and only write a small amount at a time.
3573 *
3574 * If we can't push all the data into the pty yet, we expect write
3575 * to return a non-negative number less than the length requested
3576 * (if some data written) or -1 and set errno to EAGAIN,
3577 * EWOULDBLOCK, or EINTR (if no data written).
3578 *
3579 * (Not all systems do this, sigh, so the code is actually
3580 * a little more forgiving.)
3581 */
3582 if ((p = v_bufptr - v_bufstr) > 0) {
3583 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3584 if (riten < 0)
3585 riten = 0;
3586 v_bufstr += riten;
3587 if (v_bufstr >= v_bufptr) /* we wrote it all */
3588 v_bufstr = v_bufptr = v_buffer;
3589 }
3590 /*
3591 * If we have lots of unused memory allocated, return it
3592 */
3593 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3594 /* save pointers across realloc */
3595 unsigned int start = v_bufstr - v_buffer;
3596 unsigned int size = v_bufptr - v_buffer;
3597 unsigned int reallocto;
3598
3599 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3600 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3601 if (v_buffer) {
3602 v_bufstr = v_buffer + start;
3603 v_bufptr = v_buffer + size;
3604 v_bufend = v_buffer + reallocto;
3605 } else {
3606 /* should we print a warning if couldn't return memory? */
3607 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3608 }
3609 }
3610 R->v_buffer = v_buffer;
3611 R->v_bufstr = v_bufstr;
3612 R->v_bufptr = v_bufptr;
3613 R->v_bufend = v_bufend;
3614} 3455}
3456
3615/*----------------------- end-of-file (C source) -----------------------*/ 3457/*----------------------- end-of-file (C source) -----------------------*/
3616 3458

Diff Legend

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