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.9 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.28 by pcg, Fri Jan 16 22:11:09 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.9 2003/11/27 10:12:10 pcg Exp $ 4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 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() */
… …
654 R->cmdbuf_ptr = cmdbuf_ptr; 671 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->cmdbuf_endp = cmdbuf_endp; 672 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
676
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}
659 710
660void 711void
661rxvt_term::process_x_events () 712rxvt_term::process_x_events ()
662{ 713{
663 do 714 do
… …
701 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
702 } 753 }
703 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
704} 755}
705 756
757#ifdef CURSOR_BLINK
706void 758void
707rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
708{ 760{
709 SET_R (this);
710
711 w.at += BLINK_INTERVAL;
712 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
713 want_refresh = 1; 762 want_refresh = 1;
714 flush (); 763
764 w.start (w.at + BLINK_INTERVAL);
715} 765}
766#endif
716 767
717void 768void
718rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
719{ 770{
720 SET_R (this); 771 SET_R (this);
772 SET_LOCALE (locale);
721 773
722 process_x_events (); 774 process_x_events ();
723
724 flush ();
725}
726
727// read the next character, currently handles UTF-8
728// will probably handle all sorts of other stuff in the future
729uint32_t
730rxvt_term::next_char ()
731{
732 struct mbstate &s = mbstate;
733
734 while (cmdbuf_ptr < cmdbuf_endp)
735 {
736 uint8_t ch = *cmdbuf_ptr;
737
738 if (s.cnt)
739 {
740 if ((ch & 0xc0) == 0x80)
741 {
742 cmdbuf_ptr++;
743
744 /* continuation */
745 s.reg = (s.reg << 6) | (ch & 0x7f);
746
747 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
748 return s.reg;
749
750 continue;
751 }
752 else
753 {
754 s.cnt = 0;
755 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
756 }
757 }
758
759 if ((ch & 0xc0) == 0xc0)
760 {
761 cmdbuf_ptr++;
762
763 /* first byte */
764 s.orig = ch; /* for broken encodings */
765 s.reg = ch;
766 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
767 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
768 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
769 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
770 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
771 }
772 else
773 {
774 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
775 return ch;
776 }
777 }
778
779 return NOCHAR;
780} 775}
781 776
782bool 777bool
783rxvt_term::pty_fill () 778rxvt_term::pty_fill ()
784{ 779{
… …
793 if (n > 0) 788 if (n > 0)
794 { 789 {
795 cmdbuf_endp += n; 790 cmdbuf_endp += n;
796 return true; 791 return true;
797 } 792 }
798 else if (n < 0 && errno == EAGAIN) 793 else if (n < 0 && errno != EAGAIN)
794 destroy ();
795
799 return false; 796 return false;
800
801 destroy ();
802} 797}
803 798
804void 799void
805rxvt_term::pty_cb (io_watcher &w, short revents) 800rxvt_term::pty_cb (io_watcher &w, short revents)
806{ 801{
807 SET_R (this); 802 SET_R (this);
803 SET_LOCALE (locale);
808 804
809 // loop, but don't allow a single term to monopolize us 805 if (revents & EVENT_WRITE)
810 // the number of loops is fully arbitrary, and thus wrong 806 tt_write (0, 0);
811 for (int i = 7; i-- && pty_fill (); ) 807 else if (revents & EVENT_READ)
812 { 808 {
813 //TODO: 809 bool flag = true;
814 /* once we know the shell is running, send the screen size. Again! */
815 //ch = rxvt_cmd_getc(aR); /* wait for something */
816 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
817 810
818 uint32_t ch = NOCHAR; 811 // loop, but don't allow a single term to monopolize us
819 812 // the number of loops is fully arbitrary, and thus wrong
820 for (;;) 813 while (flag && pty_fill ())
821 { 814 {
822 if (ch == NOCHAR) 815 if (!seen_input)
823 ch = next_char ();
824
825 if (ch == NOCHAR) // TODO: improve
826 break;
827
828 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
829 { 816 {
830 /* Read a text string from the input buffer */ 817 seen_input = 1;
831 uint32_t buf[BUFSIZ]; 818 /* once we know the shell is running, send the screen size. Again! */
832 bool refreshnow = false; 819 tt_winch ();
833 int nlines = 0; 820 }
834 uint32_t *str = buf;
835 821
836 *str++ = ch; 822 uint32_t ch = NOCHAR;
837 823
838 for (;;) 824 for (;;)
825 {
826 if (ch == NOCHAR)
827 ch = next_char ();
828
829 if (ch == NOCHAR) // TODO: improve
830 break;
831
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
839 { 833 {
840 ch = next_char (); 834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
841 839
842 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 840 *str++ = ch;
841
843 break; 842 for (;;)
844 else
845 { 843 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
846 *str++ = ch; 848 else
847
848 if (ch == '\n')
849 { 849 {
850 nlines++; 850 *str++ = ch;
851 refresh_count++;
852 851
853 if (!(Options & Opt_jumpScroll) 852 if (ch == '\n')
854 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
855 { 853 {
854 nlines++;
855 refresh_count++;
856
857 if (!(Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
856 refreshnow = true; 860 refreshnow = true;
861 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865 }
866
867 if (str >= buf + BUFSIZ)
868 {
857 ch = NOCHAR; 869 ch = NOCHAR;
858 break; 870 break;
859 } 871 }
860 } 872 }
861
862 if (str >= buf + BUFSIZ)
863 {
864 ch = NOCHAR;
865 break;
866 }
867 } 873 }
874
875 rxvt_scr_add_lines (this, buf, nlines, str - buf);
876
877 /*
878 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which
881 * is incremented here because we must be doing flat-out scrolling.
882 *
883 * refreshing should be correct for small scrolls, because of the
884 * time-out
885 */
886 if (refreshnow)
887 {
888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
889 refresh_limit++;
890
891 scr_refresh (refresh_type);
892 }
893
868 } 894 }
869
870 rxvt_scr_add_lines (this, buf, nlines, str - buf);
871
872 /* 895 else
873 * If there have been a lot of new lines, then update the screen
874 * What the heck I'll cheat and only refresh less than every page-full.
875 * the number of pages between refreshes is refresh_limit, which
876 * is incremented here because we must be doing flat-out scrolling.
877 *
878 * refreshing should be correct for small scrolls, because of the
879 * time-out
880 */
881 if (refreshnow)
882 { 896 {
883 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 897 switch (ch)
884 refresh_limit++; 898 {
899 default:
900 rxvt_process_nonprinting (this, ch);
901 break;
902 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this);
904 break;
905 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */
907 }
885 908
886 rxvt_scr_refresh (this, refresh_type); 909 ch = NOCHAR;
887 } 910 }
888
889 }
890 else
891 {
892 switch (ch)
893 {
894 default:
895 rxvt_process_nonprinting (this, ch);
896 break;
897 case C0_ESC: /* escape char */
898 rxvt_process_escape_seq (this);
899 break;
900 /*case 0x9b: */ /* CSI */
901 /* rxvt_process_csi_seq (this); */
902 }
903
904 ch = NOCHAR;
905 } 911 }
906 } 912 }
907 } 913 }
908
909 flush ();
910} 914}
911 915
912void 916// read the next character, currently handles UTF-8
913rxvt_term::flush () 917// will probably handle all sorts of other stuff in the future
918uint32_t
919rxvt_term::next_char ()
914{ 920{
915#ifdef TRANSPARENT 921 while (cmdbuf_ptr < cmdbuf_endp)
916 if (want_full_refresh)
917 { 922 {
918 want_full_refresh = 0; 923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
919 rxvt_scr_clear (this); 924 return *cmdbuf_ptr++;
920 rxvt_scr_touch (this, False);
921 want_refresh = 1;
922 }
923#endif
924 925
925 if (want_refresh) 926 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928
929 if (len == (size_t)-2)
930 return NOCHAR;
931
932 if (len == (size_t)-1)
933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934
935 // assume wchar == unicode
936 cmdbuf_ptr += len;
937 return wc;
926 { 938 }
927 rxvt_scr_refresh (this, refresh_type);
928 rxvt_scrollbar_show (this, 1);
929#ifdef USE_XIM
930 rxvt_IMSendSpot (this);
931#endif
932 }
933 939
934 if (XPending (Xdisplay)) process_x_events (); 940 return NOCHAR;
935 XFlush (Xdisplay);
936 if (XPending (Xdisplay)) process_x_events ();
937} 941}
938 942
939/* rxvt_cmd_getc() - Return next input character */ 943/* rxvt_cmd_getc() - Return next input character */
940/* 944/*
941 * Return the next input character after first passing any keyboard input 945 * Return the next input character after first passing any keyboard input
… …
970 974
971 for (;;) { 975 for (;;) {
972 /* loop until we can return something */ 976 /* loop until we can return something */
973 977
974 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
975 rxvt_tt_write(aR_ NULL, 0); 979 R->tt_write(NULL, 0);
976 980
977#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
978 if (R->mouse_slip_wheel_speed) { 982 if (R->mouse_slip_wheel_speed) {
979 quick_timeout = 1; 983 quick_timeout = 1;
980 if (!R->mouse_slip_wheel_delay-- 984 if (!R->mouse_slip_wheel_delay--
… …
990 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
991 quick_timeout = 1; 995 quick_timeout = 1;
992 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
993 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
994 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
995 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
996 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
997 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
998 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
999 R->want_refresh = 1; 1003 R->want_refresh = 1;
1000 } 1004 }
… …
1020 1024
1021void 1025void
1022rxvt_term::pointer_unblank () 1026rxvt_term::pointer_unblank ()
1023{ 1027{
1024 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1025 rxvt_recolour_cursor (this); 1029 recolour_cursor ();
1026 1030
1027#ifdef POINTER_BLANK 1031#ifdef POINTER_BLANK
1028 hidden_pointer = 0; 1032 hidden_pointer = 0;
1029 1033
1030 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
… …
1034 1038
1035#ifdef POINTER_BLANK 1039#ifdef POINTER_BLANK
1036void 1040void
1037rxvt_term::pointer_blank () 1041rxvt_term::pointer_blank ()
1038{ 1042{
1039 pointer_ev.stop ();
1040
1041 if (!(Options & Opt_pointerBlank)) 1043 if (!(Options & Opt_pointerBlank))
1042 return; 1044 return;
1043 1045
1044 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1045 XFlush (Xdisplay); 1047 XFlush (Xdisplay);
… …
1049 1051
1050void 1052void
1051rxvt_term::pointer_cb (time_watcher &w) 1053rxvt_term::pointer_cb (time_watcher &w)
1052{ 1054{
1053 SET_R (this); 1055 SET_R (this);
1056 SET_LOCALE (locale);
1054 1057
1055 pointer_blank (); 1058 pointer_blank ();
1056} 1059}
1057#endif 1060#endif
1058 1061
… …
1063 int button_number, key_state = 0; 1066 int button_number, key_state = 0;
1064 int x, y; 1067 int x, y;
1065 1068
1066 x = ev->x; 1069 x = ev->x;
1067 y = ev->y; 1070 y = ev->y;
1068 rxvt_pixel_position(aR_ &x, &y); 1071 R->pixel_position (&x, &y);
1069 1072
1070 if (R->MEvent.button == AnyButton) { 1073 if (R->MEvent.button == AnyButton) {
1071 button_number = 3; 1074 button_number = 3;
1072 } else { 1075 } else {
1073 button_number = R->MEvent.button - Button1; 1076 button_number = R->MEvent.button - Button1;
… …
1113 fprintf(stderr, "]: <%d>, %d/%d\n", 1116 fprintf(stderr, "]: <%d>, %d/%d\n",
1114 button_number, 1117 button_number,
1115 x + 1, 1118 x + 1,
1116 y + 1); 1119 y + 1);
1117#else 1120#else
1118 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1121 R->tt_printf("\033[M%c%c%c",
1119 (32 + button_number + key_state), 1122 (32 + button_number + key_state),
1120 (32 + x + 1), 1123 (32 + x + 1),
1121 (32 + y + 1)); 1124 (32 + y + 1));
1122#endif 1125#endif
1123} 1126}
… …
1140{ 1143{
1141 int i, want_timeout; 1144 int i, want_timeout;
1142 Window unused_root, unused_child; 1145 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1146 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1147 unsigned int unused_mask;
1145 struct timeval tp;
1146 1148
1147#ifdef DEBUG_X 1149#ifdef DEBUG_X
1148 const char *const eventnames[] = 1150 const char *const eventnames[] =
1149 { /* mason - this matches my system */ 1151 { /* mason - this matches my system */
1150 "", 1152 "",
… …
1181 "SelectionNotify", 1183 "SelectionNotify",
1182 "ColormapNotify", 1184 "ColormapNotify",
1183 "ClientMessage", 1185 "ClientMessage",
1184 "MappingNotify" 1186 "MappingNotify"
1185 }; 1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1186 struct tm *ltt; 1192 struct tm *ltt;
1187#endif
1188
1189 /*
1190 * check if we need to get the time for any timeouts
1191 */
1192
1193 for (i = NUM_TIMEOUTS; i--; )
1194 if (R->timeout[i].tv_sec) {
1195 want_timeout = 1;
1196 break;
1197 }
1198
1199#ifndef DEBUG_X
1200 if (want_timeout)
1201#endif
1202 (void)gettimeofday(&tp, NULL); 1193 (void)gettimeofday(&tp, NULL);
1203
1204#ifdef DEBUG_X
1205 ltt = localtime(&(tp.tv_sec)); 1194 ltt = localtime(&(tp.tv_sec));
1206 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)); 1195 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));
1207#endif 1196#endif
1208
1209 /* X event timeouts */
1210 if (want_timeout)
1211 for (i = NUM_TIMEOUTS; i--; ) {
1212 if (R->timeout[i].tv_sec == 0)
1213 continue;
1214 if ((tp.tv_sec < R->timeout[i].tv_sec)
1215 || (tp.tv_sec == R->timeout[i].tv_sec
1216 && tp.tv_usec < R->timeout[i].tv_usec))
1217 continue;
1218 R->timeout[i].tv_sec = 0;
1219 switch(i) {
1220 case TIMEOUT_INCR:
1221 rxvt_print_error("data loss: timeout on INCR selection paste");
1222 R->selection_wait = Sel_none;
1223 break;
1224 default:
1225 break;
1226 }
1227 }
1228 1197
1229 switch (ev->type) { 1198 switch (ev->type) {
1230 case KeyPress: 1199 case KeyPress:
1231 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1232 break; 1201 break;
… …
1358 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1359 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1360 ConfigureNotify, ev)); 1329 ConfigureNotify, ev));
1361 if (R->szHint.width != width || R->szHint.height != height) { 1330 if (R->szHint.width != width || R->szHint.height != height) {
1362 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1363 rxvt_resize_all_windows(aR_ (unsigned int)width, 1332 R->resize_all_windows (width, height, 1);
1364 (unsigned int)height, 1);
1365 } 1333 }
1366#ifdef DEBUG_SIZE 1334#ifdef DEBUG_SIZE
1367 else { 1335 else {
1368 D_SIZE((stderr, "Size: Not resizing")); 1336 D_SIZE((stderr, "Size: Not resizing"));
1369 } 1337 }
… …
1428 1396
1429 case GraphicsExpose: 1397 case GraphicsExpose:
1430 case Expose: 1398 case Expose:
1431 if (ev->xany.window == R->TermWin.vt) { 1399 if (ev->xany.window == R->TermWin.vt) {
1432#ifdef NO_SLOW_LINK_SUPPORT 1400#ifdef NO_SLOW_LINK_SUPPORT
1433 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1434 ev->xexpose.width, ev->xexpose.height, False); 1402 ev->xexpose.width, ev->xexpose.height, False);
1435#else 1403#else
1436 // don't understand this, so commented it out 1404 // don't understand this, so commented it out
1437 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1438 ev->xexpose.width, ev->xexpose.height, False); 1406 ev->xexpose.width, ev->xexpose.height, False);
1439 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1440 // ev->xexpose.width, R->TermWin.height, False); 1408 // ev->xexpose.width, R->TermWin.height, False);
1441#endif 1409#endif
1442 R->want_refresh = 1; 1410 R->want_refresh = 1;
1443 } else { 1411 } else {
… …
1448 &unused_xevent)) ; 1416 &unused_xevent)) ;
1449 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1450 GraphicsExpose, 1418 GraphicsExpose,
1451 &unused_xevent)) ; 1419 &unused_xevent)) ;
1452 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow(ev->xany.window)) {
1453 scrollbar_setIdle(); 1421 R->scrollBar.setIdle();
1454 rxvt_scrollbar_show(aR_ 0); 1422 rxvt_scrollbar_show(aR_ 0);
1455 } 1423 }
1456#ifdef MENUBAR 1424#ifdef MENUBAR
1457 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1458 rxvt_menubar_expose(aR); 1426 rxvt_menubar_expose(aR);
… …
1488 &unused_mask); 1456 &unused_mask);
1489#ifdef MOUSE_THRESHOLD 1457#ifdef MOUSE_THRESHOLD
1490 /* deal with a `jumpy' mouse */ 1458 /* deal with a `jumpy' mouse */
1491 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1492#endif 1460#endif
1493 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1494 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1462 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1495#ifdef SELECTION_SCROLLING 1463#ifdef SELECTION_SCROLLING
1496 if (ev->xbutton.y<R->TermWin.int_bwidth || 1464 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1497 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1498 int dist; 1466 int dist;
… …
1547 &unused_root_x, &unused_root_y, 1515 &unused_root_x, &unused_root_y,
1548 &(ev->xbutton.x), &(ev->xbutton.y), 1516 &(ev->xbutton.x), &(ev->xbutton.y),
1549 &unused_mask); 1517 &unused_mask);
1550 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1551 scrollbar_size()); 1519 scrollbar_size());
1552 rxvt_scr_refresh(aR_ R->refresh_type); 1520 R->scr_refresh (R->refresh_type);
1553 R->refresh_limit = 0; 1521 R->refresh_limit = 0;
1554 rxvt_scrollbar_show(aR_ 1); 1522 rxvt_scrollbar_show(aR_ 1);
1555 } 1523 }
1556 break; 1524 break;
1557 } 1525 }
… …
1559 1527
1560/* INTPROTO */ 1528/* INTPROTO */
1561void 1529void
1562rxvt_button_press(pR_ XButtonEvent *ev) 1530rxvt_button_press(pR_ XButtonEvent *ev)
1563{ 1531{
1564 int reportmode = 0, clickintime; 1532 int reportmode = 0, clickintime;
1565 1533
1566 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1567 if (!R->bypass_keystate) 1535 if (!R->bypass_keystate)
1568 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1569/* 1537/*
… …
1571 */ 1539 */
1572 if (ev->window == R->TermWin.vt) 1540 if (ev->window == R->TermWin.vt)
1573 { 1541 {
1574#if RXVT_GRAPHICS 1542#if RXVT_GRAPHICS
1575 if (ev->subwindow != None) 1543 if (ev->subwindow != None)
1576 rxvt_Gr_ButtonPress(ev->x, ev->y); 1544 rxvt_Gr_ButtonPress (ev->x, ev->y);
1577 else 1545 else
1578#endif 1546#endif
1579 { 1547 {
1580 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1581 if (reportmode) 1549 if (reportmode)
… …
1616 if (ev->button != R->MEvent.button) 1584 if (ev->button != R->MEvent.button)
1617 R->MEvent.clicks = 0; 1585 R->MEvent.clicks = 0;
1618 switch (ev->button) 1586 switch (ev->button)
1619 { 1587 {
1620 case Button1: 1588 case Button1:
1589 /* allow shift+left click to extend selection */
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1591 {
1621 if (R->MEvent.button == Button1 && clickintime) 1592 if (R->MEvent.button == Button1 && clickintime)
1593 R->selection_rotate (ev->x, ev->y);
1622 R->MEvent.clicks++; 1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 }
1623 else 1597 else
1598 {
1599 if (R->MEvent.button == Button1 && clickintime)
1600 R->MEvent.clicks++;
1601 else
1624 R->MEvent.clicks = 1; 1602 R->MEvent.clicks = 1;
1603
1625 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 }
1606
1626 R->MEvent.button = Button1; 1607 R->MEvent.button = Button1;
1627 break; 1608 break;
1628 1609
1629 case Button3: 1610 case Button3:
1630 if (R->MEvent.button == Button3 && clickintime) 1611 if (R->MEvent.button == Button3 && clickintime)
1631 rxvt_selection_rotate(aR_ ev->x, ev->y); 1612 R->selection_rotate (ev->x, ev->y);
1632 else 1613 else
1633 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1614 R->selection_extend (ev->x, ev->y, 1);
1634 R->MEvent.button = Button3; 1615 R->MEvent.button = Button3;
1635 break; 1616 break;
1636 } 1617 }
1637 } 1618 }
1638 R->MEvent.time = ev->time; 1619 R->MEvent.time = ev->time;
… …
1643/* 1624/*
1644 * Scrollbar window processing of button press 1625 * Scrollbar window processing of button press
1645 */ 1626 */
1646 if (isScrollbarWindow(ev->window)) 1627 if (isScrollbarWindow(ev->window))
1647 { 1628 {
1648 scrollbar_setIdle(); 1629 R->scrollBar.setIdle ();
1649 /* 1630 /*
1650 * Rxvt-style scrollbar: 1631 * Rxvt-style scrollbar:
1651 * move up if mouse is above slider 1632 * move up if mouse is above slider
1652 * move dn if mouse is below slider 1633 * move dn if mouse is below slider
1653 * 1634 *
… …
1665 */ 1646 */
1666 if ((R->scrollBar.style == R_SB_NEXT 1647 if ((R->scrollBar.style == R_SB_NEXT
1667 && scrollbarnext_upButton(ev->y)) 1648 && scrollbarnext_upButton(ev->y))
1668 || (R->scrollBar.style == R_SB_RXVT 1649 || (R->scrollBar.style == R_SB_RXVT
1669 && scrollbarrxvt_upButton(ev->y))) 1650 && scrollbarrxvt_upButton(ev->y)))
1670 rxvt_tt_printf(aR_ "\033[A"); 1651 R->tt_printf("\033[A");
1671 else if ((R->scrollBar.style == R_SB_NEXT 1652 else if ((R->scrollBar.style == R_SB_NEXT
1672 && scrollbarnext_dnButton(ev->y)) 1653 && scrollbarnext_dnButton(ev->y))
1673 || (R->scrollBar.style == R_SB_RXVT 1654 || (R->scrollBar.style == R_SB_RXVT
1674 && scrollbarrxvt_dnButton(ev->y))) 1655 && scrollbarrxvt_dnButton(ev->y)))
1675 rxvt_tt_printf(aR_ "\033[B"); 1656 R->tt_printf("\033[B");
1676 else 1657 else
1677 switch (ev->button) { 1658 switch (ev->button) {
1678 case Button2: 1659 case Button2:
1679 rxvt_tt_printf(aR_ "\014"); 1660 R->tt_printf("\014");
1680 break; 1661 break;
1681 case Button1: 1662 case Button1:
1682 rxvt_tt_printf(aR_ "\033[6~"); 1663 R->tt_printf("\033[6~");
1683 break; 1664 break;
1684 case Button3: 1665 case Button3:
1685 rxvt_tt_printf(aR_ "\033[5~"); 1666 R->tt_printf("\033[5~");
1686 break; 1667 break;
1687 } 1668 }
1688 } 1669 }
1689 else 1670 else
1690#endif /* NO_SCROLLBAR_REPORT */ 1671#endif /* NO_SCROLLBAR_REPORT */
… …
1706#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1707 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1708#endif 1689#endif
1709 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1710 if (upordown < 0) 1691 if (upordown < 0)
1711 scrollbar_setUp(); 1692 R->scrollBar.setUp ();
1712 else 1693 else
1713 scrollbar_setDn(); 1694 R->scrollBar.setDn ();
1714 } 1695 }
1715 } else 1696 } else
1716 switch (ev->button) { 1697 switch (ev->button) {
1717 case Button2: 1698 case Button2:
1718 switch (R->scrollbar_align) { 1699 switch (R->scrollbar_align) {
… …
1730 || scrollbar_above_slider(ev->y) 1711 || scrollbar_above_slider(ev->y)
1731 || scrollbar_below_slider(ev->y)) 1712 || scrollbar_below_slider(ev->y))
1732 rxvt_scr_move_to(aR_ 1713 rxvt_scr_move_to(aR_
1733 scrollbar_position(ev->y) - R->csrO, 1714 scrollbar_position(ev->y) - R->csrO,
1734 scrollbar_size()); 1715 scrollbar_size());
1735 scrollbar_setMotion(); 1716 R->scrollBar.setMotion ();
1736 break; 1717 break;
1737 1718
1738 case Button1: 1719 case Button1:
1739 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1740 R->csrO = ev->y - R->scrollBar.top; 1721 R->csrO = ev->y - R->scrollBar.top;
… …
1753 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1754# else 1735# else
1755 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1756# endif 1737# endif
1757 else 1738 else
1758 scrollbar_setMotion(); 1739 R->scrollBar.setMotion ();
1759 } else { 1740 } else {
1760 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1761 (R->TermWin.nrow 1742 (R->TermWin.nrow
1762 * scrollbar_position(ev->y) 1743 * scrollbar_position(ev->y)
1763 / scrollbar_size())); 1744 / scrollbar_size()));
… …
1785 R->csrO = 0; /* reset csr Offset */ 1766 R->csrO = 0; /* reset csr Offset */
1786 if (!R->bypass_keystate) 1767 if (!R->bypass_keystate)
1787 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1788 1769
1789 if (scrollbar_isUpDn()) { 1770 if (scrollbar_isUpDn()) {
1790 scrollbar_setIdle(); 1771 R->scrollBar.setIdle ();
1791 rxvt_scrollbar_show(aR_ 0); 1772 rxvt_scrollbar_show(aR_ 0);
1792#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1793 R->refresh_type &= ~SMOOTH_REFRESH; 1774 R->refresh_type &= ~SMOOTH_REFRESH;
1794#endif 1775#endif
1795 } 1776 }
… …
1832 * when overriding mouse reporting 1813 * when overriding mouse reporting
1833 */ 1814 */
1834 if (R->PrivateModes & PrivMode_mouse_report 1815 if (R->PrivateModes & PrivMode_mouse_report
1835 && R->bypass_keystate 1816 && R->bypass_keystate
1836 && ev->button == Button1 && R->MEvent.clicks <= 1) 1817 && ev->button == Button1 && R->MEvent.clicks <= 1)
1837 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1818 R->selection_extend (ev->x, ev->y, 0);
1838 1819
1839 switch (ev->button) { 1820 switch (ev->button) {
1840 case Button1: 1821 case Button1:
1841 case Button3: 1822 case Button3:
1842 rxvt_selection_make(aR_ ev->time); 1823 rxvt_selection_make(aR_ ev->time);
… …
1846 break; 1827 break;
1847#ifdef MOUSE_WHEEL 1828#ifdef MOUSE_WHEEL
1848 case Button4: 1829 case Button4:
1849 case Button5: 1830 case Button5:
1850 { 1831 {
1851 int i, v; 1832 int i;
1833 page_dirn v;
1852 1834
1853 v = (ev->button == Button4) ? UP : DN; 1835 v = (ev->button == Button4) ? UP : DN;
1854 if (ev->state & ShiftMask) 1836 if (ev->state & ShiftMask)
1855 i = 1; 1837 i = 1;
1856 else if ((R->Options & Opt_mouseWheelScrollPage)) 1838 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1864 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1865 } 1847 }
1866# endif 1848# endif
1867# ifdef JUMP_MOUSE_WHEEL 1849# ifdef JUMP_MOUSE_WHEEL
1868 rxvt_scr_page(aR_ v, i); 1850 rxvt_scr_page(aR_ v, i);
1869 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1851 R->scr_refresh (SMOOTH_REFRESH);
1870 rxvt_scrollbar_show(aR_ 1); 1852 rxvt_scrollbar_show(aR_ 1);
1871# else 1853# else
1872 for (; i--;) 1854 while (i--)
1873 { 1855 {
1874 rxvt_scr_page(aR_ v, 1); 1856 rxvt_scr_page(aR_ v, 1);
1875 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1857 R->scr_refresh (SMOOTH_REFRESH);
1876 rxvt_scrollbar_show(aR_ 1); 1858 rxvt_scrollbar_show(aR_ 1);
1877 } 1859 }
1878# endif 1860# endif
1879 } 1861 }
1880 break; 1862 break;
… …
2031 n = 0; 2013 n = 0;
2032 if (pchanged) { 2014 if (pchanged) {
2033 for (; n < (unsigned int)i; n++) { 2015 for (; n < (unsigned int)i; n++) {
2034 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2035 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2036 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2037 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2038 break; 2020 break;
2039 } 2021 }
2040 } 2022 }
2041 } 2023 }
… …
2091 return stream; 2073 return stream;
2092} 2074}
2093 2075
2094/* EXTPROTO */ 2076/* EXTPROTO */
2095int 2077int
2096rxvt_pclose_printer(FILE *stream) 2078rxvt_pclose_printer (FILE *stream)
2097{ 2079{
2098 fflush(stream); 2080 fflush (stream);
2099/* pclose() reported not to work on SunOS 4.1.3 */ 2081/* pclose() reported not to work on SunOS 4.1.3 */
2100# if defined (__sun__) /* TODO: RESOLVE THIS */ 2082# if defined (__sun__) /* TODO: RESOLVE THIS */
2101/* pclose works provided SIGCHLD handler uses waitpid */ 2083/* pclose works provided SIGCHLD handler uses waitpid */
2102 return pclose(stream); /* return fclose (stream); */ 2084 return pclose (stream); /* return fclose (stream); */
2103# else 2085# else
2104 return pclose(stream); 2086 return pclose (stream);
2105# endif 2087# endif
2106} 2088}
2107 2089
2108/* 2090/*
2109 * simulate attached vt100 printer 2091 * simulate attached vt100 printer
… …
2172rxvt_process_nonprinting(pR_ unsigned char ch) 2154rxvt_process_nonprinting(pR_ unsigned char ch)
2173{ 2155{
2174 switch (ch) { 2156 switch (ch) {
2175 case C0_ENQ: /* terminal Status */ 2157 case C0_ENQ: /* terminal Status */
2176 if (R->rs[Rs_answerbackstring]) 2158 if (R->rs[Rs_answerbackstring])
2177 rxvt_tt_write(aR_ 2159 R->tt_write(
2178 (const unsigned char *)R->rs[Rs_answerbackstring], 2160 (const unsigned char *)R->rs[Rs_answerbackstring],
2179 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2161 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2180 else 2162 else
2181 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2163 R->tt_write((unsigned char *)VT100_ANS,
2182 (unsigned int)STRLEN(VT100_ANS)); 2164 (unsigned int)STRLEN(VT100_ANS));
2183 break; 2165 break;
2184 case C0_BEL: /* bell */ 2166 case C0_BEL: /* bell */
2185 rxvt_scr_bell(aR); 2167 rxvt_scr_bell(aR);
2186 break; 2168 break;
… …
2234 break; 2216 break;
2235 case 'I': /* cursor up and scroll down if needed */ 2217 case 'I': /* cursor up and scroll down if needed */
2236 rxvt_scr_index(aR_ DN); 2218 rxvt_scr_index(aR_ DN);
2237 break; 2219 break;
2238 case 'J': /* erase to end of screen */ 2220 case 'J': /* erase to end of screen */
2239 rxvt_scr_erase_screen(aR_ 0); 2221 R->scr_erase_screen (0);
2240 break; 2222 break;
2241 case 'K': /* erase to end of line */ 2223 case 'K': /* erase to end of line */
2242 rxvt_scr_erase_line(aR_ 0); 2224 rxvt_scr_erase_line(aR_ 0);
2243 break; 2225 break;
2244 case 'Y': /* move to specified row and col */ 2226 case 'Y': /* move to specified row and col */
… …
2249 row = rxvt_cmd_getc(aR) - ' '; 2231 row = rxvt_cmd_getc(aR) - ' ';
2250 col = rxvt_cmd_getc(aR) - ' '; 2232 col = rxvt_cmd_getc(aR) - ' ';
2251 rxvt_scr_gotorc(aR_ row, col, 0); 2233 rxvt_scr_gotorc(aR_ row, col, 0);
2252 break; 2234 break;
2253 case 'Z': /* identify the terminal type */ 2235 case 'Z': /* identify the terminal type */
2254 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2236 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2255 break; 2237 break;
2256 case '<': /* turn off VT52 mode */ 2238 case '<': /* turn off VT52 mode */
2257 PrivMode(0, PrivMode_vt52); 2239 PrivMode(0, PrivMode_vt52);
2258 break; 2240 break;
2259 case 'F': /* use special graphics character set */ 2241 case 'F': /* use special graphics character set */
… …
2366 rxvt_process_dcs_seq(aR); 2348 rxvt_process_dcs_seq(aR);
2367 break; 2349 break;
2368 2350
2369 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2351 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2370 case C1_SCI: /* ESC Z */ 2352 case C1_SCI: /* ESC Z */
2371 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2353 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2372 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2354 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2373 break; /* steal obsolete ESC [ c */ 2355 break; /* steal obsolete ESC [ c */
2374 2356
2375 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2357 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2376 case C1_CSI: /* ESC [ */ 2358 case C1_CSI: /* ESC [ */
… …
2497 */ 2479 */
2498 if (priv) { 2480 if (priv) {
2499 switch (priv) { 2481 switch (priv) {
2500 case '>': 2482 case '>':
2501 if (ch == CSI_DA) /* secondary device attributes */ 2483 if (ch == CSI_DA) /* secondary device attributes */
2502 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2484 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2503 break; 2485 break;
2504 case '?': 2486 case '?':
2505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2487 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2506 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2488 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2507 break; 2489 break;
… …
2579 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2580 rxvt_scr_tab(aR_ arg[0]); 2562 rxvt_scr_tab(aR_ arg[0]);
2581 break; 2563 break;
2582 2564
2583 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2584 rxvt_scr_erase_screen(aR_ arg[0]); 2566 R->scr_erase_screen (arg[0]);
2585 break; 2567 break;
2586 2568
2587 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2588 rxvt_scr_erase_line(aR_ arg[0]); 2570 rxvt_scr_erase_line(aR_ arg[0]);
2589 break; 2571 break;
… …
2610 2592
2611 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2612 arg[0] = -arg[0]; 2594 arg[0] = -arg[0];
2613 /* FALLTHROUGH */ 2595 /* FALLTHROUGH */
2614 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2615 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2616 break; 2598 break;
2617 2599
2618 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2619 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2601 R->tt_write((const unsigned char *)VT100_ANS,
2620 (unsigned int)(sizeof(VT100_ANS) - 1)); 2602 (unsigned int)(sizeof(VT100_ANS) - 1));
2621 break; 2603 break;
2622 2604
2623 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2605 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2624 rxvt_process_sgr_mode(aR_ nargs, arg); 2606 rxvt_process_sgr_mode(aR_ nargs, arg);
2625 break; 2607 break;
2626 2608
2627 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2609 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2628 switch (arg[0]) { 2610 switch (arg[0]) {
2629 case 5: /* DSR requested */ 2611 case 5: /* DSR requested */
2630 rxvt_tt_printf(aR_ "\033[0n"); 2612 R->tt_printf("\033[0n");
2631 break; 2613 break;
2632 case 6: /* CPR requested */ 2614 case 6: /* CPR requested */
2633 rxvt_scr_report_position(aR); 2615 rxvt_scr_report_position(aR);
2634 break; 2616 break;
2635#if defined (ENABLE_DISPLAY_ANSWER) 2617#if defined (ENABLE_DISPLAY_ANSWER)
2636 case 7: /* unofficial extension */ 2618 case 7: /* unofficial extension */
2637 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2619 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2638 break; 2620 break;
2639#endif 2621#endif
2640 case 8: /* unofficial extension */ 2622 case 8: /* unofficial extension */
2641 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2623 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2642 break; 2624 break;
… …
2711 break; 2693 break;
2712#endif 2694#endif
2713 2695
2714 case CSI_78: /* DECREQTPARM */ 2696 case CSI_78: /* DECREQTPARM */
2715 if (arg[0] == 0 || arg[0] == 1) 2697 if (arg[0] == 0 || arg[0] == 1)
2716 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2698 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2717 /* FALLTHROUGH */ 2699 /* FALLTHROUGH */
2718 2700
2719 default: 2701 default:
2720 break; 2702 break;
2721 } 2703 }
… …
2759 break; 2741 break;
2760 case 6: /* lower window */ 2742 case 6: /* lower window */
2761 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2762 break; 2744 break;
2763 case 7: /* refresh window */ 2745 case 7: /* refresh window */
2764 rxvt_scr_touch(aR_ True); 2746 R->scr_touch (true);
2765 break; 2747 break;
2766 case 8: /* set size (chars) */ 2748 case 8: /* set size (chars) */
2767 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2768 (unsigned int)(args[1] * R->TermWin.fheight)); 2750 (unsigned int)(args[1] * R->TermWin.fheight));
2769 break; 2751 break;
… …
2775 /* 2757 /*
2776 * reports - some output format copied from XTerm 2758 * reports - some output format copied from XTerm
2777 */ 2759 */
2778 case 11: /* report window state */ 2760 case 11: /* report window state */
2779 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2761 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2780 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2762 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2781 break; 2763 break;
2782 case 13: /* report window position */ 2764 case 13: /* report window position */
2783 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2784 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2766 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2785 -wattr.border_width, -wattr.border_width, 2767 -wattr.border_width, -wattr.border_width,
2786 &x, &y, &wdummy); 2768 &x, &y, &wdummy);
2787 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2769 R->tt_printf("\033[3;%d;%dt", x, y);
2788 break; 2770 break;
2789 case 14: /* report window size (pixels) */ 2771 case 14: /* report window size (pixels) */
2790 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2791 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2773 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2792 break; 2774 break;
2793 case 18: /* report window size (chars) */ 2775 case 18: /* report window size (chars) */
2794 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2776 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2795 break; 2777 break;
2796#if 0 /* XXX: currently disabled due to security concerns */ 2778#if 0 /* XXX: currently disabled due to security concerns */
2797 case 20: /* report icon label */ 2779 case 20: /* report icon label */
2798 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2780 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2799 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2781 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2800 break; 2782 break;
2801 case 21: /* report window title */ 2783 case 21: /* report window title */
2802 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2784 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2803 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2785 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2804 break; 2786 break;
2805#endif 2787#endif
2806 } 2788 }
2807} 2789}
2808#endif 2790#endif
… …
2980 if (*str != ';') { 2962 if (*str != ';') {
2981#if XPM_BACKGROUND 2963#if XPM_BACKGROUND
2982 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2983 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2984#endif 2966#endif
2985 rxvt_scr_touch(aR_ True); 2967 R->scr_touch (true);
2986 } 2968 }
2987 while ((str = STRCHR(str, ';')) != NULL) { 2969 while ((str = STRCHR(str, ';')) != NULL) {
2988 str++; 2970 str++;
2989#if XPM_BACKGROUND 2971#if XPM_BACKGROUND
2990 changed += rxvt_scale_pixmap(aR_ str); 2972 changed += rxvt_scale_pixmap(aR_ str);
… …
2992 } 2974 }
2993 if (changed) { 2975 if (changed) {
2994#ifdef XPM_BACKGROUND 2976#ifdef XPM_BACKGROUND
2995 rxvt_resize_pixmap(aR); 2977 rxvt_resize_pixmap(aR);
2996#endif 2978#endif
2997 rxvt_scr_touch(aR_ True); 2979 R->scr_touch (true);
2998 } 2980 }
2999 break; 2981 break;
3000 2982
3001 case XTerm_restoreFG: 2983 case XTerm_restoreFG:
3002 rxvt_set_window_color(aR_ Color_fg, str); 2984 rxvt_set_window_color(aR_ Color_fg, str);
… …
3168 break; 3150 break;
3169#endif 3151#endif
3170#ifdef scrollBar_esc 3152#ifdef scrollBar_esc
3171 case scrollBar_esc: 3153 case scrollBar_esc:
3172 if (rxvt_scrollbar_mapping(aR_ state)) { 3154 if (rxvt_scrollbar_mapping(aR_ state)) {
3173 rxvt_resize_all_windows(aR_ 0, 0, 0); 3155 R->resize_all_windows (0, 0, 0);
3174 rxvt_scr_touch(aR_ True); 3156 R->scr_touch (true);
3175 } 3157 }
3176 break; 3158 break;
3177#endif 3159#endif
3178 case 25: /* visible/invisible cursor */ 3160 case 25: /* visible/invisible cursor */
3179 rxvt_scr_cursor_visible(aR_ state); 3161 rxvt_scr_cursor_visible(aR_ state);
… …
3205 else 3187 else
3206 R->Options &= ~Opt_scrollTtyKeypress; 3188 R->Options &= ~Opt_scrollTtyKeypress;
3207 break; 3189 break;
3208 case 1047: /* secondary screen w/ clearing */ 3190 case 1047: /* secondary screen w/ clearing */
3209 if (R->current_screen != PRIMARY) 3191 if (R->current_screen != PRIMARY)
3210 rxvt_scr_erase_screen(aR_ 2); 3192 R->scr_erase_screen (2);
3211 rxvt_scr_change_screen(aR_ state); 3193 rxvt_scr_change_screen(aR_ state);
3212 /* FALLTHROUGH */ 3194 /* FALLTHROUGH */
3213 default: 3195 default:
3214 break; 3196 break;
3215 } 3197 }
… …
3351{ 3333{
3352 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3334 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3353 3335
3354#ifndef RXVT_GRAPHICS 3336#ifndef RXVT_GRAPHICS
3355 if (cmd == 'Q') { /* query graphics */ 3337 if (cmd == 'Q') { /* query graphics */
3356 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3338 R->tt_printf("\033G0\n"); /* no graphics */
3357 return; 3339 return;
3358 } 3340 }
3359/* swallow other graphics sequences until terminating ':' */ 3341/* swallow other graphics sequences until terminating ':' */
3360 do 3342 do
3361 ch = rxvt_cmd_getc(aR); 3343 ch = rxvt_cmd_getc(aR);
… …
3364 unsigned int nargs; 3346 unsigned int nargs;
3365 int args[NGRX_PTS]; 3347 int args[NGRX_PTS];
3366 unsigned char *text = NULL; 3348 unsigned char *text = NULL;
3367 3349
3368 if (cmd == 'Q') { /* query graphics */ 3350 if (cmd == 'Q') { /* query graphics */
3369 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3351 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3370 return; 3352 return;
3371 } 3353 }
3372 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3354 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3373 int neg; 3355 int neg;
3374 3356
… …
3389 } 3371 }
3390 3372
3391 if ((cmd == 'T') && (nargs >= 5)) { 3373 if ((cmd == 'T') && (nargs >= 5)) {
3392 int i, len = args[4]; 3374 int i, len = args[4];
3393 3375
3394 text = rxvt_malloc((len + 1) * sizeof(char)); 3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3395 3377
3396 if (text != NULL) { 3378 if (text != NULL) {
3397 for (i = 0; i < len; i++) 3379 for (i = 0; i < len; i++)
3398 text[i] = rxvt_cmd_getc(aR); 3380 text[i] = rxvt_cmd_getc(aR);
3399 text[len] = '\0'; 3381 text[len] = '\0';
… …
3408 3390
3409/* 3391/*
3410 * Send printf() formatted output to the command. 3392 * Send printf() formatted output to the command.
3411 * Only use for small amounts of data. 3393 * Only use for small amounts of data.
3412 */ 3394 */
3413/* EXTPROTO */
3414void 3395void
3415rxvt_tt_printf(pR_ const char *fmt,...) 3396rxvt_term::tt_printf (const char *fmt,...)
3416{ 3397{
3417 va_list arg_ptr; 3398 va_list arg_ptr;
3418 unsigned char buf[256]; 3399 unsigned char buf[256];
3419 3400
3420 va_start(arg_ptr, fmt); 3401 va_start (arg_ptr, fmt);
3421 vsprintf((char *)buf, fmt, arg_ptr); 3402 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3422 va_end(arg_ptr); 3403 va_end (arg_ptr);
3423 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3404 tt_write (buf, STRLEN (buf));
3424} 3405}
3425 3406
3426/* ---------------------------------------------------------------------- */ 3407/* ---------------------------------------------------------------------- */
3427/* Addresses pasting large amounts of data and rxvt hang
3428 * code pinched from xterm (v_write()) and applied originally to
3429 * rxvt-2.18 - Hops
3430 * Write data to the pty as typed by the user, pasted with the mouse, 3408/* Write data to the pty as typed by the user, pasted with the mouse,
3431 * or generated by us in response to a query ESC sequence. 3409 * or generated by us in response to a query ESC sequence.
3432 */ 3410 */
3433/* EXTPROTO */
3434void 3411void
3435rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3412rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3436{ 3413{
3437#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3414 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3438 int riten;
3439 unsigned int p;
3440 unsigned char *v_buffer, /* start of physical buffer */
3441 *v_bufstr, /* start of current buffer pending */
3442 *v_bufptr, /* end of current buffer pending */
3443 *v_bufend; /* end of physical buffer */
3444 3415
3445 if (R->v_bufstr == NULL && len > 0) { 3416 if (len)
3446 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3447 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3448 v_bufend = v_buffer + p;
3449 } else {
3450 v_buffer = R->v_buffer;
3451 v_bufstr = R->v_bufstr;
3452 v_bufptr = R->v_bufptr;
3453 v_bufend = R->v_bufend;
3454 } 3417 {
3418 if (v_buflen == 0)
3419 {
3420 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3421 if (written == len)
3422 return;
3455 3423
3456 /* 3424 data += written;
3457 * Append to the block we already have. Always doing this simplifies the 3425 len -= written;
3458 * code, and isn't too bad, either. If this is a short block, it isn't 3426 }
3459 * too expensive, and if this is a long block, we won't be able to write 3427
3460 * it all anyway. 3428
3461 */ 3429 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3462 if (len > 0) { 3430
3463 if (v_bufend < v_bufptr + len) { /* run out of room */ 3431 memcpy (v_buffer + v_buflen, data, len);
3464 if (v_bufstr != v_buffer) { 3432 v_buflen += len;
3465 /* there is unused space, move everything down */
3466 MEMMOVE(v_buffer, v_bufstr,
3467 (unsigned int)(v_bufptr - v_bufstr));
3468 v_bufptr -= v_bufstr - v_buffer;
3469 v_bufstr = v_buffer;
3470 } 3433 }
3471 if (v_bufend < v_bufptr + len) {
3472 /* still won't fit: get more space */
3473 /* use most basic realloc because an error is not fatal. */
3474 unsigned int size = v_bufptr - v_buffer;
3475 unsigned int reallocto;
3476 3434
3477 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3435 for (;;)
3478 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3436 {
3479 /* save across realloc */ 3437 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3480 if (v_buffer) { 3438
3481 v_bufstr = v_buffer; 3439 if (written > 0)
3482 v_bufptr = v_buffer + size; 3440 {
3483 v_bufend = v_buffer + reallocto; 3441 v_buflen -= written;
3484 } else { /* no memory: ignore entire write request */ 3442
3485 rxvt_print_error("data loss: cannot allocate buffer space"); 3443 if (v_buflen == 0)
3486 v_buffer = v_bufstr; /* restore clobbered pointer */ 3444 {
3487 } 3445 free (v_buffer);
3446 v_buffer = 0;
3447 v_buflen = 0;
3448
3449 pty_ev.set (EVENT_READ);
3450 return;
3451 }
3452
3453 memmove (v_buffer, v_buffer + written, v_buflen);
3454 }
3455 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3456 // original code just ignores this...
3457 destroy ();
3458 else
3459 {
3460 pty_ev.set (EVENT_READ | EVENT_WRITE);
3461 return;
3462 }
3488 } 3463 }
3489 }
3490 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3491 MEMCPY(v_bufptr, d, len);
3492 v_bufptr += len;
3493 }
3494 }
3495
3496 /*
3497 * Write out as much of the buffer as we can.
3498 * Be careful not to overflow the pty's input silo.
3499 * We are conservative here and only write a small amount at a time.
3500 *
3501 * If we can't push all the data into the pty yet, we expect write
3502 * to return a non-negative number less than the length requested
3503 * (if some data written) or -1 and set errno to EAGAIN,
3504 * EWOULDBLOCK, or EINTR (if no data written).
3505 *
3506 * (Not all systems do this, sigh, so the code is actually
3507 * a little more forgiving.)
3508 */
3509 if ((p = v_bufptr - v_bufstr) > 0) {
3510 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3511 if (riten < 0)
3512 riten = 0;
3513 v_bufstr += riten;
3514 if (v_bufstr >= v_bufptr) /* we wrote it all */
3515 v_bufstr = v_bufptr = v_buffer;
3516 }
3517 /*
3518 * If we have lots of unused memory allocated, return it
3519 */
3520 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3521 /* save pointers across realloc */
3522 unsigned int start = v_bufstr - v_buffer;
3523 unsigned int size = v_bufptr - v_buffer;
3524 unsigned int reallocto;
3525
3526 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3527 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3528 if (v_buffer) {
3529 v_bufstr = v_buffer + start;
3530 v_bufptr = v_buffer + size;
3531 v_bufend = v_buffer + reallocto;
3532 } else {
3533 /* should we print a warning if couldn't return memory? */
3534 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3535 }
3536 }
3537 R->v_buffer = v_buffer;
3538 R->v_bufstr = v_bufstr;
3539 R->v_bufptr = v_bufptr;
3540 R->v_bufend = v_bufend;
3541} 3464}
3465
3542/*----------------------- end-of-file (C source) -----------------------*/ 3466/*----------------------- end-of-file (C source) -----------------------*/
3543 3467

Diff Legend

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