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.7 by pcg, Tue Nov 25 17:34:47 2003 UTC vs.
Revision 1.31 by pcg, Thu Jan 29 23:26:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.7 2003/11/25 17:34:47 pcg Exp $ 4 * $Id: command.C,v 1.31 2004/01/29 23:26:01 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
61 unsigned int newlen; 63 unsigned int newlen;
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66#ifdef USE_XIM
67 int valid_keysym; 68 int valid_keysym;
68#endif 69 unsigned char kbuf[KBUFSZ];
69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 81 if (R->numlock_state || (ev->state & R->ModNumLockMask))
82 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 83 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 84 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 85 }
86
87 kbuf[0] = 0;
88
84#ifdef USE_XIM 89#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 90 if (R->Input_Context)
91 {
86 Status status_return; 92 Status status_return;
87 93
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0)
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
92#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
95#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
96 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
127 }
98 } else { 128 else
129#endif
130 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 132 valid_keysym = !len;
102 } 133 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 134
120#ifdef USE_XIM
121 if (valid_keysym) 135 if (valid_keysym)
122#endif
123 { 136 {
124/* for some backwards compatibility */ 137/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
127 if (ctrl) { 140 if (ctrl)
128# else 141# else
129 if (meta) { 142 if (meta)
130# endif 143# endif
144 {
131 if (keysym == R->ks_bigfont) { 145 if (keysym == R->ks_bigfont)
146 {
132 rxvt_change_font(aR_ 0, FONT_UP); 147 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 148 return;
149 }
134 } else if (keysym == R->ks_smallfont) { 150 else if (keysym == R->ks_smallfont)
151 {
135 rxvt_change_font(aR_ 0, FONT_DN); 152 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 153 return;
137 } 154 }
138 } 155 }
139#endif 156#endif
140 157
141 if (R->TermWin.saveLines) { 158 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 254 /* escape prefix */
238 if (meta) 255 if (meta)
239# ifdef META8_OPTION 256# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 257 if (R->meta_char == C0_ESC)
241# endif 258# endif
242 rxvt_tt_write(aR_ &ch, 1); 259 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 260 R->tt_write (kbuf0, l);
244 return; 261 return;
245 } else 262 } else
246#endif 263#endif
247 { 264 {
248 newlen = 1; 265 newlen = 1;
… …
572 if (R->greek_mode) 589 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 590 len = greek_xlat(kbuf, len);
574#endif 591#endif
575 /* nil */ ; 592 /* nil */ ;
576 } 593 }
577 } 594 }
578 595
579 if (len <= 0) 596 if (len <= 0)
580 return; /* not mapped */ 597 return; /* not mapped */
581 598
582 if (R->Options & Opt_scrollTtyKeypress) 599 if (R->Options & Opt_scrollTtyKeypress)
… …
605 && (R->meta_char == C0_ESC) 622 && (R->meta_char == C0_ESC)
606#endif 623#endif
607 ) { 624 ) {
608 const unsigned char ch = C0_ESC; 625 const unsigned char ch = C0_ESC;
609 626
610 rxvt_tt_write(aR_ &ch, 1); 627 R->tt_write(&ch, 1);
611 } 628 }
612#ifdef DEBUG_CMD 629#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 630 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 631 char *p;
615 int i; 632 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
621 } 638 }
622#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
624} 641}
625/*}}} */ 642/*}}} */
626 643
627#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
659 676
660void 677void
678rxvt_term::flush ()
679{
680#ifdef TRANSPARENT
681 if (want_full_refresh)
682 {
683 want_full_refresh = 0;
684 scr_clear ();
685 scr_touch (false);
686 want_refresh = 1;
687 }
688#endif
689
690 if (want_refresh)
691 {
692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM
695 rxvt_IMSendSpot (this);
696#endif
697 }
698
699 XFlush (Xdisplay);
700}
701
702void
703rxvt_term::check_cb (check_watcher &w)
704{
705 SET_R (this);
706 SET_LOCALE (locale);
707
708 flush ();
709}
710
711void
661rxvt_term::process_x_events () 712rxvt_term::process_x_events ()
662{ 713{
663 do 714 do
664 { 715 {
665 XEvent xev; 716 XEvent xev;
666 717
667 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
668 719
669#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
671 && xev.type == KeyPress)
672 { 722 {
673 if (hidden_cursor) 723 if (hidden_cursor)
674 { 724 {
675 hidden_cursor = 0; 725 hidden_cursor = 0;
676 want_refresh = 1; 726 want_refresh = 1;
677 } 727 }
678 728
679 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
680 } 730 }
681#endif 731#endif
682 732
683#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
684 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
685 && (pointerBlankDelay > 0))
686 { 735 {
687 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
688 || xev.type == ButtonPress 737 || xev.type == ButtonPress
689 || xev.type == ButtonRelease) 738 || xev.type == ButtonRelease)
690 if (hidden_pointer) 739 if (hidden_pointer)
… …
701 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
702 } 751 }
703 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
704} 753}
705 754
755#ifdef CURSOR_BLINK
706void 756void
707rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
708{ 758{
709 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 760 want_refresh = 1;
712 flush(); 761
762 w.start (w.at + BLINK_INTERVAL);
713} 763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_term::text_blink_cb (time_watcher &w)
769{
770 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 {
772 hidden_text = !hidden_text;
773 want_refresh = 1;
774 w.start (w.at + TEXT_BLINK_INTERVAL);
775 }
776}
777#endif
714 778
715void 779void
716rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
717{ 781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
718 process_x_events (); 785 process_x_events ();
786}
719 787
720 flush (); 788bool
789rxvt_term::pty_fill ()
790{
791 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
792
793 memmove (cmdbuf_base, cmdbuf_ptr, n);
794 cmdbuf_ptr = cmdbuf_base;
795 cmdbuf_endp = cmdbuf_ptr + n;
796
797 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
798
799 if (n > 0)
800 {
801 cmdbuf_endp += n;
802 return true;
803 }
804 else if (n < 0 && errno != EAGAIN)
805 destroy ();
806
807 return false;
808}
809
810void
811rxvt_term::pty_cb (io_watcher &w, short revents)
812{
813 SET_R (this);
814 SET_LOCALE (locale);
815
816 if (revents & EVENT_WRITE)
817 tt_write (0, 0);
818 else if (revents & EVENT_READ)
819 {
820 bool flag = true;
821
822 // loop, but don't allow a single term to monopolize us
823 // the number of loops is fully arbitrary, and thus wrong
824 while (flag && pty_fill ())
825 {
826 if (!seen_input)
827 {
828 seen_input = 1;
829 /* once we know the shell is running, send the screen size. Again! */
830 tt_winch ();
831 }
832
833 uint32_t ch = NOCHAR;
834
835 for (;;)
836 {
837 if (ch == NOCHAR)
838 ch = next_char ();
839
840 if (ch == NOCHAR) // TODO: improve
841 break;
842
843 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
844 {
845 /* Read a text string from the input buffer */
846 uint32_t buf[BUFSIZ];
847 bool refreshnow = false;
848 int nlines = 0;
849 uint32_t *str = buf;
850
851 *str++ = ch;
852
853 for (;;)
854 {
855 ch = next_char ();
856
857 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
858 break;
859 else
860 {
861 *str++ = ch;
862
863 if (ch == '\n')
864 {
865 nlines++;
866 refresh_count++;
867
868 if (!(Options & Opt_jumpScroll)
869 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
870 {
871 refreshnow = true;
872 flag = false;
873 ch = NOCHAR;
874 break;
875 }
876 }
877
878 if (str >= buf + BUFSIZ)
879 {
880 ch = NOCHAR;
881 break;
882 }
883 }
884 }
885
886 rxvt_scr_add_lines (this, buf, nlines, str - buf);
887
888 /*
889 * If there have been a lot of new lines, then update the screen
890 * What the heck I'll cheat and only refresh less than every page-full.
891 * the number of pages between refreshes is refresh_limit, which
892 * is incremented here because we must be doing flat-out scrolling.
893 *
894 * refreshing should be correct for small scrolls, because of the
895 * time-out
896 */
897 if (refreshnow)
898 {
899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
900 refresh_limit++;
901
902 scr_refresh (refresh_type);
903 }
904
905 }
906 else
907 {
908 switch (ch)
909 {
910 default:
911 rxvt_process_nonprinting (this, ch);
912 break;
913 case C0_ESC: /* escape char */
914 rxvt_process_escape_seq (this);
915 break;
916 /*case 0x9b: */ /* CSI */
917 /* rxvt_process_csi_seq (this); */
918 }
919
920 ch = NOCHAR;
921 }
922 }
923 }
924 }
721} 925}
722 926
723// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
725uint32_t 929uint32_t
726rxvt_term::next_char () 930rxvt_term::next_char ()
727{ 931{
728 struct mbstate &s = mbstate;
729
730 while (cmdbuf_ptr < cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
731 { 933 {
732 uint8_t ch = *cmdbuf_ptr; 934 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++; 935 return *cmdbuf_ptr++;
758 936
759 /* first byte */ 937 wchar_t wc;
760 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
761 s.reg = ch; 939
762 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
763 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
764 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
765 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
766 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
767 } 945
768 else 946 // assume wchar == unicode
769 { 947 cmdbuf_ptr += len;
770 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
771 return ch; 948 return wc;
772 }
773 } 949 }
774 950
775 return NOCHAR; 951 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} 952}
928 953
929/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
930/* 955/*
931 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
… …
942 return c; 967 return c;
943 968
944 // incomplete sequences should occur rarely, still, a better solution 969 // incomplete sequences should occur rarely, still, a better solution
945 // would be preferred. either setjmp/longjmp or better design. 970 // would be preferred. either setjmp/longjmp or better design.
946 fcntl (R->cmd_fd, F_SETFL, 0); 971 fcntl (R->cmd_fd, F_SETFL, 0);
947 R->pty_fill (1); 972 R->pty_fill ();
948 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
949 } 974 }
950 975
951#if 0 976#if 0
952#define TIMEOUT_USEC 5000 977#define TIMEOUT_USEC 5000
… …
960 985
961 for (;;) { 986 for (;;) {
962 /* loop until we can return something */ 987 /* loop until we can return something */
963 988
964 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
965 rxvt_tt_write(aR_ NULL, 0); 990 R->tt_write(NULL, 0);
966 991
967#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
968 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
969 quick_timeout = 1; 994 quick_timeout = 1;
970 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
… …
980 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
981 quick_timeout = 1; 1006 quick_timeout = 1;
982 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
983 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
984 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
985 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
986 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
987 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1; 1014 R->want_refresh = 1;
990 } 1015 }
… …
1006 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1007#endif 1032#endif
1008#endif 1033#endif
1009} 1034}
1010 1035
1036#ifdef POINTER_BLANK
1011void 1037void
1012rxvt_term::pointer_unblank () 1038rxvt_term::pointer_unblank ()
1013{ 1039{
1014 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1015 rxvt_recolour_cursor (this); 1041 recolour_cursor ();
1016 1042
1017#ifdef POINTER_BLANK
1018 hidden_pointer = 0; 1043 hidden_pointer = 0;
1019 1044
1020 if (Options & Opt_pointerBlank) 1045 if (Options & Opt_pointerBlank)
1021 pointer_ev.start (NOW + pointerBlankDelay); 1046 pointer_ev.start (NOW + pointerBlankDelay);
1022#endif
1023} 1047}
1024 1048
1025#ifdef POINTER_BLANK
1026void 1049void
1027rxvt_term::pointer_blank () 1050rxvt_term::pointer_blank ()
1028{ 1051{
1029 pointer_ev.stop ();
1030
1031 if (!(Options & Opt_pointerBlank)) 1052 if (!(Options & Opt_pointerBlank))
1032 return; 1053 return;
1033 1054
1034 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1035 XFlush (Xdisplay); 1056 XFlush (Xdisplay);
… …
1038} 1059}
1039 1060
1040void 1061void
1041rxvt_term::pointer_cb (time_watcher &w) 1062rxvt_term::pointer_cb (time_watcher &w)
1042{ 1063{
1064 SET_R (this);
1065 SET_LOCALE (locale);
1066
1043 pointer_blank (); 1067 pointer_blank ();
1044} 1068}
1045#endif 1069#endif
1046 1070
1047/* INTPROTO */ 1071/* INTPROTO */
… …
1051 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1052 int x, y; 1076 int x, y;
1053 1077
1054 x = ev->x; 1078 x = ev->x;
1055 y = ev->y; 1079 y = ev->y;
1056 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1057 1081
1058 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1059 button_number = 3; 1083 button_number = 3;
1060 } else { 1084 } else {
1061 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1101 fprintf(stderr, "]: <%d>, %d/%d\n", 1125 fprintf(stderr, "]: <%d>, %d/%d\n",
1102 button_number, 1126 button_number,
1103 x + 1, 1127 x + 1,
1104 y + 1); 1128 y + 1);
1105#else 1129#else
1106 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1130 R->tt_printf("\033[M%c%c%c",
1107 (32 + button_number + key_state), 1131 (32 + button_number + key_state),
1108 (32 + x + 1), 1132 (32 + x + 1),
1109 (32 + y + 1)); 1133 (32 + y + 1));
1110#endif 1134#endif
1111} 1135}
… …
1128{ 1152{
1129 int i, want_timeout; 1153 int i, want_timeout;
1130 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1131 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1132 unsigned int unused_mask; 1156 unsigned int unused_mask;
1133 struct timeval tp;
1134 1157
1135#ifdef DEBUG_X 1158#ifdef DEBUG_X
1136 const char *const eventnames[] = 1159 const char *const eventnames[] =
1137 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1138 "", 1161 "",
… …
1169 "SelectionNotify", 1192 "SelectionNotify",
1170 "ColormapNotify", 1193 "ColormapNotify",
1171 "ClientMessage", 1194 "ClientMessage",
1172 "MappingNotify" 1195 "MappingNotify"
1173 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1174 struct tm *ltt; 1201 struct tm *ltt;
1175#endif
1176
1177 /*
1178 * check if we need to get the time for any timeouts
1179 */
1180
1181 for (i = NUM_TIMEOUTS; i--; )
1182 if (R->timeout[i].tv_sec) {
1183 want_timeout = 1;
1184 break;
1185 }
1186
1187#ifndef DEBUG_X
1188 if (want_timeout)
1189#endif
1190 (void)gettimeofday(&tp, NULL); 1202 (void)gettimeofday(&tp, NULL);
1191
1192#ifdef DEBUG_X
1193 ltt = localtime(&(tp.tv_sec)); 1203 ltt = localtime(&(tp.tv_sec));
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)); 1204 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1195#endif 1205#endif
1196
1197 /* X event timeouts */
1198 if (want_timeout)
1199 for (i = NUM_TIMEOUTS; i--; ) {
1200 if (R->timeout[i].tv_sec == 0)
1201 continue;
1202 if ((tp.tv_sec < R->timeout[i].tv_sec)
1203 || (tp.tv_sec == R->timeout[i].tv_sec
1204 && tp.tv_usec < R->timeout[i].tv_usec))
1205 continue;
1206 R->timeout[i].tv_sec = 0;
1207 switch(i) {
1208 case TIMEOUT_INCR:
1209 rxvt_print_error("data loss: timeout on INCR selection paste");
1210 R->selection_wait = Sel_none;
1211 break;
1212 default:
1213 break;
1214 }
1215 }
1216 1206
1217 switch (ev->type) { 1207 switch (ev->type) {
1218 case KeyPress: 1208 case KeyPress:
1219 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1220 break; 1210 break;
… …
1244 break; 1234 break;
1245 1235
1246 case ClientMessage: 1236 case ClientMessage:
1247 if (ev->xclient.format == 32 1237 if (ev->xclient.format == 32
1248 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1249 exit(EXIT_SUCCESS); 1239 R->destroy ();
1250#ifdef OFFIX_DND 1240#ifdef OFFIX_DND
1251 /* OffiX Dnd (drag 'n' drop) protocol */ 1241 /* OffiX Dnd (drag 'n' drop) protocol */
1252 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1253 && (ev->xclient.data.l[0] == DndFile 1243 && (ev->xclient.data.l[0] == DndFile
1254 || ev->xclient.data.l[0] == DndDir 1244 || ev->xclient.data.l[0] == DndDir
1255 || ev->xclient.data.l[0] == DndLink)) { 1245 || ev->xclient.data.l[0] == DndLink)) {
1256 /* Get Dnd data */ 1246 /* Get Dnd data */
1257 Atom ActualType; 1247 Atom ActualType;
… …
1289 * in the GraphicsExpose parts, which means that after each refresh, 1279 * in the GraphicsExpose parts, which means that after each refresh,
1290 * we need to wait for the graphics expose or Noexpose events, 1280 * we need to wait for the graphics expose or Noexpose events,
1291 * which ought to make things real slow! 1281 * which ought to make things real slow!
1292 */ 1282 */
1293 case VisibilityNotify: 1283 case VisibilityNotify:
1294 switch (ev->xvisibility.state) { 1284 switch (ev->xvisibility.state)
1285 {
1295 case VisibilityUnobscured: 1286 case VisibilityUnobscured:
1296 R->refresh_type = FAST_REFRESH; 1287 R->refresh_type = FAST_REFRESH;
1297 break; 1288 break;
1298 case VisibilityPartiallyObscured: 1289 case VisibilityPartiallyObscured:
1299 R->refresh_type = SLOW_REFRESH; 1290 R->refresh_type = SLOW_REFRESH;
1300 break; 1291 break;
1301 default: 1292 default:
1302 R->refresh_type = NO_REFRESH; 1293 R->refresh_type = NO_REFRESH;
1303 break; 1294 break;
1304 } 1295 }
1305 break; 1296 break;
1306 1297
1307 case FocusIn: 1298 case FocusIn:
1308 if (!R->TermWin.focus) { 1299 if (!R->TermWin.focus) {
1309 R->TermWin.focus = 1; 1300 R->TermWin.focus = 1;
… …
1312 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1313 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1314#endif 1305#endif
1315#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1316 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1317 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1318#endif 1309#endif
1319 } 1310 }
1320 break; 1311 break;
1321 1312
1322 case FocusOut: 1313 case FocusOut:
… …
1327 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1328 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1329#endif 1320#endif
1330#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1331 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1332 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1333 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1334#endif 1325#endif
1335 } 1326 }
1336 break; 1327 break;
1337 1328
… …
1345 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1346 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1347 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1348 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1349 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1350 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1351 (unsigned int)height, 1);
1352 } 1342 }
1353#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1354 else { 1344 else {
1355 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1356 } 1346 }
… …
1379 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1380 break; 1370 break;
1381 1371
1382 case UnmapNotify: 1372 case UnmapNotify:
1383 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1384 break; 1377 break;
1385 1378
1386 case MapNotify: 1379 case MapNotify:
1387 R->TermWin.mapped = 1; 1380 R->TermWin.mapped = 1;
1381#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif
1388 break; 1384 break;
1389 1385
1390 case PropertyNotify: 1386 case PropertyNotify:
1391 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1392 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1415 1411
1416 case GraphicsExpose: 1412 case GraphicsExpose:
1417 case Expose: 1413 case Expose:
1418 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1419#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1420 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1421 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1422#else 1418#else
1423 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1424 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1425 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1426 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1427 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1428#endif 1424#endif
1429 R->want_refresh = 1; 1425 R->want_refresh = 1;
1430 } else { 1426 } else {
… …
1435 &unused_xevent)) ; 1431 &unused_xevent)) ;
1436 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1437 GraphicsExpose, 1433 GraphicsExpose,
1438 &unused_xevent)) ; 1434 &unused_xevent)) ;
1439 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1440 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1441 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1442 } 1438 }
1443#ifdef MENUBAR 1439#ifdef MENUBAR
1444 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1445 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
… …
1475 &unused_mask); 1471 &unused_mask);
1476#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1477 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1478 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1479#endif 1475#endif
1480 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1481 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1482#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1483 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1484 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1485 int dist; 1481 int dist;
… …
1534 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1535 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1536 &unused_mask); 1532 &unused_mask);
1537 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1538 scrollbar_size()); 1534 scrollbar_size());
1539 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1540 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1541 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1542 } 1538 }
1543 break; 1539 break;
1544 } 1540 }
… …
1546 1542
1547/* INTPROTO */ 1543/* INTPROTO */
1548void 1544void
1549rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1550{ 1546{
1551 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1552 1548
1553 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1554 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1555 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1556/* 1552/*
… …
1558 */ 1554 */
1559 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1560 { 1556 {
1561#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1562 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1563 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1564 else 1560 else
1565#endif 1561#endif
1566 { 1562 {
1567 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1568 if (reportmode) 1564 if (reportmode)
… …
1603 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1604 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1605 switch (ev->button) 1601 switch (ev->button)
1606 { 1602 {
1607 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1608 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1609 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1610 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1611 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1612 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1613 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1614 break; 1623 break;
1615 1624
1616 case Button3: 1625 case Button3:
1617 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1618 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1619 else 1628 else
1620 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1621 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1622 break; 1631 break;
1623 } 1632 }
1624 } 1633 }
1625 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1630/* 1639/*
1631 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1632 */ 1641 */
1633 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1634 { 1643 {
1635 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1636 /* 1645 /*
1637 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1638 * move up if mouse is above slider 1647 * move up if mouse is above slider
1639 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1640 * 1649 *
… …
1652 */ 1661 */
1653 if ((R->scrollBar.style == R_SB_NEXT 1662 if ((R->scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_upButton(ev->y)) 1663 && scrollbarnext_upButton(ev->y))
1655 || (R->scrollBar.style == R_SB_RXVT 1664 || (R->scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_upButton(ev->y))) 1665 && scrollbarrxvt_upButton(ev->y)))
1657 rxvt_tt_printf(aR_ "\033[A"); 1666 R->tt_printf("\033[A");
1658 else if ((R->scrollBar.style == R_SB_NEXT 1667 else if ((R->scrollBar.style == R_SB_NEXT
1659 && scrollbarnext_dnButton(ev->y)) 1668 && scrollbarnext_dnButton(ev->y))
1660 || (R->scrollBar.style == R_SB_RXVT 1669 || (R->scrollBar.style == R_SB_RXVT
1661 && scrollbarrxvt_dnButton(ev->y))) 1670 && scrollbarrxvt_dnButton(ev->y)))
1662 rxvt_tt_printf(aR_ "\033[B"); 1671 R->tt_printf("\033[B");
1663 else 1672 else
1664 switch (ev->button) { 1673 switch (ev->button) {
1665 case Button2: 1674 case Button2:
1666 rxvt_tt_printf(aR_ "\014"); 1675 R->tt_printf("\014");
1667 break; 1676 break;
1668 case Button1: 1677 case Button1:
1669 rxvt_tt_printf(aR_ "\033[6~"); 1678 R->tt_printf("\033[6~");
1670 break; 1679 break;
1671 case Button3: 1680 case Button3:
1672 rxvt_tt_printf(aR_ "\033[5~"); 1681 R->tt_printf("\033[5~");
1673 break; 1682 break;
1674 } 1683 }
1675 } 1684 }
1676 else 1685 else
1677#endif /* NO_SCROLLBAR_REPORT */ 1686#endif /* NO_SCROLLBAR_REPORT */
… …
1693#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1694 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1695#endif 1704#endif
1696 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1697 if (upordown < 0) 1706 if (upordown < 0)
1698 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1699 else 1708 else
1700 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1701 } 1710 }
1702 } else 1711 } else
1703 switch (ev->button) { 1712 switch (ev->button) {
1704 case Button2: 1713 case Button2:
1705 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
… …
1717 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1718 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1719 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1720 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1721 scrollbar_size()); 1730 scrollbar_size());
1722 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1723 break; 1732 break;
1724 1733
1725 case Button1: 1734 case Button1:
1726 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1727 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
… …
1740 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1741# else 1750# else
1742 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1743# endif 1752# endif
1744 else 1753 else
1745 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1746 } else { 1755 } else {
1747 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1748 (R->TermWin.nrow 1757 (R->TermWin.nrow
1749 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1750 / scrollbar_size())); 1759 / scrollbar_size()));
… …
1772 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1773 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1774 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1775 1784
1776 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1777 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1778 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1781#endif 1790#endif
1782 } 1791 }
… …
1819 * when overriding mouse reporting 1828 * when overriding mouse reporting
1820 */ 1829 */
1821 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1822 && R->bypass_keystate 1831 && R->bypass_keystate
1823 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1824 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1825 1834
1826 switch (ev->button) { 1835 switch (ev->button) {
1827 case Button1: 1836 case Button1:
1828 case Button3: 1837 case Button3:
1829 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1833 break; 1842 break;
1834#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1835 case Button4: 1844 case Button4:
1836 case Button5: 1845 case Button5:
1837 { 1846 {
1838 int i, v; 1847 int i;
1848 page_dirn v;
1839 1849
1840 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1841 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1842 i = 1; 1852 i = 1;
1843 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1851 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1852 } 1862 }
1853# endif 1863# endif
1854# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1855 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1856 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1858# else 1868# else
1859 for (; i--;) 1869 while (i--)
1860 { 1870 {
1861 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1864 } 1874 }
1865# endif 1875# endif
1866 } 1876 }
1867 break; 1877 break;
… …
2018 n = 0; 2028 n = 0;
2019 if (pchanged) { 2029 if (pchanged) {
2020 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2021 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2022 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2032 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2023 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2024 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2025 break; 2035 break;
2026 } 2036 }
2027 } 2037 }
2028 } 2038 }
… …
2078 return stream; 2088 return stream;
2079} 2089}
2080 2090
2081/* EXTPROTO */ 2091/* EXTPROTO */
2082int 2092int
2083rxvt_pclose_printer(FILE *stream) 2093rxvt_pclose_printer (FILE *stream)
2084{ 2094{
2085 fflush(stream); 2095 fflush (stream);
2086/* pclose() reported not to work on SunOS 4.1.3 */ 2096/* pclose() reported not to work on SunOS 4.1.3 */
2087# if defined (__sun__) /* TODO: RESOLVE THIS */ 2097# if defined (__sun__) /* TODO: RESOLVE THIS */
2088/* pclose works provided SIGCHLD handler uses waitpid */ 2098/* pclose works provided SIGCHLD handler uses waitpid */
2089 return pclose(stream); /* return fclose (stream); */ 2099 return pclose (stream); /* return fclose (stream); */
2090# else 2100# else
2091 return pclose(stream); 2101 return pclose (stream);
2092# endif 2102# endif
2093} 2103}
2094 2104
2095/* 2105/*
2096 * simulate attached vt100 printer 2106 * simulate attached vt100 printer
… …
2159rxvt_process_nonprinting(pR_ unsigned char ch) 2169rxvt_process_nonprinting(pR_ unsigned char ch)
2160{ 2170{
2161 switch (ch) { 2171 switch (ch) {
2162 case C0_ENQ: /* terminal Status */ 2172 case C0_ENQ: /* terminal Status */
2163 if (R->rs[Rs_answerbackstring]) 2173 if (R->rs[Rs_answerbackstring])
2164 rxvt_tt_write(aR_ 2174 R->tt_write(
2165 (const unsigned char *)R->rs[Rs_answerbackstring], 2175 (const unsigned char *)R->rs[Rs_answerbackstring],
2166 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2167 else 2177 else
2168 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2178 R->tt_write((unsigned char *)VT100_ANS,
2169 (unsigned int)STRLEN(VT100_ANS)); 2179 (unsigned int)STRLEN(VT100_ANS));
2170 break; 2180 break;
2171 case C0_BEL: /* bell */ 2181 case C0_BEL: /* bell */
2172 rxvt_scr_bell(aR); 2182 rxvt_scr_bell(aR);
2173 break; 2183 break;
… …
2221 break; 2231 break;
2222 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2223 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2224 break; 2234 break;
2225 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2226 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2227 break; 2237 break;
2228 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2229 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2230 break; 2240 break;
2231 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2236 row = rxvt_cmd_getc(aR) - ' '; 2246 row = rxvt_cmd_getc(aR) - ' ';
2237 col = rxvt_cmd_getc(aR) - ' '; 2247 col = rxvt_cmd_getc(aR) - ' ';
2238 rxvt_scr_gotorc(aR_ row, col, 0); 2248 rxvt_scr_gotorc(aR_ row, col, 0);
2239 break; 2249 break;
2240 case 'Z': /* identify the terminal type */ 2250 case 'Z': /* identify the terminal type */
2241 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2251 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2242 break; 2252 break;
2243 case '<': /* turn off VT52 mode */ 2253 case '<': /* turn off VT52 mode */
2244 PrivMode(0, PrivMode_vt52); 2254 PrivMode(0, PrivMode_vt52);
2245 break; 2255 break;
2246 case 'F': /* use special graphics character set */ 2256 case 'F': /* use special graphics character set */
… …
2353 rxvt_process_dcs_seq(aR); 2363 rxvt_process_dcs_seq(aR);
2354 break; 2364 break;
2355 2365
2356 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2357 case C1_SCI: /* ESC Z */ 2367 case C1_SCI: /* ESC Z */
2358 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2368 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2359 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2360 break; /* steal obsolete ESC [ c */ 2370 break; /* steal obsolete ESC [ c */
2361 2371
2362 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2363 case C1_CSI: /* ESC [ */ 2373 case C1_CSI: /* ESC [ */
… …
2484 */ 2494 */
2485 if (priv) { 2495 if (priv) {
2486 switch (priv) { 2496 switch (priv) {
2487 case '>': 2497 case '>':
2488 if (ch == CSI_DA) /* secondary device attributes */ 2498 if (ch == CSI_DA) /* secondary device attributes */
2489 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2490 break; 2500 break;
2491 case '?': 2501 case '?':
2492 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2493 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2494 break; 2504 break;
… …
2566 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2567 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2568 break; 2578 break;
2569 2579
2570 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2571 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2572 break; 2582 break;
2573 2583
2574 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2575 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2576 break; 2586 break;
… …
2597 2607
2598 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2599 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2600 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2601 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2602 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2603 break; 2613 break;
2604 2614
2605 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2606 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2607 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
2608 break; 2618 break;
2609 2619
2610 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2611 rxvt_process_sgr_mode(aR_ nargs, arg); 2621 rxvt_process_sgr_mode(aR_ nargs, arg);
2612 break; 2622 break;
2613 2623
2614 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2615 switch (arg[0]) { 2625 switch (arg[0]) {
2616 case 5: /* DSR requested */ 2626 case 5: /* DSR requested */
2617 rxvt_tt_printf(aR_ "\033[0n"); 2627 R->tt_printf("\033[0n");
2618 break; 2628 break;
2619 case 6: /* CPR requested */ 2629 case 6: /* CPR requested */
2620 rxvt_scr_report_position(aR); 2630 rxvt_scr_report_position(aR);
2621 break; 2631 break;
2622#if defined (ENABLE_DISPLAY_ANSWER) 2632#if defined (ENABLE_DISPLAY_ANSWER)
2623 case 7: /* unofficial extension */ 2633 case 7: /* unofficial extension */
2624 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2625 break; 2635 break;
2626#endif 2636#endif
2627 case 8: /* unofficial extension */ 2637 case 8: /* unofficial extension */
2628 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2629 break; 2639 break;
… …
2698 break; 2708 break;
2699#endif 2709#endif
2700 2710
2701 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2702 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2703 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2704 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2705 2715
2706 default: 2716 default:
2707 break; 2717 break;
2708 } 2718 }
… …
2746 break; 2756 break;
2747 case 6: /* lower window */ 2757 case 6: /* lower window */
2748 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2749 break; 2759 break;
2750 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2751 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2752 break; 2762 break;
2753 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2756 break; 2766 break;
… …
2762 /* 2772 /*
2763 * reports - some output format copied from XTerm 2773 * reports - some output format copied from XTerm
2764 */ 2774 */
2765 case 11: /* report window state */ 2775 case 11: /* report window state */
2766 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2767 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2768 break; 2778 break;
2769 case 13: /* report window position */ 2779 case 13: /* report window position */
2770 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2771 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2772 -wattr.border_width, -wattr.border_width, 2782 -wattr.border_width, -wattr.border_width,
2773 &x, &y, &wdummy); 2783 &x, &y, &wdummy);
2774 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2784 R->tt_printf("\033[3;%d;%dt", x, y);
2775 break; 2785 break;
2776 case 14: /* report window size (pixels) */ 2786 case 14: /* report window size (pixels) */
2777 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2778 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2779 break; 2789 break;
2780 case 18: /* report window size (chars) */ 2790 case 18: /* report window size (chars) */
2781 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2791 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2782 break; 2792 break;
2783#if 0 /* XXX: currently disabled due to security concerns */ 2793#if 0 /* XXX: currently disabled due to security concerns */
2784 case 20: /* report icon label */ 2794 case 20: /* report icon label */
2785 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2786 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2787 break; 2797 break;
2788 case 21: /* report window title */ 2798 case 21: /* report window title */
2789 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2790 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2791 break; 2801 break;
2792#endif 2802#endif
2793 } 2803 }
2794} 2804}
2795#endif 2805#endif
… …
2967 if (*str != ';') { 2977 if (*str != ';') {
2968#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2969 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2970 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2971#endif 2981#endif
2972 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2973 } 2983 }
2974 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
2975 str++; 2985 str++;
2976#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
2977 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
2979 } 2989 }
2980 if (changed) { 2990 if (changed) {
2981#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
2982 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
2983#endif 2993#endif
2984 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
2985 } 2995 }
2986 break; 2996 break;
2987 2997
2988 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
2989 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3155 break; 3165 break;
3156#endif 3166#endif
3157#ifdef scrollBar_esc 3167#ifdef scrollBar_esc
3158 case scrollBar_esc: 3168 case scrollBar_esc:
3159 if (rxvt_scrollbar_mapping(aR_ state)) { 3169 if (rxvt_scrollbar_mapping(aR_ state)) {
3160 rxvt_resize_all_windows(aR_ 0, 0, 0); 3170 R->resize_all_windows (0, 0, 0);
3161 rxvt_scr_touch(aR_ True); 3171 R->scr_touch (true);
3162 } 3172 }
3163 break; 3173 break;
3164#endif 3174#endif
3165 case 25: /* visible/invisible cursor */ 3175 case 25: /* visible/invisible cursor */
3166 rxvt_scr_cursor_visible(aR_ state); 3176 rxvt_scr_cursor_visible(aR_ state);
… …
3192 else 3202 else
3193 R->Options &= ~Opt_scrollTtyKeypress; 3203 R->Options &= ~Opt_scrollTtyKeypress;
3194 break; 3204 break;
3195 case 1047: /* secondary screen w/ clearing */ 3205 case 1047: /* secondary screen w/ clearing */
3196 if (R->current_screen != PRIMARY) 3206 if (R->current_screen != PRIMARY)
3197 rxvt_scr_erase_screen(aR_ 2); 3207 R->scr_erase_screen (2);
3198 rxvt_scr_change_screen(aR_ state); 3208 rxvt_scr_change_screen(aR_ state);
3199 /* FALLTHROUGH */ 3209 /* FALLTHROUGH */
3200 default: 3210 default:
3201 break; 3211 break;
3202 } 3212 }
… …
3338{ 3348{
3339 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3349 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3340 3350
3341#ifndef RXVT_GRAPHICS 3351#ifndef RXVT_GRAPHICS
3342 if (cmd == 'Q') { /* query graphics */ 3352 if (cmd == 'Q') { /* query graphics */
3343 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3353 R->tt_printf("\033G0\n"); /* no graphics */
3344 return; 3354 return;
3345 } 3355 }
3346/* swallow other graphics sequences until terminating ':' */ 3356/* swallow other graphics sequences until terminating ':' */
3347 do 3357 do
3348 ch = rxvt_cmd_getc(aR); 3358 ch = rxvt_cmd_getc(aR);
… …
3351 unsigned int nargs; 3361 unsigned int nargs;
3352 int args[NGRX_PTS]; 3362 int args[NGRX_PTS];
3353 unsigned char *text = NULL; 3363 unsigned char *text = NULL;
3354 3364
3355 if (cmd == 'Q') { /* query graphics */ 3365 if (cmd == 'Q') { /* query graphics */
3356 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3366 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3357 return; 3367 return;
3358 } 3368 }
3359 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3369 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3360 int neg; 3370 int neg;
3361 3371
… …
3376 } 3386 }
3377 3387
3378 if ((cmd == 'T') && (nargs >= 5)) { 3388 if ((cmd == 'T') && (nargs >= 5)) {
3379 int i, len = args[4]; 3389 int i, len = args[4];
3380 3390
3381 text = rxvt_malloc((len + 1) * sizeof(char)); 3391 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3382 3392
3383 if (text != NULL) { 3393 if (text != NULL) {
3384 for (i = 0; i < len; i++) 3394 for (i = 0; i < len; i++)
3385 text[i] = rxvt_cmd_getc(aR); 3395 text[i] = rxvt_cmd_getc(aR);
3386 text[len] = '\0'; 3396 text[len] = '\0';
… …
3395 3405
3396/* 3406/*
3397 * Send printf() formatted output to the command. 3407 * Send printf() formatted output to the command.
3398 * Only use for small amounts of data. 3408 * Only use for small amounts of data.
3399 */ 3409 */
3400/* EXTPROTO */
3401void 3410void
3402rxvt_tt_printf(pR_ const char *fmt,...) 3411rxvt_term::tt_printf (const char *fmt,...)
3403{ 3412{
3404 va_list arg_ptr; 3413 va_list arg_ptr;
3405 unsigned char buf[256]; 3414 unsigned char buf[256];
3406 3415
3407 va_start(arg_ptr, fmt); 3416 va_start (arg_ptr, fmt);
3408 vsprintf((char *)buf, fmt, arg_ptr); 3417 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3409 va_end(arg_ptr); 3418 va_end (arg_ptr);
3410 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3419 tt_write (buf, STRLEN (buf));
3411} 3420}
3412 3421
3413/* ---------------------------------------------------------------------- */ 3422/* ---------------------------------------------------------------------- */
3414/* Addresses pasting large amounts of data and rxvt hang
3415 * code pinched from xterm (v_write()) and applied originally to
3416 * rxvt-2.18 - Hops
3417 * Write data to the pty as typed by the user, pasted with the mouse, 3423/* Write data to the pty as typed by the user, pasted with the mouse,
3418 * or generated by us in response to a query ESC sequence. 3424 * or generated by us in response to a query ESC sequence.
3419 */ 3425 */
3420/* EXTPROTO */
3421void 3426void
3422rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3427rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3423{ 3428{
3424#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3429 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3425 int riten;
3426 unsigned int p;
3427 unsigned char *v_buffer, /* start of physical buffer */
3428 *v_bufstr, /* start of current buffer pending */
3429 *v_bufptr, /* end of current buffer pending */
3430 *v_bufend; /* end of physical buffer */
3431 3430
3432 if (R->v_bufstr == NULL && len > 0) { 3431 if (len)
3433 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3434 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3435 v_bufend = v_buffer + p;
3436 } else {
3437 v_buffer = R->v_buffer;
3438 v_bufstr = R->v_bufstr;
3439 v_bufptr = R->v_bufptr;
3440 v_bufend = R->v_bufend;
3441 } 3432 {
3433 if (v_buflen == 0)
3434 {
3435 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3436 if (written == len)
3437 return;
3442 3438
3443 /* 3439 data += written;
3444 * Append to the block we already have. Always doing this simplifies the 3440 len -= written;
3445 * code, and isn't too bad, either. If this is a short block, it isn't 3441 }
3446 * too expensive, and if this is a long block, we won't be able to write 3442
3447 * it all anyway. 3443
3448 */ 3444 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3449 if (len > 0) { 3445
3450 if (v_bufend < v_bufptr + len) { /* run out of room */ 3446 memcpy (v_buffer + v_buflen, data, len);
3451 if (v_bufstr != v_buffer) { 3447 v_buflen += len;
3452 /* there is unused space, move everything down */
3453 MEMMOVE(v_buffer, v_bufstr,
3454 (unsigned int)(v_bufptr - v_bufstr));
3455 v_bufptr -= v_bufstr - v_buffer;
3456 v_bufstr = v_buffer;
3457 } 3448 }
3458 if (v_bufend < v_bufptr + len) {
3459 /* still won't fit: get more space */
3460 /* use most basic realloc because an error is not fatal. */
3461 unsigned int size = v_bufptr - v_buffer;
3462 unsigned int reallocto;
3463 3449
3464 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3450 for (;;)
3465 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3451 {
3466 /* save across realloc */ 3452 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3467 if (v_buffer) { 3453
3468 v_bufstr = v_buffer; 3454 if (written > 0)
3469 v_bufptr = v_buffer + size; 3455 {
3470 v_bufend = v_buffer + reallocto; 3456 v_buflen -= written;
3471 } else { /* no memory: ignore entire write request */ 3457
3472 rxvt_print_error("data loss: cannot allocate buffer space"); 3458 if (v_buflen == 0)
3473 v_buffer = v_bufstr; /* restore clobbered pointer */ 3459 {
3474 } 3460 free (v_buffer);
3461 v_buffer = 0;
3462 v_buflen = 0;
3463
3464 pty_ev.set (EVENT_READ);
3465 return;
3466 }
3467
3468 memmove (v_buffer, v_buffer + written, v_buflen);
3469 }
3470 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3471 // original code just ignores this...
3472 destroy ();
3473 else
3474 {
3475 pty_ev.set (EVENT_READ | EVENT_WRITE);
3476 return;
3477 }
3475 } 3478 }
3476 }
3477 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3478 MEMCPY(v_bufptr, d, len);
3479 v_bufptr += len;
3480 }
3481 }
3482
3483 /*
3484 * Write out as much of the buffer as we can.
3485 * Be careful not to overflow the pty's input silo.
3486 * We are conservative here and only write a small amount at a time.
3487 *
3488 * If we can't push all the data into the pty yet, we expect write
3489 * to return a non-negative number less than the length requested
3490 * (if some data written) or -1 and set errno to EAGAIN,
3491 * EWOULDBLOCK, or EINTR (if no data written).
3492 *
3493 * (Not all systems do this, sigh, so the code is actually
3494 * a little more forgiving.)
3495 */
3496 if ((p = v_bufptr - v_bufstr) > 0) {
3497 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3498 if (riten < 0)
3499 riten = 0;
3500 v_bufstr += riten;
3501 if (v_bufstr >= v_bufptr) /* we wrote it all */
3502 v_bufstr = v_bufptr = v_buffer;
3503 }
3504 /*
3505 * If we have lots of unused memory allocated, return it
3506 */
3507 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3508 /* save pointers across realloc */
3509 unsigned int start = v_bufstr - v_buffer;
3510 unsigned int size = v_bufptr - v_buffer;
3511 unsigned int reallocto;
3512
3513 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3514 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3515 if (v_buffer) {
3516 v_bufstr = v_buffer + start;
3517 v_bufptr = v_buffer + size;
3518 v_bufend = v_buffer + reallocto;
3519 } else {
3520 /* should we print a warning if couldn't return memory? */
3521 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3522 }
3523 }
3524 R->v_buffer = v_buffer;
3525 R->v_bufstr = v_bufstr;
3526 R->v_bufptr = v_bufptr;
3527 R->v_bufend = v_bufend;
3528} 3479}
3480
3529/*----------------------- end-of-file (C source) -----------------------*/ 3481/*----------------------- end-of-file (C source) -----------------------*/
3530 3482

Diff Legend

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