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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.26 by pcg, Wed Dec 24 06:26:52 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.6 2003/11/25 17:11:33 pcg Exp $ 4 * $Id: command.C,v 1.26 2003/12/24 06:26:52 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
… …
707rxvt_term::blink_cb (time_watcher &w) 758rxvt_term::blink_cb (time_watcher &w)
708{ 759{
709 w.at += BLINK_INTERVAL; 760 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 762 want_refresh = 1;
712 flush();
713} 763}
714 764
715void 765void
716rxvt_term::x_cb (io_watcher &w, short revents) 766rxvt_term::x_cb (io_watcher &w, short revents)
717{ 767{
768 SET_R (this);
769 SET_LOCALE (locale);
770
718 process_x_events (); 771 process_x_events ();
772}
719 773
720 flush (); 774bool
775rxvt_term::pty_fill ()
776{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778
779 memmove (cmdbuf_base, cmdbuf_ptr, n);
780 cmdbuf_ptr = cmdbuf_base;
781 cmdbuf_endp = cmdbuf_ptr + n;
782
783 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
784
785 if (n > 0)
786 {
787 cmdbuf_endp += n;
788 return true;
789 }
790 else if (n < 0 && errno != EAGAIN)
791 destroy ();
792
793 return false;
794}
795
796void
797rxvt_term::pty_cb (io_watcher &w, short revents)
798{
799 SET_R (this);
800 SET_LOCALE (locale);
801
802 if (revents & EVENT_WRITE)
803 tt_write (0, 0);
804 else if (revents & EVENT_READ)
805 {
806 bool flag = true;
807
808 // loop, but don't allow a single term to monopolize us
809 // the number of loops is fully arbitrary, and thus wrong
810 while (flag && pty_fill ())
811 {
812 if (!seen_input)
813 {
814 seen_input = 1;
815 /* once we know the shell is running, send the screen size. Again! */
816 tt_winch ();
817 }
818
819 uint32_t ch = NOCHAR;
820
821 for (;;)
822 {
823 if (ch == NOCHAR)
824 ch = next_char ();
825
826 if (ch == NOCHAR) // TODO: improve
827 break;
828
829 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
830 {
831 /* Read a text string from the input buffer */
832 uint32_t buf[BUFSIZ];
833 bool refreshnow = false;
834 int nlines = 0;
835 uint32_t *str = buf;
836
837 *str++ = ch;
838
839 for (;;)
840 {
841 ch = next_char ();
842
843 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
844 break;
845 else
846 {
847 *str++ = ch;
848
849 if (ch == '\n')
850 {
851 nlines++;
852 refresh_count++;
853
854 if (!(Options & Opt_jumpScroll)
855 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
856 {
857 refreshnow = true;
858 flag = false;
859 ch = NOCHAR;
860 break;
861 }
862 }
863
864 if (str >= buf + BUFSIZ)
865 {
866 ch = NOCHAR;
867 break;
868 }
869 }
870 }
871
872 rxvt_scr_add_lines (this, buf, nlines, str - buf);
873
874 /*
875 * If there have been a lot of new lines, then update the screen
876 * What the heck I'll cheat and only refresh less than every page-full.
877 * the number of pages between refreshes is refresh_limit, which
878 * is incremented here because we must be doing flat-out scrolling.
879 *
880 * refreshing should be correct for small scrolls, because of the
881 * time-out
882 */
883 if (refreshnow)
884 {
885 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
886 refresh_limit++;
887
888 scr_refresh (refresh_type);
889 }
890
891 }
892 else
893 {
894 switch (ch)
895 {
896 default:
897 rxvt_process_nonprinting (this, ch);
898 break;
899 case C0_ESC: /* escape char */
900 rxvt_process_escape_seq (this);
901 break;
902 /*case 0x9b: */ /* CSI */
903 /* rxvt_process_csi_seq (this); */
904 }
905
906 ch = NOCHAR;
907 }
908 }
909 }
910 }
721} 911}
722 912
723// read the next character, currently handles UTF-8 913// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future 914// will probably handle all sorts of other stuff in the future
725uint32_t 915uint32_t
726rxvt_term::next_char () 916rxvt_term::next_char ()
727{ 917{
728 struct mbstate &s = mbstate;
729
730 while (cmdbuf_ptr < cmdbuf_endp) 918 while (cmdbuf_ptr < cmdbuf_endp)
731 { 919 {
732 uint8_t ch = *cmdbuf_ptr; 920 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
733
734 if (s.cnt)
735 {
736 if ((ch & 0xc0) == 0x80)
737 {
738 cmdbuf_ptr++;
739
740 /* continuation */
741 s.reg = (s.reg << 6) | (ch & 0x7f);
742
743 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
744 return s.reg;
745
746 continue;
747 }
748 else
749 {
750 s.cnt = 0;
751 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
752 }
753 }
754
755 if ((ch & 0xc0) == 0xc0)
756 {
757 cmdbuf_ptr++; 921 return *cmdbuf_ptr++;
758 922
759 /* first byte */ 923 wchar_t wc;
760 s.orig = ch; /* for broken encodings */ 924 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
761 s.reg = ch; 925
762 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 926 if (len == (size_t)-2)
763 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 927 return NOCHAR;
764 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 928
765 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 929 if (len == (size_t)-1)
766 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 930 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
767 } 931
768 else 932 // assume wchar == unicode
769 { 933 cmdbuf_ptr += len;
770 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
771 return ch; 934 return wc;
772 }
773 } 935 }
774 936
775 return NOCHAR; 937 return NOCHAR;
776}
777
778bool
779rxvt_term::pty_fill (size_t count)
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, count);
788
789 if (n > 0)
790 {
791 cmdbuf_endp += n;
792 return true;
793 }
794 else if (n < 0 && errno == EAGAIN)
795 return false;
796
797 rxvt_clean_exit();
798 exit(EXIT_FAILURE); /* bad order of events? */
799}
800
801void
802rxvt_term::pty_cb (io_watcher &w, short revents)
803{
804 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
805 {
806 /* once we know the shell is running, send the screen size. Again! */
807 //ch = rxvt_cmd_getc(aR); /* wait for something */
808 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
809
810 uint32_t ch = NOCHAR;
811
812 for (;;)
813 {
814 if (ch == NOCHAR)
815 ch = next_char ();
816
817 if (ch == NOCHAR) // TODO: improve
818 break;
819
820 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
821 {
822 /* Read a text string from the input buffer */
823 uint32_t buf[BUFSIZ];
824 bool refreshnow = false;
825 int nlines = 0;
826 uint32_t *str = buf;
827
828 *str++ = ch;
829
830 for (;;)
831 {
832 ch = next_char ();
833
834 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
835 break;
836 else
837 {
838 *str++ = ch;
839
840 if (ch == '\n')
841 {
842 nlines++;
843 refresh_count++;
844
845 if (!(Options & Opt_jumpScroll)
846 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
847 {
848 refreshnow = true;
849 ch = NOCHAR;
850 break;
851 }
852 }
853
854 if (str >= buf + BUFSIZ)
855 {
856 ch = NOCHAR;
857 break;
858 }
859 }
860 }
861
862 rxvt_scr_add_lines (this, buf, nlines, str - buf);
863
864 /*
865 * If there have been a lot of new lines, then update the screen
866 * What the heck I'll cheat and only refresh less than every page-full.
867 * the number of pages between refreshes is refresh_limit, which
868 * is incremented here because we must be doing flat-out scrolling.
869 *
870 * refreshing should be correct for small scrolls, because of the
871 * time-out
872 */
873 if (refreshnow)
874 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++;
877
878 rxvt_scr_refresh (this, refresh_type);
879 }
880
881 }
882 else
883 {
884 switch (ch)
885 {
886 default:
887 rxvt_process_nonprinting (this, ch);
888 break;
889 case C0_ESC: /* escape char */
890 rxvt_process_escape_seq (this);
891 break;
892 /*case 0x9b: */ /* CSI */
893 /* rxvt_process_csi_seq (this); */
894 }
895
896 ch = NOCHAR;
897 }
898 }
899 }
900
901 flush ();
902}
903
904void
905rxvt_term::flush ()
906{
907#ifdef TRANSPARENT
908 if (want_full_refresh)
909 {
910 want_full_refresh = 0;
911 rxvt_scr_clear (this);
912 rxvt_scr_touch (this, False);
913 want_refresh = 1;
914 }
915#endif
916
917 if (want_refresh)
918 {
919 rxvt_scr_refresh (this, refresh_type);
920 rxvt_scrollbar_show (this, 1);
921#ifdef USE_XIM
922 rxvt_IMSendSpot (this);
923#endif
924 }
925
926 XFlush (Xdisplay);
927} 938}
928 939
929/* rxvt_cmd_getc() - Return next input character */ 940/* rxvt_cmd_getc() - Return next input character */
930/* 941/*
931 * Return the next input character after first passing any keyboard input 942 * Return the next input character after first passing any keyboard input
… …
942 return c; 953 return c;
943 954
944 // incomplete sequences should occur rarely, still, a better solution 955 // incomplete sequences should occur rarely, still, a better solution
945 // would be preferred. either setjmp/longjmp or better design. 956 // would be preferred. either setjmp/longjmp or better design.
946 fcntl (R->cmd_fd, F_SETFL, 0); 957 fcntl (R->cmd_fd, F_SETFL, 0);
947 R->pty_fill (1); 958 R->pty_fill ();
948 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 959 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
949 } 960 }
950 961
951#if 0 962#if 0
952#define TIMEOUT_USEC 5000 963#define TIMEOUT_USEC 5000
… …
960 971
961 for (;;) { 972 for (;;) {
962 /* loop until we can return something */ 973 /* loop until we can return something */
963 974
964 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 975 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
965 rxvt_tt_write(aR_ NULL, 0); 976 R->tt_write(NULL, 0);
966 977
967#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 978#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
968 if (R->mouse_slip_wheel_speed) { 979 if (R->mouse_slip_wheel_speed) {
969 quick_timeout = 1; 980 quick_timeout = 1;
970 if (!R->mouse_slip_wheel_delay-- 981 if (!R->mouse_slip_wheel_delay--
… …
980 if (R->pending_scroll_selection) { 991 if (R->pending_scroll_selection) {
981 quick_timeout = 1; 992 quick_timeout = 1;
982 if (!R->scroll_selection_delay-- 993 if (!R->scroll_selection_delay--
983 && rxvt_scr_page(aR_ R->scroll_selection_dir, 994 && rxvt_scr_page(aR_ R->scroll_selection_dir,
984 R->scroll_selection_lines)) { 995 R->scroll_selection_lines)) {
985 rxvt_selection_extend(aR_ R->selection_save_x, 996 R->selection_extend (R->selection_save_x,
986 R->selection_save_y, R->selection_save_state); 997 R->selection_save_y, R->selection_save_state);
987 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 998 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH; 999 R->refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1; 1000 R->want_refresh = 1;
990 } 1001 }
… …
1006 quick_timeout |= R->want_full_refresh; 1017 quick_timeout |= R->want_full_refresh;
1007#endif 1018#endif
1008#endif 1019#endif
1009} 1020}
1010 1021
1022void
1023rxvt_term::pointer_unblank ()
1024{
1025 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1026 recolour_cursor ();
1027
1028#ifdef POINTER_BLANK
1029 hidden_pointer = 0;
1030
1031 if (Options & Opt_pointerBlank)
1032 pointer_ev.start (NOW + pointerBlankDelay);
1033#endif
1034}
1035
1011#ifdef POINTER_BLANK 1036#ifdef POINTER_BLANK
1012void 1037void
1013rxvt_term::pointer_unblank () 1038rxvt_term::pointer_blank ()
1014{ 1039{
1040 pointer_ev.stop ();
1041
1015 if (!(Options & Opt_pointerBlank)) 1042 if (!(Options & Opt_pointerBlank))
1016 return; 1043 return;
1017 1044
1018 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1019 rxvt_recolour_cursor (this);
1020 hidden_pointer = 0;
1021
1022 pointer_ev.start (NOW + pointerBlankDelay);
1023}
1024
1025void
1026rxvt_term::pointer_blank ()
1027{
1028 pointer_ev.stop ();
1029
1030 if (!(Options & Opt_pointerBlank))
1031 return;
1032
1033 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1045 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1034 XFlush (Xdisplay); 1046 XFlush (Xdisplay);
1035 1047
1036 hidden_pointer = 1; 1048 hidden_pointer = 1;
1037} 1049}
1038 1050
1039void 1051void
1040rxvt_term::pointer_cb (time_watcher &w) 1052rxvt_term::pointer_cb (time_watcher &w)
1041{ 1053{
1054 SET_R (this);
1055 SET_LOCALE (locale);
1056
1042 pointer_blank (); 1057 pointer_blank ();
1043} 1058}
1044#endif 1059#endif
1045 1060
1046/* INTPROTO */ 1061/* INTPROTO */
… …
1050 int button_number, key_state = 0; 1065 int button_number, key_state = 0;
1051 int x, y; 1066 int x, y;
1052 1067
1053 x = ev->x; 1068 x = ev->x;
1054 y = ev->y; 1069 y = ev->y;
1055 rxvt_pixel_position(aR_ &x, &y); 1070 R->pixel_position (&x, &y);
1056 1071
1057 if (R->MEvent.button == AnyButton) { 1072 if (R->MEvent.button == AnyButton) {
1058 button_number = 3; 1073 button_number = 3;
1059 } else { 1074 } else {
1060 button_number = R->MEvent.button - Button1; 1075 button_number = R->MEvent.button - Button1;
… …
1100 fprintf(stderr, "]: <%d>, %d/%d\n", 1115 fprintf(stderr, "]: <%d>, %d/%d\n",
1101 button_number, 1116 button_number,
1102 x + 1, 1117 x + 1,
1103 y + 1); 1118 y + 1);
1104#else 1119#else
1105 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1120 R->tt_printf("\033[M%c%c%c",
1106 (32 + button_number + key_state), 1121 (32 + button_number + key_state),
1107 (32 + x + 1), 1122 (32 + x + 1),
1108 (32 + y + 1)); 1123 (32 + y + 1));
1109#endif 1124#endif
1110} 1125}
… …
1127{ 1142{
1128 int i, want_timeout; 1143 int i, want_timeout;
1129 Window unused_root, unused_child; 1144 Window unused_root, unused_child;
1130 int unused_root_x, unused_root_y; 1145 int unused_root_x, unused_root_y;
1131 unsigned int unused_mask; 1146 unsigned int unused_mask;
1132 struct timeval tp;
1133 1147
1134#ifdef DEBUG_X 1148#ifdef DEBUG_X
1135 const char *const eventnames[] = 1149 const char *const eventnames[] =
1136 { /* mason - this matches my system */ 1150 { /* mason - this matches my system */
1137 "", 1151 "",
… …
1168 "SelectionNotify", 1182 "SelectionNotify",
1169 "ColormapNotify", 1183 "ColormapNotify",
1170 "ClientMessage", 1184 "ClientMessage",
1171 "MappingNotify" 1185 "MappingNotify"
1172 }; 1186 };
1187#endif
1188
1189#ifdef DEBUG_X
1190 struct timeval tp;
1173 struct tm *ltt; 1191 struct tm *ltt;
1174#endif
1175
1176 /*
1177 * check if we need to get the time for any timeouts
1178 */
1179
1180 for (i = NUM_TIMEOUTS; i--; )
1181 if (R->timeout[i].tv_sec) {
1182 want_timeout = 1;
1183 break;
1184 }
1185
1186#ifndef DEBUG_X
1187 if (want_timeout)
1188#endif
1189 (void)gettimeofday(&tp, NULL); 1192 (void)gettimeofday(&tp, NULL);
1190
1191#ifdef DEBUG_X
1192 ltt = localtime(&(tp.tv_sec)); 1193 ltt = localtime(&(tp.tv_sec));
1193 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)); 1194 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));
1194#endif 1195#endif
1195
1196 /* X event timeouts */
1197 if (want_timeout)
1198 for (i = NUM_TIMEOUTS; i--; ) {
1199 if (R->timeout[i].tv_sec == 0)
1200 continue;
1201 if ((tp.tv_sec < R->timeout[i].tv_sec)
1202 || (tp.tv_sec == R->timeout[i].tv_sec
1203 && tp.tv_usec < R->timeout[i].tv_usec))
1204 continue;
1205 R->timeout[i].tv_sec = 0;
1206 switch(i) {
1207 case TIMEOUT_INCR:
1208 rxvt_print_error("data loss: timeout on INCR selection paste");
1209 R->selection_wait = Sel_none;
1210 break;
1211 default:
1212 break;
1213 }
1214 }
1215 1196
1216 switch (ev->type) { 1197 switch (ev->type) {
1217 case KeyPress: 1198 case KeyPress:
1218 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1199 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1219 break; 1200 break;
… …
1243 break; 1224 break;
1244 1225
1245 case ClientMessage: 1226 case ClientMessage:
1246 if (ev->xclient.format == 32 1227 if (ev->xclient.format == 32
1247 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1248 exit(EXIT_SUCCESS); 1229 R->destroy ();
1249#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1250 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1251 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1232 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1252 && (ev->xclient.data.l[0] == DndFile 1233 && (ev->xclient.data.l[0] == DndFile
1253 || ev->xclient.data.l[0] == DndDir 1234 || ev->xclient.data.l[0] == DndDir
1254 || ev->xclient.data.l[0] == DndLink)) { 1235 || ev->xclient.data.l[0] == DndLink)) {
1255 /* Get Dnd data */ 1236 /* Get Dnd data */
1256 Atom ActualType; 1237 Atom ActualType;
… …
1288 * in the GraphicsExpose parts, which means that after each refresh, 1269 * in the GraphicsExpose parts, which means that after each refresh,
1289 * we need to wait for the graphics expose or Noexpose events, 1270 * we need to wait for the graphics expose or Noexpose events,
1290 * which ought to make things real slow! 1271 * which ought to make things real slow!
1291 */ 1272 */
1292 case VisibilityNotify: 1273 case VisibilityNotify:
1293 switch (ev->xvisibility.state) { 1274 switch (ev->xvisibility.state)
1275 {
1294 case VisibilityUnobscured: 1276 case VisibilityUnobscured:
1295 R->refresh_type = FAST_REFRESH; 1277 R->refresh_type = FAST_REFRESH;
1296 break; 1278 break;
1297 case VisibilityPartiallyObscured: 1279 case VisibilityPartiallyObscured:
1298 R->refresh_type = SLOW_REFRESH; 1280 R->refresh_type = SLOW_REFRESH;
1299 break; 1281 break;
1300 default: 1282 default:
1301 R->refresh_type = NO_REFRESH; 1283 R->refresh_type = NO_REFRESH;
1302 break; 1284 break;
1303 } 1285 }
1304 break; 1286 break;
1305 1287
1306 case FocusIn: 1288 case FocusIn:
1307 if (!R->TermWin.focus) { 1289 if (!R->TermWin.focus) {
1308 R->TermWin.focus = 1; 1290 R->TermWin.focus = 1;
… …
1344 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1326 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1345 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1327 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1346 ConfigureNotify, ev)); 1328 ConfigureNotify, ev));
1347 if (R->szHint.width != width || R->szHint.height != height) { 1329 if (R->szHint.width != width || R->szHint.height != height) {
1348 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1330 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1349 rxvt_resize_all_windows(aR_ (unsigned int)width, 1331 R->resize_all_windows (width, height, 1);
1350 (unsigned int)height, 1);
1351 } 1332 }
1352#ifdef DEBUG_SIZE 1333#ifdef DEBUG_SIZE
1353 else { 1334 else {
1354 D_SIZE((stderr, "Size: Not resizing")); 1335 D_SIZE((stderr, "Size: Not resizing"));
1355 } 1336 }
… …
1414 1395
1415 case GraphicsExpose: 1396 case GraphicsExpose:
1416 case Expose: 1397 case Expose:
1417 if (ev->xany.window == R->TermWin.vt) { 1398 if (ev->xany.window == R->TermWin.vt) {
1418#ifdef NO_SLOW_LINK_SUPPORT 1399#ifdef NO_SLOW_LINK_SUPPORT
1419 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1400 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1420 ev->xexpose.width, ev->xexpose.height, False); 1401 ev->xexpose.width, ev->xexpose.height, False);
1421#else 1402#else
1422 // don't understand this, so commented it out 1403 // don't understand this, so commented it out
1423 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1424 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1425 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1406 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1426 // ev->xexpose.width, R->TermWin.height, False); 1407 // ev->xexpose.width, R->TermWin.height, False);
1427#endif 1408#endif
1428 R->want_refresh = 1; 1409 R->want_refresh = 1;
1429 } else { 1410 } else {
… …
1434 &unused_xevent)) ; 1415 &unused_xevent)) ;
1435 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1416 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1436 GraphicsExpose, 1417 GraphicsExpose,
1437 &unused_xevent)) ; 1418 &unused_xevent)) ;
1438 if (isScrollbarWindow(ev->xany.window)) { 1419 if (isScrollbarWindow(ev->xany.window)) {
1439 scrollbar_setIdle(); 1420 R->scrollBar.setIdle();
1440 rxvt_scrollbar_show(aR_ 0); 1421 rxvt_scrollbar_show(aR_ 0);
1441 } 1422 }
1442#ifdef MENUBAR 1423#ifdef MENUBAR
1443 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1424 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1444 rxvt_menubar_expose(aR); 1425 rxvt_menubar_expose(aR);
… …
1474 &unused_mask); 1455 &unused_mask);
1475#ifdef MOUSE_THRESHOLD 1456#ifdef MOUSE_THRESHOLD
1476 /* deal with a `jumpy' mouse */ 1457 /* deal with a `jumpy' mouse */
1477 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1458 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1478#endif 1459#endif
1479 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1460 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1480 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1461 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1481#ifdef SELECTION_SCROLLING 1462#ifdef SELECTION_SCROLLING
1482 if (ev->xbutton.y<R->TermWin.int_bwidth || 1463 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1483 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1464 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1484 int dist; 1465 int dist;
… …
1533 &unused_root_x, &unused_root_y, 1514 &unused_root_x, &unused_root_y,
1534 &(ev->xbutton.x), &(ev->xbutton.y), 1515 &(ev->xbutton.x), &(ev->xbutton.y),
1535 &unused_mask); 1516 &unused_mask);
1536 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1517 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1537 scrollbar_size()); 1518 scrollbar_size());
1538 rxvt_scr_refresh(aR_ R->refresh_type); 1519 R->scr_refresh (R->refresh_type);
1539 R->refresh_limit = 0; 1520 R->refresh_limit = 0;
1540 rxvt_scrollbar_show(aR_ 1); 1521 rxvt_scrollbar_show(aR_ 1);
1541 } 1522 }
1542 break; 1523 break;
1543 } 1524 }
… …
1545 1526
1546/* INTPROTO */ 1527/* INTPROTO */
1547void 1528void
1548rxvt_button_press(pR_ XButtonEvent *ev) 1529rxvt_button_press(pR_ XButtonEvent *ev)
1549{ 1530{
1550 int reportmode = 0, clickintime; 1531 int reportmode = 0, clickintime;
1551 1532
1552 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1533 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1553 if (!R->bypass_keystate) 1534 if (!R->bypass_keystate)
1554 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1535 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1555/* 1536/*
… …
1557 */ 1538 */
1558 if (ev->window == R->TermWin.vt) 1539 if (ev->window == R->TermWin.vt)
1559 { 1540 {
1560#if RXVT_GRAPHICS 1541#if RXVT_GRAPHICS
1561 if (ev->subwindow != None) 1542 if (ev->subwindow != None)
1562 rxvt_Gr_ButtonPress(ev->x, ev->y); 1543 rxvt_Gr_ButtonPress (ev->x, ev->y);
1563 else 1544 else
1564#endif 1545#endif
1565 { 1546 {
1566 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1547 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1567 if (reportmode) 1548 if (reportmode)
… …
1602 if (ev->button != R->MEvent.button) 1583 if (ev->button != R->MEvent.button)
1603 R->MEvent.clicks = 0; 1584 R->MEvent.clicks = 0;
1604 switch (ev->button) 1585 switch (ev->button)
1605 { 1586 {
1606 case Button1: 1587 case Button1:
1588 /* allow shift+left click to extend selection */
1589 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1590 {
1607 if (R->MEvent.button == Button1 && clickintime) 1591 if (R->MEvent.button == Button1 && clickintime)
1592 R->selection_rotate (ev->x, ev->y);
1608 R->MEvent.clicks++; 1593 else
1594 R->selection_extend (ev->x, ev->y, 1);
1595 }
1609 else 1596 else
1597 {
1598 if (R->MEvent.button == Button1 && clickintime)
1599 R->MEvent.clicks++;
1600 else
1610 R->MEvent.clicks = 1; 1601 R->MEvent.clicks = 1;
1602
1611 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1603 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1604 }
1605
1612 R->MEvent.button = Button1; 1606 R->MEvent.button = Button1;
1613 break; 1607 break;
1614 1608
1615 case Button3: 1609 case Button3:
1616 if (R->MEvent.button == Button3 && clickintime) 1610 if (R->MEvent.button == Button3 && clickintime)
1617 rxvt_selection_rotate(aR_ ev->x, ev->y); 1611 R->selection_rotate (ev->x, ev->y);
1618 else 1612 else
1619 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1613 R->selection_extend (ev->x, ev->y, 1);
1620 R->MEvent.button = Button3; 1614 R->MEvent.button = Button3;
1621 break; 1615 break;
1622 } 1616 }
1623 } 1617 }
1624 R->MEvent.time = ev->time; 1618 R->MEvent.time = ev->time;
… …
1629/* 1623/*
1630 * Scrollbar window processing of button press 1624 * Scrollbar window processing of button press
1631 */ 1625 */
1632 if (isScrollbarWindow(ev->window)) 1626 if (isScrollbarWindow(ev->window))
1633 { 1627 {
1634 scrollbar_setIdle(); 1628 R->scrollBar.setIdle ();
1635 /* 1629 /*
1636 * Rxvt-style scrollbar: 1630 * Rxvt-style scrollbar:
1637 * move up if mouse is above slider 1631 * move up if mouse is above slider
1638 * move dn if mouse is below slider 1632 * move dn if mouse is below slider
1639 * 1633 *
… …
1651 */ 1645 */
1652 if ((R->scrollBar.style == R_SB_NEXT 1646 if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_upButton(ev->y)) 1647 && scrollbarnext_upButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT 1648 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_upButton(ev->y))) 1649 && scrollbarrxvt_upButton(ev->y)))
1656 rxvt_tt_printf(aR_ "\033[A"); 1650 R->tt_printf("\033[A");
1657 else if ((R->scrollBar.style == R_SB_NEXT 1651 else if ((R->scrollBar.style == R_SB_NEXT
1658 && scrollbarnext_dnButton(ev->y)) 1652 && scrollbarnext_dnButton(ev->y))
1659 || (R->scrollBar.style == R_SB_RXVT 1653 || (R->scrollBar.style == R_SB_RXVT
1660 && scrollbarrxvt_dnButton(ev->y))) 1654 && scrollbarrxvt_dnButton(ev->y)))
1661 rxvt_tt_printf(aR_ "\033[B"); 1655 R->tt_printf("\033[B");
1662 else 1656 else
1663 switch (ev->button) { 1657 switch (ev->button) {
1664 case Button2: 1658 case Button2:
1665 rxvt_tt_printf(aR_ "\014"); 1659 R->tt_printf("\014");
1666 break; 1660 break;
1667 case Button1: 1661 case Button1:
1668 rxvt_tt_printf(aR_ "\033[6~"); 1662 R->tt_printf("\033[6~");
1669 break; 1663 break;
1670 case Button3: 1664 case Button3:
1671 rxvt_tt_printf(aR_ "\033[5~"); 1665 R->tt_printf("\033[5~");
1672 break; 1666 break;
1673 } 1667 }
1674 } 1668 }
1675 else 1669 else
1676#endif /* NO_SCROLLBAR_REPORT */ 1670#endif /* NO_SCROLLBAR_REPORT */
… …
1692#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1686#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1693 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1687 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1694#endif 1688#endif
1695 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1689 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1696 if (upordown < 0) 1690 if (upordown < 0)
1697 scrollbar_setUp(); 1691 R->scrollBar.setUp ();
1698 else 1692 else
1699 scrollbar_setDn(); 1693 R->scrollBar.setDn ();
1700 } 1694 }
1701 } else 1695 } else
1702 switch (ev->button) { 1696 switch (ev->button) {
1703 case Button2: 1697 case Button2:
1704 switch (R->scrollbar_align) { 1698 switch (R->scrollbar_align) {
… …
1716 || scrollbar_above_slider(ev->y) 1710 || scrollbar_above_slider(ev->y)
1717 || scrollbar_below_slider(ev->y)) 1711 || scrollbar_below_slider(ev->y))
1718 rxvt_scr_move_to(aR_ 1712 rxvt_scr_move_to(aR_
1719 scrollbar_position(ev->y) - R->csrO, 1713 scrollbar_position(ev->y) - R->csrO,
1720 scrollbar_size()); 1714 scrollbar_size());
1721 scrollbar_setMotion(); 1715 R->scrollBar.setMotion ();
1722 break; 1716 break;
1723 1717
1724 case Button1: 1718 case Button1:
1725 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1719 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1726 R->csrO = ev->y - R->scrollBar.top; 1720 R->csrO = ev->y - R->scrollBar.top;
… …
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1733 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1740# else 1734# else
1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1735 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1742# endif 1736# endif
1743 else 1737 else
1744 scrollbar_setMotion(); 1738 R->scrollBar.setMotion ();
1745 } else { 1739 } else {
1746 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1740 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1747 (R->TermWin.nrow 1741 (R->TermWin.nrow
1748 * scrollbar_position(ev->y) 1742 * scrollbar_position(ev->y)
1749 / scrollbar_size())); 1743 / scrollbar_size()));
… …
1771 R->csrO = 0; /* reset csr Offset */ 1765 R->csrO = 0; /* reset csr Offset */
1772 if (!R->bypass_keystate) 1766 if (!R->bypass_keystate)
1773 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1767 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1774 1768
1775 if (scrollbar_isUpDn()) { 1769 if (scrollbar_isUpDn()) {
1776 scrollbar_setIdle(); 1770 R->scrollBar.setIdle ();
1777 rxvt_scrollbar_show(aR_ 0); 1771 rxvt_scrollbar_show(aR_ 0);
1778#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1779 R->refresh_type &= ~SMOOTH_REFRESH; 1773 R->refresh_type &= ~SMOOTH_REFRESH;
1780#endif 1774#endif
1781 } 1775 }
… …
1818 * when overriding mouse reporting 1812 * when overriding mouse reporting
1819 */ 1813 */
1820 if (R->PrivateModes & PrivMode_mouse_report 1814 if (R->PrivateModes & PrivMode_mouse_report
1821 && R->bypass_keystate 1815 && R->bypass_keystate
1822 && ev->button == Button1 && R->MEvent.clicks <= 1) 1816 && ev->button == Button1 && R->MEvent.clicks <= 1)
1823 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1817 R->selection_extend (ev->x, ev->y, 0);
1824 1818
1825 switch (ev->button) { 1819 switch (ev->button) {
1826 case Button1: 1820 case Button1:
1827 case Button3: 1821 case Button3:
1828 rxvt_selection_make(aR_ ev->time); 1822 rxvt_selection_make(aR_ ev->time);
… …
1832 break; 1826 break;
1833#ifdef MOUSE_WHEEL 1827#ifdef MOUSE_WHEEL
1834 case Button4: 1828 case Button4:
1835 case Button5: 1829 case Button5:
1836 { 1830 {
1837 int i, v; 1831 int i;
1832 page_dirn v;
1838 1833
1839 v = (ev->button == Button4) ? UP : DN; 1834 v = (ev->button == Button4) ? UP : DN;
1840 if (ev->state & ShiftMask) 1835 if (ev->state & ShiftMask)
1841 i = 1; 1836 i = 1;
1842 else if ((R->Options & Opt_mouseWheelScrollPage)) 1837 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1850 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1845 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1851 } 1846 }
1852# endif 1847# endif
1853# ifdef JUMP_MOUSE_WHEEL 1848# ifdef JUMP_MOUSE_WHEEL
1854 rxvt_scr_page(aR_ v, i); 1849 rxvt_scr_page(aR_ v, i);
1855 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1850 R->scr_refresh (SMOOTH_REFRESH);
1856 rxvt_scrollbar_show(aR_ 1); 1851 rxvt_scrollbar_show(aR_ 1);
1857# else 1852# else
1858 for (; i--;) 1853 while (i--)
1859 { 1854 {
1860 rxvt_scr_page(aR_ v, 1); 1855 rxvt_scr_page(aR_ v, 1);
1861 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1856 R->scr_refresh (SMOOTH_REFRESH);
1862 rxvt_scrollbar_show(aR_ 1); 1857 rxvt_scrollbar_show(aR_ 1);
1863 } 1858 }
1864# endif 1859# endif
1865 } 1860 }
1866 break; 1861 break;
… …
2017 n = 0; 2012 n = 0;
2018 if (pchanged) { 2013 if (pchanged) {
2019 for (; n < (unsigned int)i; n++) { 2014 for (; n < (unsigned int)i; n++) {
2020 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2015 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2021 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2022 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2023 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2018 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2024 break; 2019 break;
2025 } 2020 }
2026 } 2021 }
2027 } 2022 }
… …
2077 return stream; 2072 return stream;
2078} 2073}
2079 2074
2080/* EXTPROTO */ 2075/* EXTPROTO */
2081int 2076int
2082rxvt_pclose_printer(FILE *stream) 2077rxvt_pclose_printer (FILE *stream)
2083{ 2078{
2084 fflush(stream); 2079 fflush (stream);
2085/* pclose() reported not to work on SunOS 4.1.3 */ 2080/* pclose() reported not to work on SunOS 4.1.3 */
2086# if defined (__sun__) /* TODO: RESOLVE THIS */ 2081# if defined (__sun__) /* TODO: RESOLVE THIS */
2087/* pclose works provided SIGCHLD handler uses waitpid */ 2082/* pclose works provided SIGCHLD handler uses waitpid */
2088 return pclose(stream); /* return fclose (stream); */ 2083 return pclose (stream); /* return fclose (stream); */
2089# else 2084# else
2090 return pclose(stream); 2085 return pclose (stream);
2091# endif 2086# endif
2092} 2087}
2093 2088
2094/* 2089/*
2095 * simulate attached vt100 printer 2090 * simulate attached vt100 printer
… …
2158rxvt_process_nonprinting(pR_ unsigned char ch) 2153rxvt_process_nonprinting(pR_ unsigned char ch)
2159{ 2154{
2160 switch (ch) { 2155 switch (ch) {
2161 case C0_ENQ: /* terminal Status */ 2156 case C0_ENQ: /* terminal Status */
2162 if (R->rs[Rs_answerbackstring]) 2157 if (R->rs[Rs_answerbackstring])
2163 rxvt_tt_write(aR_ 2158 R->tt_write(
2164 (const unsigned char *)R->rs[Rs_answerbackstring], 2159 (const unsigned char *)R->rs[Rs_answerbackstring],
2165 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2160 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2166 else 2161 else
2167 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2162 R->tt_write((unsigned char *)VT100_ANS,
2168 (unsigned int)STRLEN(VT100_ANS)); 2163 (unsigned int)STRLEN(VT100_ANS));
2169 break; 2164 break;
2170 case C0_BEL: /* bell */ 2165 case C0_BEL: /* bell */
2171 rxvt_scr_bell(aR); 2166 rxvt_scr_bell(aR);
2172 break; 2167 break;
… …
2220 break; 2215 break;
2221 case 'I': /* cursor up and scroll down if needed */ 2216 case 'I': /* cursor up and scroll down if needed */
2222 rxvt_scr_index(aR_ DN); 2217 rxvt_scr_index(aR_ DN);
2223 break; 2218 break;
2224 case 'J': /* erase to end of screen */ 2219 case 'J': /* erase to end of screen */
2225 rxvt_scr_erase_screen(aR_ 0); 2220 R->scr_erase_screen (0);
2226 break; 2221 break;
2227 case 'K': /* erase to end of line */ 2222 case 'K': /* erase to end of line */
2228 rxvt_scr_erase_line(aR_ 0); 2223 rxvt_scr_erase_line(aR_ 0);
2229 break; 2224 break;
2230 case 'Y': /* move to specified row and col */ 2225 case 'Y': /* move to specified row and col */
… …
2235 row = rxvt_cmd_getc(aR) - ' '; 2230 row = rxvt_cmd_getc(aR) - ' ';
2236 col = rxvt_cmd_getc(aR) - ' '; 2231 col = rxvt_cmd_getc(aR) - ' ';
2237 rxvt_scr_gotorc(aR_ row, col, 0); 2232 rxvt_scr_gotorc(aR_ row, col, 0);
2238 break; 2233 break;
2239 case 'Z': /* identify the terminal type */ 2234 case 'Z': /* identify the terminal type */
2240 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2235 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2241 break; 2236 break;
2242 case '<': /* turn off VT52 mode */ 2237 case '<': /* turn off VT52 mode */
2243 PrivMode(0, PrivMode_vt52); 2238 PrivMode(0, PrivMode_vt52);
2244 break; 2239 break;
2245 case 'F': /* use special graphics character set */ 2240 case 'F': /* use special graphics character set */
… …
2352 rxvt_process_dcs_seq(aR); 2347 rxvt_process_dcs_seq(aR);
2353 break; 2348 break;
2354 2349
2355 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2350 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2356 case C1_SCI: /* ESC Z */ 2351 case C1_SCI: /* ESC Z */
2357 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2352 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2358 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2353 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2359 break; /* steal obsolete ESC [ c */ 2354 break; /* steal obsolete ESC [ c */
2360 2355
2361 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2356 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2362 case C1_CSI: /* ESC [ */ 2357 case C1_CSI: /* ESC [ */
… …
2483 */ 2478 */
2484 if (priv) { 2479 if (priv) {
2485 switch (priv) { 2480 switch (priv) {
2486 case '>': 2481 case '>':
2487 if (ch == CSI_DA) /* secondary device attributes */ 2482 if (ch == CSI_DA) /* secondary device attributes */
2488 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2483 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2489 break; 2484 break;
2490 case '?': 2485 case '?':
2491 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2486 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2492 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2487 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2493 break; 2488 break;
… …
2565 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2560 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2566 rxvt_scr_tab(aR_ arg[0]); 2561 rxvt_scr_tab(aR_ arg[0]);
2567 break; 2562 break;
2568 2563
2569 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2564 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2570 rxvt_scr_erase_screen(aR_ arg[0]); 2565 R->scr_erase_screen (arg[0]);
2571 break; 2566 break;
2572 2567
2573 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2568 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2574 rxvt_scr_erase_line(aR_ arg[0]); 2569 rxvt_scr_erase_line(aR_ arg[0]);
2575 break; 2570 break;
… …
2596 2591
2597 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2592 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2598 arg[0] = -arg[0]; 2593 arg[0] = -arg[0];
2599 /* FALLTHROUGH */ 2594 /* FALLTHROUGH */
2600 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2595 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2601 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2596 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2602 break; 2597 break;
2603 2598
2604 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2599 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2605 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2600 R->tt_write((const unsigned char *)VT100_ANS,
2606 (unsigned int)(sizeof(VT100_ANS) - 1)); 2601 (unsigned int)(sizeof(VT100_ANS) - 1));
2607 break; 2602 break;
2608 2603
2609 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2604 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2610 rxvt_process_sgr_mode(aR_ nargs, arg); 2605 rxvt_process_sgr_mode(aR_ nargs, arg);
2611 break; 2606 break;
2612 2607
2613 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2608 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2614 switch (arg[0]) { 2609 switch (arg[0]) {
2615 case 5: /* DSR requested */ 2610 case 5: /* DSR requested */
2616 rxvt_tt_printf(aR_ "\033[0n"); 2611 R->tt_printf("\033[0n");
2617 break; 2612 break;
2618 case 6: /* CPR requested */ 2613 case 6: /* CPR requested */
2619 rxvt_scr_report_position(aR); 2614 rxvt_scr_report_position(aR);
2620 break; 2615 break;
2621#if defined (ENABLE_DISPLAY_ANSWER) 2616#if defined (ENABLE_DISPLAY_ANSWER)
2622 case 7: /* unofficial extension */ 2617 case 7: /* unofficial extension */
2623 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2618 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2624 break; 2619 break;
2625#endif 2620#endif
2626 case 8: /* unofficial extension */ 2621 case 8: /* unofficial extension */
2627 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2622 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2628 break; 2623 break;
… …
2697 break; 2692 break;
2698#endif 2693#endif
2699 2694
2700 case CSI_78: /* DECREQTPARM */ 2695 case CSI_78: /* DECREQTPARM */
2701 if (arg[0] == 0 || arg[0] == 1) 2696 if (arg[0] == 0 || arg[0] == 1)
2702 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2697 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2703 /* FALLTHROUGH */ 2698 /* FALLTHROUGH */
2704 2699
2705 default: 2700 default:
2706 break; 2701 break;
2707 } 2702 }
… …
2745 break; 2740 break;
2746 case 6: /* lower window */ 2741 case 6: /* lower window */
2747 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2742 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2748 break; 2743 break;
2749 case 7: /* refresh window */ 2744 case 7: /* refresh window */
2750 rxvt_scr_touch(aR_ True); 2745 R->scr_touch (true);
2751 break; 2746 break;
2752 case 8: /* set size (chars) */ 2747 case 8: /* set size (chars) */
2753 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2748 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2754 (unsigned int)(args[1] * R->TermWin.fheight)); 2749 (unsigned int)(args[1] * R->TermWin.fheight));
2755 break; 2750 break;
… …
2761 /* 2756 /*
2762 * reports - some output format copied from XTerm 2757 * reports - some output format copied from XTerm
2763 */ 2758 */
2764 case 11: /* report window state */ 2759 case 11: /* report window state */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2760 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2766 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2761 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2767 break; 2762 break;
2768 case 13: /* report window position */ 2763 case 13: /* report window position */
2769 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2764 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2770 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2765 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2771 -wattr.border_width, -wattr.border_width, 2766 -wattr.border_width, -wattr.border_width,
2772 &x, &y, &wdummy); 2767 &x, &y, &wdummy);
2773 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2768 R->tt_printf("\033[3;%d;%dt", x, y);
2774 break; 2769 break;
2775 case 14: /* report window size (pixels) */ 2770 case 14: /* report window size (pixels) */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2771 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2777 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2772 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2778 break; 2773 break;
2779 case 18: /* report window size (chars) */ 2774 case 18: /* report window size (chars) */
2780 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2775 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2781 break; 2776 break;
2782#if 0 /* XXX: currently disabled due to security concerns */ 2777#if 0 /* XXX: currently disabled due to security concerns */
2783 case 20: /* report icon label */ 2778 case 20: /* report icon label */
2784 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2779 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2785 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2780 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2781 break;
2787 case 21: /* report window title */ 2782 case 21: /* report window title */
2788 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2783 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2789 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2784 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2790 break; 2785 break;
2791#endif 2786#endif
2792 } 2787 }
2793} 2788}
2794#endif 2789#endif
… …
2966 if (*str != ';') { 2961 if (*str != ';') {
2967#if XPM_BACKGROUND 2962#if XPM_BACKGROUND
2968 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2963 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2969 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2964 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2970#endif 2965#endif
2971 rxvt_scr_touch(aR_ True); 2966 R->scr_touch (true);
2972 } 2967 }
2973 while ((str = STRCHR(str, ';')) != NULL) { 2968 while ((str = STRCHR(str, ';')) != NULL) {
2974 str++; 2969 str++;
2975#if XPM_BACKGROUND 2970#if XPM_BACKGROUND
2976 changed += rxvt_scale_pixmap(aR_ str); 2971 changed += rxvt_scale_pixmap(aR_ str);
… …
2978 } 2973 }
2979 if (changed) { 2974 if (changed) {
2980#ifdef XPM_BACKGROUND 2975#ifdef XPM_BACKGROUND
2981 rxvt_resize_pixmap(aR); 2976 rxvt_resize_pixmap(aR);
2982#endif 2977#endif
2983 rxvt_scr_touch(aR_ True); 2978 R->scr_touch (true);
2984 } 2979 }
2985 break; 2980 break;
2986 2981
2987 case XTerm_restoreFG: 2982 case XTerm_restoreFG:
2988 rxvt_set_window_color(aR_ Color_fg, str); 2983 rxvt_set_window_color(aR_ Color_fg, str);
… …
3154 break; 3149 break;
3155#endif 3150#endif
3156#ifdef scrollBar_esc 3151#ifdef scrollBar_esc
3157 case scrollBar_esc: 3152 case scrollBar_esc:
3158 if (rxvt_scrollbar_mapping(aR_ state)) { 3153 if (rxvt_scrollbar_mapping(aR_ state)) {
3159 rxvt_resize_all_windows(aR_ 0, 0, 0); 3154 R->resize_all_windows (0, 0, 0);
3160 rxvt_scr_touch(aR_ True); 3155 R->scr_touch (true);
3161 } 3156 }
3162 break; 3157 break;
3163#endif 3158#endif
3164 case 25: /* visible/invisible cursor */ 3159 case 25: /* visible/invisible cursor */
3165 rxvt_scr_cursor_visible(aR_ state); 3160 rxvt_scr_cursor_visible(aR_ state);
… …
3191 else 3186 else
3192 R->Options &= ~Opt_scrollTtyKeypress; 3187 R->Options &= ~Opt_scrollTtyKeypress;
3193 break; 3188 break;
3194 case 1047: /* secondary screen w/ clearing */ 3189 case 1047: /* secondary screen w/ clearing */
3195 if (R->current_screen != PRIMARY) 3190 if (R->current_screen != PRIMARY)
3196 rxvt_scr_erase_screen(aR_ 2); 3191 R->scr_erase_screen (2);
3197 rxvt_scr_change_screen(aR_ state); 3192 rxvt_scr_change_screen(aR_ state);
3198 /* FALLTHROUGH */ 3193 /* FALLTHROUGH */
3199 default: 3194 default:
3200 break; 3195 break;
3201 } 3196 }
… …
3337{ 3332{
3338 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3333 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3339 3334
3340#ifndef RXVT_GRAPHICS 3335#ifndef RXVT_GRAPHICS
3341 if (cmd == 'Q') { /* query graphics */ 3336 if (cmd == 'Q') { /* query graphics */
3342 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3337 R->tt_printf("\033G0\n"); /* no graphics */
3343 return; 3338 return;
3344 } 3339 }
3345/* swallow other graphics sequences until terminating ':' */ 3340/* swallow other graphics sequences until terminating ':' */
3346 do 3341 do
3347 ch = rxvt_cmd_getc(aR); 3342 ch = rxvt_cmd_getc(aR);
… …
3350 unsigned int nargs; 3345 unsigned int nargs;
3351 int args[NGRX_PTS]; 3346 int args[NGRX_PTS];
3352 unsigned char *text = NULL; 3347 unsigned char *text = NULL;
3353 3348
3354 if (cmd == 'Q') { /* query graphics */ 3349 if (cmd == 'Q') { /* query graphics */
3355 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3350 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3356 return; 3351 return;
3357 } 3352 }
3358 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3353 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3359 int neg; 3354 int neg;
3360 3355
… …
3375 } 3370 }
3376 3371
3377 if ((cmd == 'T') && (nargs >= 5)) { 3372 if ((cmd == 'T') && (nargs >= 5)) {
3378 int i, len = args[4]; 3373 int i, len = args[4];
3379 3374
3380 text = rxvt_malloc((len + 1) * sizeof(char)); 3375 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3381 3376
3382 if (text != NULL) { 3377 if (text != NULL) {
3383 for (i = 0; i < len; i++) 3378 for (i = 0; i < len; i++)
3384 text[i] = rxvt_cmd_getc(aR); 3379 text[i] = rxvt_cmd_getc(aR);
3385 text[len] = '\0'; 3380 text[len] = '\0';
… …
3394 3389
3395/* 3390/*
3396 * Send printf() formatted output to the command. 3391 * Send printf() formatted output to the command.
3397 * Only use for small amounts of data. 3392 * Only use for small amounts of data.
3398 */ 3393 */
3399/* EXTPROTO */
3400void 3394void
3401rxvt_tt_printf(pR_ const char *fmt,...) 3395rxvt_term::tt_printf (const char *fmt,...)
3402{ 3396{
3403 va_list arg_ptr; 3397 va_list arg_ptr;
3404 unsigned char buf[256]; 3398 unsigned char buf[256];
3405 3399
3406 va_start(arg_ptr, fmt); 3400 va_start (arg_ptr, fmt);
3407 vsprintf((char *)buf, fmt, arg_ptr); 3401 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3408 va_end(arg_ptr); 3402 va_end (arg_ptr);
3409 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3403 tt_write (buf, STRLEN (buf));
3410} 3404}
3411 3405
3412/* ---------------------------------------------------------------------- */ 3406/* ---------------------------------------------------------------------- */
3413/* Addresses pasting large amounts of data and rxvt hang
3414 * code pinched from xterm (v_write()) and applied originally to
3415 * rxvt-2.18 - Hops
3416 * Write data to the pty as typed by the user, pasted with the mouse, 3407/* Write data to the pty as typed by the user, pasted with the mouse,
3417 * or generated by us in response to a query ESC sequence. 3408 * or generated by us in response to a query ESC sequence.
3418 */ 3409 */
3419/* EXTPROTO */
3420void 3410void
3421rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3411rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3422{ 3412{
3423#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3413 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3424 int riten;
3425 unsigned int p;
3426 unsigned char *v_buffer, /* start of physical buffer */
3427 *v_bufstr, /* start of current buffer pending */
3428 *v_bufptr, /* end of current buffer pending */
3429 *v_bufend; /* end of physical buffer */
3430 3414
3431 if (R->v_bufstr == NULL && len > 0) { 3415 if (len)
3432 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3433 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3434 v_bufend = v_buffer + p;
3435 } else {
3436 v_buffer = R->v_buffer;
3437 v_bufstr = R->v_bufstr;
3438 v_bufptr = R->v_bufptr;
3439 v_bufend = R->v_bufend;
3440 } 3416 {
3417 if (v_buflen == 0)
3418 {
3419 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3420 if (written == len)
3421 return;
3441 3422
3442 /* 3423 data += written;
3443 * Append to the block we already have. Always doing this simplifies the 3424 len -= written;
3444 * code, and isn't too bad, either. If this is a short block, it isn't 3425 }
3445 * too expensive, and if this is a long block, we won't be able to write 3426
3446 * it all anyway. 3427
3447 */ 3428 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3448 if (len > 0) { 3429
3449 if (v_bufend < v_bufptr + len) { /* run out of room */ 3430 memcpy (v_buffer + v_buflen, data, len);
3450 if (v_bufstr != v_buffer) { 3431 v_buflen += len;
3451 /* there is unused space, move everything down */
3452 MEMMOVE(v_buffer, v_bufstr,
3453 (unsigned int)(v_bufptr - v_bufstr));
3454 v_bufptr -= v_bufstr - v_buffer;
3455 v_bufstr = v_buffer;
3456 } 3432 }
3457 if (v_bufend < v_bufptr + len) {
3458 /* still won't fit: get more space */
3459 /* use most basic realloc because an error is not fatal. */
3460 unsigned int size = v_bufptr - v_buffer;
3461 unsigned int reallocto;
3462 3433
3463 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3434 for (;;)
3464 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3435 {
3465 /* save across realloc */ 3436 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3466 if (v_buffer) { 3437
3467 v_bufstr = v_buffer; 3438 if (written > 0)
3468 v_bufptr = v_buffer + size; 3439 {
3469 v_bufend = v_buffer + reallocto; 3440 v_buflen -= written;
3470 } else { /* no memory: ignore entire write request */ 3441
3471 rxvt_print_error("data loss: cannot allocate buffer space"); 3442 if (v_buflen == 0)
3472 v_buffer = v_bufstr; /* restore clobbered pointer */ 3443 {
3473 } 3444 free (v_buffer);
3445 v_buffer = 0;
3446 v_buflen = 0;
3447
3448 pty_ev.set (EVENT_READ);
3449 return;
3450 }
3451
3452 memmove (v_buffer, v_buffer + written, v_buflen);
3453 }
3454 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3455 // original code just ignores this...
3456 destroy ();
3457 else
3458 {
3459 pty_ev.set (EVENT_READ | EVENT_WRITE);
3460 return;
3461 }
3474 } 3462 }
3475 }
3476 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3477 MEMCPY(v_bufptr, d, len);
3478 v_bufptr += len;
3479 }
3480 }
3481
3482 /*
3483 * Write out as much of the buffer as we can.
3484 * Be careful not to overflow the pty's input silo.
3485 * We are conservative here and only write a small amount at a time.
3486 *
3487 * If we can't push all the data into the pty yet, we expect write
3488 * to return a non-negative number less than the length requested
3489 * (if some data written) or -1 and set errno to EAGAIN,
3490 * EWOULDBLOCK, or EINTR (if no data written).
3491 *
3492 * (Not all systems do this, sigh, so the code is actually
3493 * a little more forgiving.)
3494 */
3495 if ((p = v_bufptr - v_bufstr) > 0) {
3496 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3497 if (riten < 0)
3498 riten = 0;
3499 v_bufstr += riten;
3500 if (v_bufstr >= v_bufptr) /* we wrote it all */
3501 v_bufstr = v_bufptr = v_buffer;
3502 }
3503 /*
3504 * If we have lots of unused memory allocated, return it
3505 */
3506 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3507 /* save pointers across realloc */
3508 unsigned int start = v_bufstr - v_buffer;
3509 unsigned int size = v_bufptr - v_buffer;
3510 unsigned int reallocto;
3511
3512 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3513 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3514 if (v_buffer) {
3515 v_bufstr = v_buffer + start;
3516 v_bufptr = v_buffer + size;
3517 v_bufend = v_buffer + reallocto;
3518 } else {
3519 /* should we print a warning if couldn't return memory? */
3520 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3521 }
3522 }
3523 R->v_buffer = v_buffer;
3524 R->v_bufstr = v_bufstr;
3525 R->v_bufptr = v_bufptr;
3526 R->v_bufend = v_bufend;
3527} 3463}
3464
3528/*----------------------- end-of-file (C source) -----------------------*/ 3465/*----------------------- end-of-file (C source) -----------------------*/
3529 3466

Diff Legend

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