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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.4 by pcg, Tue Nov 25 15:25:16 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.4 2003/11/25 15:25:16 pcg Exp $ 4 * $Id: command.C,v 1.33 2004/01/30 18:12:17 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);
719
668#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
670 && xev.type == KeyPress) { 722 {
671 if (hidden_cursor) { 723 if (hidden_cursor)
724 {
672 hidden_cursor = 0; 725 hidden_cursor = 0;
673 want_refresh = 1; 726 want_refresh = 1;
674 } 727 }
675 want_keypress_time = 1; 728
729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
676 } 730 }
677#endif 731#endif
678 732
679#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
681 && (pointerBlankDelay > 0)) { 735 {
682 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
683 || xev.type == ButtonPress 737 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) { 738 || xev.type == ButtonRelease)
685 if (hidden_pointer) 739 if (hidden_pointer)
686 rxvt_pointer_unblank(aR); 740 pointer_unblank ();
687 want_motion_time = 1; 741
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0) 742 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this); 743 pointer_blank ();
691 } 744 }
692#endif 745#endif
693 746
694#ifdef USE_XIM 747#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window)) 748 if (!XFilterEvent (&xev, xev.xany.window))
696#endif 749#endif
697 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
698 } 751 }
699 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
700} 753}
701 754
755#ifdef CURSOR_BLINK
756void
757rxvt_term::cursor_blink_cb (time_watcher &w)
758{
759 hidden_cursor = !hidden_cursor;
760 want_refresh = 1;
761
762 w.start (w.at + BLINK_INTERVAL);
763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_term::text_blink_cb (time_watcher &w)
769{
770 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 {
772 hidden_text = !hidden_text;
773 want_refresh = 1;
774 w.start (w.at + TEXT_BLINK_INTERVAL);
775 }
776}
777#endif
778
702void 779void
703rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
704{ 781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
705 process_x_events (); 785 process_x_events ();
786}
706 787
707 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 }
708} 925}
709 926
710// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
711// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
712uint32_t 929uint32_t
713rxvt_term::next_char () 930rxvt_term::next_char ()
714{ 931{
715 struct mbstate &s = mbstate;
716
717 while (cmdbuf_ptr < cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
718 { 933 {
719 uint8_t ch = *cmdbuf_ptr; 934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
720
721 if (s.cnt)
722 {
723 if ((ch & 0xc0) == 0x80)
724 {
725 cmdbuf_ptr++;
726
727 /* continuation */
728 s.reg = (s.reg << 6) | (ch & 0x7f);
729
730 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
731 return s.reg;
732
733 continue;
734 }
735 else
736 {
737 s.cnt = 0;
738 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
739 }
740 }
741
742 if ((ch & 0xc0) == 0xc0)
743 {
744 cmdbuf_ptr++; 935 return *cmdbuf_ptr++;
745 936
746 /* first byte */ 937 wchar_t wc;
747 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
748 s.reg = ch; 939
749 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
750 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
751 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
752 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
753 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
754 } 945
755 else 946 // assume wchar == unicode
756 { 947 cmdbuf_ptr += len;
757 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
758 return ch; 948 return wc;
759 }
760 } 949 }
761 950
762 return NOCHAR; 951 return NOCHAR;
763}
764
765bool
766rxvt_term::pty_fill (size_t count)
767{
768 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
769
770 memmove (cmdbuf_base, cmdbuf_ptr, n);
771 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp = cmdbuf_ptr + n;
773
774 n = read (cmd_fd, cmdbuf_endp, count);
775
776 if (n > 0)
777 {
778 cmdbuf_endp += n;
779 return true;
780 }
781 else if (n < 0 && errno == EAGAIN)
782 return false;
783
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786}
787
788void
789rxvt_term::pty_cb (io_watcher &w, short revents)
790{
791 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
792 {
793 /* once we know the shell is running, send the screen size. Again! */
794 //ch = rxvt_cmd_getc(aR); /* wait for something */
795 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
796
797 uint32_t ch = NOCHAR;
798
799 for (;;)
800 {
801 if (ch == NOCHAR)
802 ch = next_char ();
803
804 if (ch == NOCHAR) // TODO: improve
805 break;
806
807 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
808 {
809 /* Read a text string from the input buffer */
810 uint32_t buf[BUFSIZ];
811 bool refreshnow = false;
812 int nlines = 0;
813 uint32_t *str = buf;
814
815 *str++ = ch;
816
817 for (;;)
818 {
819 ch = next_char ();
820
821 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
822 break;
823 else
824 {
825 *str++ = ch;
826
827 if (ch == '\n')
828 {
829 nlines++;
830 refresh_count++;
831
832 if (!(Options & Opt_jumpScroll)
833 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
834 {
835 refreshnow = true;
836 ch = NOCHAR;
837 break;
838 }
839 }
840
841 if (str >= buf + BUFSIZ)
842 {
843 ch = NOCHAR;
844 break;
845 }
846 }
847 }
848
849 rxvt_scr_add_lines (this, buf, nlines, str - buf);
850
851 /*
852 * If there have been a lot of new lines, then update the screen
853 * What the heck I'll cheat and only refresh less than every page-full.
854 * the number of pages between refreshes is refresh_limit, which
855 * is incremented here because we must be doing flat-out scrolling.
856 *
857 * refreshing should be correct for small scrolls, because of the
858 * time-out
859 */
860 if (refreshnow)
861 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++;
864
865 rxvt_scr_refresh (this, refresh_type);
866 }
867
868 }
869 else
870 {
871 switch (ch)
872 {
873 default:
874 rxvt_process_nonprinting (this, ch);
875 break;
876 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this);
878 break;
879 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */
881 }
882
883 ch = NOCHAR;
884 }
885 }
886 }
887
888 flush ();
889}
890
891void
892rxvt_term::flush ()
893{
894#ifdef TRANSPARENT
895 if (want_full_refresh)
896 {
897 want_full_refresh = 0;
898 rxvt_scr_clear (this);
899 rxvt_scr_touch (this, False);
900 want_refresh = 1;
901 }
902#endif
903
904 if (want_refresh)
905 {
906 rxvt_scr_refresh (this, refresh_type);
907 rxvt_scrollbar_show (this, 1);
908#ifdef USE_XIM
909 rxvt_IMSendSpot (this);
910#endif
911 }
912
913 XFlush (Xdisplay);
914} 952}
915 953
916/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
917/* 955/*
918 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
929 return c; 967 return c;
930 968
931 // incomplete sequences should occur rarely, still, a better solution 969 // incomplete sequences should occur rarely, still, a better solution
932 // would be preferred. either setjmp/longjmp or better design. 970 // would be preferred. either setjmp/longjmp or better design.
933 fcntl (R->cmd_fd, F_SETFL, 0); 971 fcntl (R->cmd_fd, F_SETFL, 0);
934 R->pty_fill (1); 972 R->pty_fill ();
935 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936 } 974 }
937 975
976#if 0
938#define TIMEOUT_USEC 5000 977#define TIMEOUT_USEC 5000
939 fd_set readfds; 978 fd_set readfds;
940 int quick_timeout, select_res; 979 int quick_timeout, select_res;
941 int want_motion_time, want_keypress_time; 980 int want_motion_time, want_keypress_time;
942 struct timeval value; 981 struct timeval value;
946 985
947 for (;;) { 986 for (;;) {
948 /* loop until we can return something */ 987 /* loop until we can return something */
949 988
950 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951 rxvt_tt_write(aR_ NULL, 0); 990 R->tt_write(NULL, 0);
952
953#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
954 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
955#endif
956#if defined(CURSOR_BLINK)
957 want_keypress_time = 0;
958#endif
959#if defined(POINTER_BLANK)
960 want_motion_time = 0;
961#endif
962
963 if (XPending (R->Xdisplay))
964 {
965 R->process_x_events ();
966
967 /* in case button actions pushed chars to cmdbuf */
968 if (R->cmdbuf_ptr < R->cmdbuf_endp)
969 return *R->cmdbuf_ptr++;
970 }
971
972#if defined(CURSOR_BLINK)
973 if (want_keypress_time) {
974 (void)gettimeofday(&tp, NULL);
975 R->lastcursorchange.tv_sec = tp.tv_sec;
976 R->lastcursorchange.tv_usec = tp.tv_usec;
977 }
978#endif
979#if defined(POINTER_BLANK)
980 if (want_motion_time) {
981 if (!tp.tv_sec)
982 (void)gettimeofday(&tp, NULL);
983 R->lastmotion.tv_sec = tp.tv_sec;
984 R->lastmotion.tv_usec = tp.tv_usec;
985 }
986#endif
987
988/*
989 * the command input buffer is empty and we have no pending X events
990 */
991 quick_timeout = 0;
992 991
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
995 quick_timeout = 1; 994 quick_timeout = 1;
996 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
1006 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
1007 quick_timeout = 1; 1006 quick_timeout = 1;
1008 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
1009 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1010 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
1011 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
1012 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1013 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1014 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1015 R->want_refresh = 1; 1014 R->want_refresh = 1;
1016 } 1015 }
1026 R->want_refresh = 1; 1025 R->want_refresh = 1;
1027 } 1026 }
1028 } 1027 }
1029#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030 1029
1031 FD_ZERO(&readfds);
1032 FD_SET(R->cmd_fd, &readfds);
1033 FD_SET(R->Xfd, &readfds);
1034 value.tv_usec = TIMEOUT_USEC;
1035 value.tv_sec = 0;
1036
1037 if (!R->TermWin.mapped)
1038 quick_timeout = 0;
1039 else {
1040 quick_timeout |= R->want_refresh;
1041#ifdef TRANSPARENT 1030#ifdef TRANSPARENT
1042 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1043#endif 1032#endif
1044 }
1045
1046#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1047 {
1048 int set_quick_timeout = 0;
1049 long csdiff, psdiff;
1050
1051#define BLINK_TIME 500000L
1052 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1053# if defined(CURSOR_BLINK)
1054 if (R->Options & Opt_cursorBlink) {
1055 if (!tp.tv_sec) /* didn't get it before so get it now */
1056 (void)gettimeofday(&tp, NULL);
1057
1058 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1059 + tp.tv_usec - R->lastcursorchange.tv_usec;
1060 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1061 R->lastcursorchange.tv_sec = tp.tv_sec;
1062 R->lastcursorchange.tv_usec = tp.tv_usec;
1063 R->hidden_cursor = !R->hidden_cursor;
1064 csdiff = 0;
1065 } else
1066 csdiff = BLINK_TIME - csdiff;
1067 set_quick_timeout = 1;
1068 }
1069# endif 1033#endif
1034}
1035
1070# if defined(POINTER_BLANK) 1036#ifdef POINTER_BLANK
1071 /*
1072 * If we haven't moved the pointer for a while
1073 */
1074 if ((R->Options & Opt_pointerBlank)
1075 && (R->pointerBlankDelay > 0)
1076 && (R->hidden_pointer == 0)) {
1077 long pdelay;
1078
1079 if (!tp.tv_sec) /* didn't get it before so get it now */
1080 (void)gettimeofday(&tp, NULL);
1081 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1082 + tp.tv_usec - R->lastmotion.tv_usec;
1083 pdelay = R->pointerBlankDelay * 1000000L;
1084 if (psdiff >= pdelay)
1085 rxvt_pointer_blank(aR);
1086 else {
1087 set_quick_timeout = 1;
1088 psdiff = pdelay - psdiff;
1089 }
1090 }
1091# endif
1092 if (!quick_timeout && set_quick_timeout) {
1093 MIN_IT(csdiff, psdiff);
1094 value.tv_sec = csdiff / 1000000L;
1095 value.tv_usec = csdiff % 1000000L;
1096 quick_timeout = 1;
1097 }
1098 }
1099#endif
1100
1101 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1102 (quick_timeout ? &value : NULL))) == 0) {
1103 /* select statement timed out - we're not hard and fast scrolling */
1104 R->refresh_limit = 1;
1105 }
1106#if defined(CURSOR_BLINK)
1107 if (R->Options & Opt_cursorBlink)
1108 R->want_refresh = 1;
1109#endif
1110 }
1111}
1112
1113/* EXTPROTO */
1114void 1037void
1115rxvt_pointer_unblank(pR) 1038rxvt_term::pointer_unblank ()
1116{ 1039{
1117 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118 rxvt_recolour_cursor(aR); 1041 recolour_cursor ();
1119#ifdef POINTER_BLANK 1042
1120 R->hidden_pointer = 0; 1043 hidden_pointer = 0;
1121 if (R->pointerBlankDelay > 0) {
1122 struct timeval tp;
1123 1044
1124 (void)gettimeofday(&tp, NULL); 1045 if (Options & Opt_pointerBlank)
1125 R->lastmotion.tv_sec = tp.tv_sec; 1046 pointer_ev.start (NOW + pointerBlankDelay);
1126 R->lastmotion.tv_usec = tp.tv_usec;
1127 }
1128#endif
1129} 1047}
1130 1048
1131#ifdef POINTER_BLANK
1132/* INTPROTO */
1133void 1049void
1134rxvt_pointer_blank(pR) 1050rxvt_term::pointer_blank ()
1135{ 1051{
1052 if (!(Options & Opt_pointerBlank))
1053 return;
1054
1136 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137 XFlush(R->Xdisplay); 1056 XFlush (Xdisplay);
1057
1138 R->hidden_pointer = 1; 1058 hidden_pointer = 1;
1059}
1060
1061void
1062rxvt_term::pointer_cb (time_watcher &w)
1063{
1064 SET_R (this);
1065 SET_LOCALE (locale);
1066
1067 pointer_blank ();
1139} 1068}
1140#endif 1069#endif
1141 1070
1142/* INTPROTO */ 1071/* INTPROTO */
1143void 1072void
1146 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1147 int x, y; 1076 int x, y;
1148 1077
1149 x = ev->x; 1078 x = ev->x;
1150 y = ev->y; 1079 y = ev->y;
1151 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1152 1081
1153 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1154 button_number = 3; 1083 button_number = 3;
1155 } else { 1084 } else {
1156 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
1196 fprintf(stderr, "]: <%d>, %d/%d\n", 1125 fprintf(stderr, "]: <%d>, %d/%d\n",
1197 button_number, 1126 button_number,
1198 x + 1, 1127 x + 1,
1199 y + 1); 1128 y + 1);
1200#else 1129#else
1201 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1130 R->tt_printf("\033[M%c%c%c",
1202 (32 + button_number + key_state), 1131 (32 + button_number + key_state),
1203 (32 + x + 1), 1132 (32 + x + 1),
1204 (32 + y + 1)); 1133 (32 + y + 1));
1205#endif 1134#endif
1206} 1135}
1223{ 1152{
1224 int i, want_timeout; 1153 int i, want_timeout;
1225 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1226 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1227 unsigned int unused_mask; 1156 unsigned int unused_mask;
1228 struct timeval tp;
1229 1157
1230#ifdef DEBUG_X 1158#ifdef DEBUG_X
1231 const char *const eventnames[] = 1159 const char *const eventnames[] =
1232 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1233 "", 1161 "",
1264 "SelectionNotify", 1192 "SelectionNotify",
1265 "ColormapNotify", 1193 "ColormapNotify",
1266 "ClientMessage", 1194 "ClientMessage",
1267 "MappingNotify" 1195 "MappingNotify"
1268 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1269 struct tm *ltt; 1201 struct tm *ltt;
1270#endif
1271
1272 /*
1273 * check if we need to get the time for any timeouts
1274 */
1275
1276 for (i = NUM_TIMEOUTS; i--; )
1277 if (R->timeout[i].tv_sec) {
1278 want_timeout = 1;
1279 break;
1280 }
1281
1282#ifndef DEBUG_X
1283 if (want_timeout)
1284#endif
1285 (void)gettimeofday(&tp, NULL); 1202 (void)gettimeofday(&tp, NULL);
1286
1287#ifdef DEBUG_X
1288 ltt = localtime(&(tp.tv_sec)); 1203 ltt = localtime(&(tp.tv_sec));
1289 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 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));
1290#endif 1205#endif
1291
1292 /* X event timeouts */
1293 if (want_timeout)
1294 for (i = NUM_TIMEOUTS; i--; ) {
1295 if (R->timeout[i].tv_sec == 0)
1296 continue;
1297 if ((tp.tv_sec < R->timeout[i].tv_sec)
1298 || (tp.tv_sec == R->timeout[i].tv_sec
1299 && tp.tv_usec < R->timeout[i].tv_usec))
1300 continue;
1301 R->timeout[i].tv_sec = 0;
1302 switch(i) {
1303 case TIMEOUT_INCR:
1304 rxvt_print_error("data loss: timeout on INCR selection paste");
1305 R->selection_wait = Sel_none;
1306 break;
1307 default:
1308 break;
1309 }
1310 }
1311 1206
1312 switch (ev->type) { 1207 switch (ev->type) {
1313 case KeyPress: 1208 case KeyPress:
1314 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1315 break; 1210 break;
1339 break; 1234 break;
1340 1235
1341 case ClientMessage: 1236 case ClientMessage:
1342 if (ev->xclient.format == 32 1237 if (ev->xclient.format == 32
1343 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344 exit(EXIT_SUCCESS); 1239 R->destroy ();
1345#ifdef OFFIX_DND 1240#ifdef OFFIX_DND
1346 /* OffiX Dnd (drag 'n' drop) protocol */ 1241 /* OffiX Dnd (drag 'n' drop) protocol */
1347 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348 && (ev->xclient.data.l[0] == DndFile 1243 && (ev->xclient.data.l[0] == DndFile
1349 || ev->xclient.data.l[0] == DndDir 1244 || ev->xclient.data.l[0] == DndDir
1350 || ev->xclient.data.l[0] == DndLink)) { 1245 || ev->xclient.data.l[0] == DndLink)) {
1351 /* Get Dnd data */ 1246 /* Get Dnd data */
1352 Atom ActualType; 1247 Atom ActualType;
1384 * in the GraphicsExpose parts, which means that after each refresh, 1279 * in the GraphicsExpose parts, which means that after each refresh,
1385 * we need to wait for the graphics expose or Noexpose events, 1280 * we need to wait for the graphics expose or Noexpose events,
1386 * which ought to make things real slow! 1281 * which ought to make things real slow!
1387 */ 1282 */
1388 case VisibilityNotify: 1283 case VisibilityNotify:
1389 switch (ev->xvisibility.state) { 1284 switch (ev->xvisibility.state)
1285 {
1390 case VisibilityUnobscured: 1286 case VisibilityUnobscured:
1391 R->refresh_type = FAST_REFRESH; 1287 R->refresh_type = FAST_REFRESH;
1392 break; 1288 break;
1393 case VisibilityPartiallyObscured: 1289 case VisibilityPartiallyObscured:
1394 R->refresh_type = SLOW_REFRESH; 1290 R->refresh_type = SLOW_REFRESH;
1395 break; 1291 break;
1396 default: 1292 default:
1397 R->refresh_type = NO_REFRESH; 1293 R->refresh_type = NO_REFRESH;
1398 break; 1294 break;
1399 } 1295 }
1400 break; 1296 break;
1401 1297
1402 case FocusIn: 1298 case FocusIn:
1403 if (!R->TermWin.focus) { 1299 if (!R->TermWin.focus) {
1404 R->TermWin.focus = 1; 1300 R->TermWin.focus = 1;
1405 R->want_refresh = 1; 1301 R->want_refresh = 1;
1406#ifdef USE_XIM 1302#ifdef USE_XIM
1407 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1408 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1409#endif 1305#endif
1306#ifdef CURSOR_BLINK
1307 if (R->Options & Opt_cursorBlink)
1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1309#endif
1410 } 1310 }
1411 break; 1311 break;
1412 1312
1413 case FocusOut: 1313 case FocusOut:
1414 if (R->TermWin.focus) { 1314 if (R->TermWin.focus) {
1415 R->TermWin.focus = 0; 1315 R->TermWin.focus = 0;
1416 R->want_refresh = 1; 1316 R->want_refresh = 1;
1417#ifdef USE_XIM 1317#ifdef USE_XIM
1418 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1419 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1320#endif
1321#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink)
1323 R->cursor_blink_ev.stop ();
1324 R->hidden_cursor = 0;
1420#endif 1325#endif
1421 } 1326 }
1422 break; 1327 break;
1423 1328
1424 case ConfigureNotify: 1329 case ConfigureNotify:
1431 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1433 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1434 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1435 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));
1436 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1437 (unsigned int)height, 1);
1438 } 1342 }
1439#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1440 else { 1344 else {
1441 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1442 } 1346 }
1465 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1466 break; 1370 break;
1467 1371
1468 case UnmapNotify: 1372 case UnmapNotify:
1469 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1470 break; 1377 break;
1471 1378
1472 case MapNotify: 1379 case MapNotify:
1473 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
1474 break; 1384 break;
1475 1385
1476 case PropertyNotify: 1386 case PropertyNotify:
1477 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1478 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
1501 1411
1502 case GraphicsExpose: 1412 case GraphicsExpose:
1503 case Expose: 1413 case Expose:
1504 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1505#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1506 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1507 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1508#else 1418#else
1509 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1510 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1511 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1512 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1513 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1514#endif 1424#endif
1515 R->want_refresh = 1; 1425 R->want_refresh = 1;
1516 } else { 1426 } else {
1521 &unused_xevent)) ; 1431 &unused_xevent)) ;
1522 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1523 GraphicsExpose, 1433 GraphicsExpose,
1524 &unused_xevent)) ; 1434 &unused_xevent)) ;
1525 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1526 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1527 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1528 } 1438 }
1529#ifdef MENUBAR 1439#ifdef MENUBAR
1530 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1531 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
1537 break; 1447 break;
1538 1448
1539 case MotionNotify: 1449 case MotionNotify:
1540#ifdef POINTER_BLANK 1450#ifdef POINTER_BLANK
1541 if (R->hidden_pointer) 1451 if (R->hidden_pointer)
1542 rxvt_pointer_unblank(aR); 1452 R->pointer_unblank ();
1543#endif 1453#endif
1544#if MENUBAR 1454#if MENUBAR
1545 if (isMenuBarWindow(ev->xany.window)) { 1455 if (isMenuBarWindow(ev->xany.window)) {
1546 rxvt_menubar_control(aR_ &(ev->xbutton)); 1456 rxvt_menubar_control(aR_ &(ev->xbutton));
1547 break; 1457 break;
1561 &unused_mask); 1471 &unused_mask);
1562#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1563 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1564 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1565#endif 1475#endif
1566 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1567 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1568#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1569 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y < R->TermWin.int_bwidth
1570 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 || Pixel2Row(ev->xbutton.y) > (R->TermWin.nrow-1)) {
1571 int dist; 1481 int dist;
1572 1482
1573 R->pending_scroll_selection=1; 1483 R->pending_scroll_selection=1;
1574 1484
1575 /* don't clobber the current delay if we are 1485 /* don't clobber the current delay if we are
1620 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1621 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1622 &unused_mask); 1532 &unused_mask);
1623 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,
1624 scrollbar_size()); 1534 scrollbar_size());
1625 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1626 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1627 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1628 } 1538 }
1629 break; 1539 break;
1630 } 1540 }
1632 1542
1633/* INTPROTO */ 1543/* INTPROTO */
1634void 1544void
1635rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1636{ 1546{
1637 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1638 1548
1639 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1640 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1641 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1642/* 1552/*
1644 */ 1554 */
1645 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1646 { 1556 {
1647#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1648 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1649 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1650 else 1560 else
1651#endif 1561#endif
1652 { 1562 {
1653 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1654 if (reportmode) 1564 if (reportmode)
1689 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1690 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1691 switch (ev->button) 1601 switch (ev->button)
1692 { 1602 {
1693 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1694 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1695 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1696 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1697 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1698 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1699 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1700 break; 1623 break;
1701 1624
1702 case Button3: 1625 case Button3:
1703 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1704 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1705 else 1628 else
1706 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1707 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1708 break; 1631 break;
1709 } 1632 }
1710 } 1633 }
1711 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
1716/* 1639/*
1717 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1718 */ 1641 */
1719 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1720 { 1643 {
1721 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1722 /* 1645 /*
1723 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1724 * move up if mouse is above slider 1647 * move up if mouse is above slider
1725 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1726 * 1649 *
1738 */ 1661 */
1739 if ((R->scrollBar.style == R_SB_NEXT 1662 if ((R->scrollBar.style == R_SB_NEXT
1740 && scrollbarnext_upButton(ev->y)) 1663 && scrollbarnext_upButton(ev->y))
1741 || (R->scrollBar.style == R_SB_RXVT 1664 || (R->scrollBar.style == R_SB_RXVT
1742 && scrollbarrxvt_upButton(ev->y))) 1665 && scrollbarrxvt_upButton(ev->y)))
1743 rxvt_tt_printf(aR_ "\033[A"); 1666 R->tt_printf("\033[A");
1744 else if ((R->scrollBar.style == R_SB_NEXT 1667 else if ((R->scrollBar.style == R_SB_NEXT
1745 && scrollbarnext_dnButton(ev->y)) 1668 && scrollbarnext_dnButton(ev->y))
1746 || (R->scrollBar.style == R_SB_RXVT 1669 || (R->scrollBar.style == R_SB_RXVT
1747 && scrollbarrxvt_dnButton(ev->y))) 1670 && scrollbarrxvt_dnButton(ev->y)))
1748 rxvt_tt_printf(aR_ "\033[B"); 1671 R->tt_printf("\033[B");
1749 else 1672 else
1750 switch (ev->button) { 1673 switch (ev->button) {
1751 case Button2: 1674 case Button2:
1752 rxvt_tt_printf(aR_ "\014"); 1675 R->tt_printf("\014");
1753 break; 1676 break;
1754 case Button1: 1677 case Button1:
1755 rxvt_tt_printf(aR_ "\033[6~"); 1678 R->tt_printf("\033[6~");
1756 break; 1679 break;
1757 case Button3: 1680 case Button3:
1758 rxvt_tt_printf(aR_ "\033[5~"); 1681 R->tt_printf("\033[5~");
1759 break; 1682 break;
1760 } 1683 }
1761 } 1684 }
1762 else 1685 else
1763#endif /* NO_SCROLLBAR_REPORT */ 1686#endif /* NO_SCROLLBAR_REPORT */
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1781#endif 1704#endif
1782 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1783 if (upordown < 0) 1706 if (upordown < 0)
1784 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1785 else 1708 else
1786 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1787 } 1710 }
1788 } else 1711 } else
1789 switch (ev->button) { 1712 switch (ev->button) {
1790 case Button2: 1713 case Button2:
1791 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
1803 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1804 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1805 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1806 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1807 scrollbar_size()); 1730 scrollbar_size());
1808 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1809 break; 1732 break;
1810 1733
1811 case Button1: 1734 case Button1:
1812 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1813 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
1826 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1827# else 1750# else
1828 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1829# endif 1752# endif
1830 else 1753 else
1831 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1832 } else { 1755 } else {
1833 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1834 (R->TermWin.nrow 1757 (R->TermWin.nrow
1835 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1836 / scrollbar_size())); 1759 / scrollbar_size()));
1858 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1859 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1860 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1861 1784
1862 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1863 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1864 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1865#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1866 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1867#endif 1790#endif
1868 } 1791 }
1905 * when overriding mouse reporting 1828 * when overriding mouse reporting
1906 */ 1829 */
1907 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1908 && R->bypass_keystate 1831 && R->bypass_keystate
1909 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1910 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1911 1834
1912 switch (ev->button) { 1835 switch (ev->button) {
1913 case Button1: 1836 case Button1:
1914 case Button3: 1837 case Button3:
1915 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
1919 break; 1842 break;
1920#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1921 case Button4: 1844 case Button4:
1922 case Button5: 1845 case Button5:
1923 { 1846 {
1924 int i, v; 1847 int i;
1848 page_dirn v;
1925 1849
1926 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1927 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1928 i = 1; 1852 i = 1;
1929 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
1937 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1938 } 1862 }
1939# endif 1863# endif
1940# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1941 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1942 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1943 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1944# else 1868# else
1945 for (; i--;) 1869 while (i--)
1946 { 1870 {
1947 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1948 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1949 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1950 } 1874 }
1951# endif 1875# endif
1952 } 1876 }
1953 break; 1877 break;
2104 n = 0; 2028 n = 0;
2105 if (pchanged) { 2029 if (pchanged) {
2106 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2107 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2108 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2032 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2109 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2110 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2111 break; 2035 break;
2112 } 2036 }
2113 } 2037 }
2114 } 2038 }
2164 return stream; 2088 return stream;
2165} 2089}
2166 2090
2167/* EXTPROTO */ 2091/* EXTPROTO */
2168int 2092int
2169rxvt_pclose_printer(FILE *stream) 2093rxvt_pclose_printer (FILE *stream)
2170{ 2094{
2171 fflush(stream); 2095 fflush (stream);
2172/* pclose() reported not to work on SunOS 4.1.3 */ 2096/* pclose() reported not to work on SunOS 4.1.3 */
2173# if defined (__sun__) /* TODO: RESOLVE THIS */ 2097# if defined (__sun__) /* TODO: RESOLVE THIS */
2174/* pclose works provided SIGCHLD handler uses waitpid */ 2098/* pclose works provided SIGCHLD handler uses waitpid */
2175 return pclose(stream); /* return fclose (stream); */ 2099 return pclose (stream); /* return fclose (stream); */
2176# else 2100# else
2177 return pclose(stream); 2101 return pclose (stream);
2178# endif 2102# endif
2179} 2103}
2180 2104
2181/* 2105/*
2182 * simulate attached vt100 printer 2106 * simulate attached vt100 printer
2245rxvt_process_nonprinting(pR_ unsigned char ch) 2169rxvt_process_nonprinting(pR_ unsigned char ch)
2246{ 2170{
2247 switch (ch) { 2171 switch (ch) {
2248 case C0_ENQ: /* terminal Status */ 2172 case C0_ENQ: /* terminal Status */
2249 if (R->rs[Rs_answerbackstring]) 2173 if (R->rs[Rs_answerbackstring])
2250 rxvt_tt_write(aR_ 2174 R->tt_write(
2251 (const unsigned char *)R->rs[Rs_answerbackstring], 2175 (const unsigned char *)R->rs[Rs_answerbackstring],
2252 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253 else 2177 else
2254 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2178 R->tt_write((unsigned char *)VT100_ANS,
2255 (unsigned int)STRLEN(VT100_ANS)); 2179 (unsigned int)STRLEN(VT100_ANS));
2256 break; 2180 break;
2257 case C0_BEL: /* bell */ 2181 case C0_BEL: /* bell */
2258 rxvt_scr_bell(aR); 2182 rxvt_scr_bell(aR);
2259 break; 2183 break;
2307 break; 2231 break;
2308 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2309 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2310 break; 2234 break;
2311 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2312 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2313 break; 2237 break;
2314 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2315 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2316 break; 2240 break;
2317 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
2322 row = rxvt_cmd_getc(aR) - ' '; 2246 row = rxvt_cmd_getc(aR) - ' ';
2323 col = rxvt_cmd_getc(aR) - ' '; 2247 col = rxvt_cmd_getc(aR) - ' ';
2324 rxvt_scr_gotorc(aR_ row, col, 0); 2248 rxvt_scr_gotorc(aR_ row, col, 0);
2325 break; 2249 break;
2326 case 'Z': /* identify the terminal type */ 2250 case 'Z': /* identify the terminal type */
2327 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 */
2328 break; 2252 break;
2329 case '<': /* turn off VT52 mode */ 2253 case '<': /* turn off VT52 mode */
2330 PrivMode(0, PrivMode_vt52); 2254 PrivMode(0, PrivMode_vt52);
2331 break; 2255 break;
2332 case 'F': /* use special graphics character set */ 2256 case 'F': /* use special graphics character set */
2439 rxvt_process_dcs_seq(aR); 2363 rxvt_process_dcs_seq(aR);
2440 break; 2364 break;
2441 2365
2442 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443 case C1_SCI: /* ESC Z */ 2367 case C1_SCI: /* ESC Z */
2444 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2368 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446 break; /* steal obsolete ESC [ c */ 2370 break; /* steal obsolete ESC [ c */
2447 2371
2448 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449 case C1_CSI: /* ESC [ */ 2373 case C1_CSI: /* ESC [ */
2570 */ 2494 */
2571 if (priv) { 2495 if (priv) {
2572 switch (priv) { 2496 switch (priv) {
2573 case '>': 2497 case '>':
2574 if (ch == CSI_DA) /* secondary device attributes */ 2498 if (ch == CSI_DA) /* secondary device attributes */
2575 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576 break; 2500 break;
2577 case '?': 2501 case '?':
2578 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580 break; 2504 break;
2652 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2653 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2654 break; 2578 break;
2655 2579
2656 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2657 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2658 break; 2582 break;
2659 2583
2660 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2661 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2662 break; 2586 break;
2683 2607
2684 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2685 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2686 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2687 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688 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);
2689 break; 2613 break;
2690 2614
2691 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2693 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
2694 break; 2618 break;
2695 2619
2696 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697 rxvt_process_sgr_mode(aR_ nargs, arg); 2621 rxvt_process_sgr_mode(aR_ nargs, arg);
2698 break; 2622 break;
2699 2623
2700 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701 switch (arg[0]) { 2625 switch (arg[0]) {
2702 case 5: /* DSR requested */ 2626 case 5: /* DSR requested */
2703 rxvt_tt_printf(aR_ "\033[0n"); 2627 R->tt_printf("\033[0n");
2704 break; 2628 break;
2705 case 6: /* CPR requested */ 2629 case 6: /* CPR requested */
2706 rxvt_scr_report_position(aR); 2630 rxvt_scr_report_position(aR);
2707 break; 2631 break;
2708#if defined (ENABLE_DISPLAY_ANSWER) 2632#if defined (ENABLE_DISPLAY_ANSWER)
2709 case 7: /* unofficial extension */ 2633 case 7: /* unofficial extension */
2710 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711 break; 2635 break;
2712#endif 2636#endif
2713 case 8: /* unofficial extension */ 2637 case 8: /* unofficial extension */
2714 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715 break; 2639 break;
2784 break; 2708 break;
2785#endif 2709#endif
2786 2710
2787 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2788 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2789 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);
2790 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2791 2715
2792 default: 2716 default:
2793 break; 2717 break;
2794 } 2718 }
2832 break; 2756 break;
2833 case 6: /* lower window */ 2757 case 6: /* lower window */
2834 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2835 break; 2759 break;
2836 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2837 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2838 break; 2762 break;
2839 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2840 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2841 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2842 break; 2766 break;
2848 /* 2772 /*
2849 * reports - some output format copied from XTerm 2773 * reports - some output format copied from XTerm
2850 */ 2774 */
2851 case 11: /* report window state */ 2775 case 11: /* report window state */
2852 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854 break; 2778 break;
2855 case 13: /* report window position */ 2779 case 13: /* report window position */
2856 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858 -wattr.border_width, -wattr.border_width, 2782 -wattr.border_width, -wattr.border_width,
2859 &x, &y, &wdummy); 2783 &x, &y, &wdummy);
2860 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2784 R->tt_printf("\033[3;%d;%dt", x, y);
2861 break; 2785 break;
2862 case 14: /* report window size (pixels) */ 2786 case 14: /* report window size (pixels) */
2863 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865 break; 2789 break;
2866 case 18: /* report window size (chars) */ 2790 case 18: /* report window size (chars) */
2867 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);
2868 break; 2792 break;
2869#if 0 /* XXX: currently disabled due to security concerns */ 2793#if 0 /* XXX: currently disabled due to security concerns */
2870 case 20: /* report icon label */ 2794 case 20: /* report icon label */
2871 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873 break; 2797 break;
2874 case 21: /* report window title */ 2798 case 21: /* report window title */
2875 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877 break; 2801 break;
2878#endif 2802#endif
2879 } 2803 }
2880} 2804}
2881#endif 2805#endif
3053 if (*str != ';') { 2977 if (*str != ';') {
3054#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
3055 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
3056 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
3057#endif 2981#endif
3058 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
3059 } 2983 }
3060 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
3061 str++; 2985 str++;
3062#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
3063 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
3065 } 2989 }
3066 if (changed) { 2990 if (changed) {
3067#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
3068 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
3069#endif 2993#endif
3070 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
3071 } 2995 }
3072 break; 2996 break;
3073 2997
3074 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
3075 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
3161#endif 3085#endif
3162 { 1000, PrivMode_MouseX11 }, 3086 { 1000, PrivMode_MouseX11 },
3163 { 1010, PrivMode_TtyOutputInh }, 3087 { 1010, PrivMode_TtyOutputInh },
3164 { 1011, PrivMode_Keypress }, 3088 { 1011, PrivMode_Keypress },
3165 { 1047, PrivMode_Screen }, 3089 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3166 }; 3091 };
3167 3092
3168 if (nargs == 0) 3093 if (nargs == 0)
3169 return; 3094 return;
3170 3095
3241 break; 3166 break;
3242#endif 3167#endif
3243#ifdef scrollBar_esc 3168#ifdef scrollBar_esc
3244 case scrollBar_esc: 3169 case scrollBar_esc:
3245 if (rxvt_scrollbar_mapping(aR_ state)) { 3170 if (rxvt_scrollbar_mapping(aR_ state)) {
3246 rxvt_resize_all_windows(aR_ 0, 0, 0); 3171 R->resize_all_windows (0, 0, 0);
3247 rxvt_scr_touch(aR_ True); 3172 R->scr_touch (true);
3248 } 3173 }
3249 break; 3174 break;
3250#endif 3175#endif
3251 case 25: /* visible/invisible cursor */ 3176 case 25: /* visible/invisible cursor */
3252 rxvt_scr_cursor_visible(aR_ state); 3177 rxvt_scr_cursor_visible(aR_ state);
3277 R->Options |= Opt_scrollTtyKeypress; 3202 R->Options |= Opt_scrollTtyKeypress;
3278 else 3203 else
3279 R->Options &= ~Opt_scrollTtyKeypress; 3204 R->Options &= ~Opt_scrollTtyKeypress;
3280 break; 3205 break;
3281 case 1047: /* secondary screen w/ clearing */ 3206 case 1047: /* secondary screen w/ clearing */
3207 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3282 if (R->current_screen != PRIMARY) 3208 if (R->current_screen != PRIMARY)
3283 rxvt_scr_erase_screen(aR_ 2); 3209 R->scr_erase_screen (2);
3284 rxvt_scr_change_screen(aR_ state); 3210 rxvt_scr_change_screen(aR_ state);
3285 /* FALLTHROUGH */ 3211 /* FALLTHROUGH */
3286 default: 3212 default:
3287 break; 3213 break;
3288 } 3214 }
3424{ 3350{
3425 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3351 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426 3352
3427#ifndef RXVT_GRAPHICS 3353#ifndef RXVT_GRAPHICS
3428 if (cmd == 'Q') { /* query graphics */ 3354 if (cmd == 'Q') { /* query graphics */
3429 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3355 R->tt_printf("\033G0\n"); /* no graphics */
3430 return; 3356 return;
3431 } 3357 }
3432/* swallow other graphics sequences until terminating ':' */ 3358/* swallow other graphics sequences until terminating ':' */
3433 do 3359 do
3434 ch = rxvt_cmd_getc(aR); 3360 ch = rxvt_cmd_getc(aR);
3437 unsigned int nargs; 3363 unsigned int nargs;
3438 int args[NGRX_PTS]; 3364 int args[NGRX_PTS];
3439 unsigned char *text = NULL; 3365 unsigned char *text = NULL;
3440 3366
3441 if (cmd == 'Q') { /* query graphics */ 3367 if (cmd == 'Q') { /* query graphics */
3442 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3368 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443 return; 3369 return;
3444 } 3370 }
3445 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3371 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446 int neg; 3372 int neg;
3447 3373
3462 } 3388 }
3463 3389
3464 if ((cmd == 'T') && (nargs >= 5)) { 3390 if ((cmd == 'T') && (nargs >= 5)) {
3465 int i, len = args[4]; 3391 int i, len = args[4];
3466 3392
3467 text = rxvt_malloc((len + 1) * sizeof(char)); 3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3468 3394
3469 if (text != NULL) { 3395 if (text != NULL) {
3470 for (i = 0; i < len; i++) 3396 for (i = 0; i < len; i++)
3471 text[i] = rxvt_cmd_getc(aR); 3397 text[i] = rxvt_cmd_getc(aR);
3472 text[len] = '\0'; 3398 text[len] = '\0';
3481 3407
3482/* 3408/*
3483 * Send printf() formatted output to the command. 3409 * Send printf() formatted output to the command.
3484 * Only use for small amounts of data. 3410 * Only use for small amounts of data.
3485 */ 3411 */
3486/* EXTPROTO */
3487void 3412void
3488rxvt_tt_printf(pR_ const char *fmt,...) 3413rxvt_term::tt_printf (const char *fmt,...)
3489{ 3414{
3490 va_list arg_ptr; 3415 va_list arg_ptr;
3491 unsigned char buf[256]; 3416 unsigned char buf[256];
3492 3417
3493 va_start(arg_ptr, fmt); 3418 va_start (arg_ptr, fmt);
3494 vsprintf((char *)buf, fmt, arg_ptr); 3419 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495 va_end(arg_ptr); 3420 va_end (arg_ptr);
3496 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3421 tt_write (buf, STRLEN (buf));
3497} 3422}
3498 3423
3499/* ---------------------------------------------------------------------- */ 3424/* ---------------------------------------------------------------------- */
3500/* Addresses pasting large amounts of data and rxvt hang
3501 * code pinched from xterm (v_write()) and applied originally to
3502 * rxvt-2.18 - Hops
3503 * Write data to the pty as typed by the user, pasted with the mouse, 3425/* Write data to the pty as typed by the user, pasted with the mouse,
3504 * or generated by us in response to a query ESC sequence. 3426 * or generated by us in response to a query ESC sequence.
3505 */ 3427 */
3506/* EXTPROTO */
3507void 3428void
3508rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3429rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 3430{
3510#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3431 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3511 int riten;
3512 unsigned int p;
3513 unsigned char *v_buffer, /* start of physical buffer */
3514 *v_bufstr, /* start of current buffer pending */
3515 *v_bufptr, /* end of current buffer pending */
3516 *v_bufend; /* end of physical buffer */
3517 3432
3518 if (R->v_bufstr == NULL && len > 0) { 3433 if (len)
3519 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3521 v_bufend = v_buffer + p;
3522 } else {
3523 v_buffer = R->v_buffer;
3524 v_bufstr = R->v_bufstr;
3525 v_bufptr = R->v_bufptr;
3526 v_bufend = R->v_bufend;
3527 } 3434 {
3435 if (v_buflen == 0)
3436 {
3437 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3438 if (written == len)
3439 return;
3528 3440
3529 /* 3441 data += written;
3530 * Append to the block we already have. Always doing this simplifies the 3442 len -= written;
3531 * code, and isn't too bad, either. If this is a short block, it isn't 3443 }
3532 * too expensive, and if this is a long block, we won't be able to write 3444
3533 * it all anyway. 3445
3534 */ 3446 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535 if (len > 0) { 3447
3536 if (v_bufend < v_bufptr + len) { /* run out of room */ 3448 memcpy (v_buffer + v_buflen, data, len);
3537 if (v_bufstr != v_buffer) { 3449 v_buflen += len;
3538 /* there is unused space, move everything down */
3539 MEMMOVE(v_buffer, v_bufstr,
3540 (unsigned int)(v_bufptr - v_bufstr));
3541 v_bufptr -= v_bufstr - v_buffer;
3542 v_bufstr = v_buffer;
3543 } 3450 }
3544 if (v_bufend < v_bufptr + len) {
3545 /* still won't fit: get more space */
3546 /* use most basic realloc because an error is not fatal. */
3547 unsigned int size = v_bufptr - v_buffer;
3548 unsigned int reallocto;
3549 3451
3550 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3452 for (;;)
3551 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3453 {
3552 /* save across realloc */ 3454 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553 if (v_buffer) { 3455
3554 v_bufstr = v_buffer; 3456 if (written > 0)
3555 v_bufptr = v_buffer + size; 3457 {
3556 v_bufend = v_buffer + reallocto; 3458 v_buflen -= written;
3557 } else { /* no memory: ignore entire write request */ 3459
3558 rxvt_print_error("data loss: cannot allocate buffer space"); 3460 if (v_buflen == 0)
3559 v_buffer = v_bufstr; /* restore clobbered pointer */ 3461 {
3560 } 3462 free (v_buffer);
3463 v_buffer = 0;
3464 v_buflen = 0;
3465
3466 pty_ev.set (EVENT_READ);
3467 return;
3468 }
3469
3470 memmove (v_buffer, v_buffer + written, v_buflen);
3471 }
3472 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3473 // original code just ignores this...
3474 destroy ();
3475 else
3476 {
3477 pty_ev.set (EVENT_READ | EVENT_WRITE);
3478 return;
3479 }
3561 } 3480 }
3562 }
3563 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3564 MEMCPY(v_bufptr, d, len);
3565 v_bufptr += len;
3566 }
3567 }
3568
3569 /*
3570 * Write out as much of the buffer as we can.
3571 * Be careful not to overflow the pty's input silo.
3572 * We are conservative here and only write a small amount at a time.
3573 *
3574 * If we can't push all the data into the pty yet, we expect write
3575 * to return a non-negative number less than the length requested
3576 * (if some data written) or -1 and set errno to EAGAIN,
3577 * EWOULDBLOCK, or EINTR (if no data written).
3578 *
3579 * (Not all systems do this, sigh, so the code is actually
3580 * a little more forgiving.)
3581 */
3582 if ((p = v_bufptr - v_bufstr) > 0) {
3583 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3584 if (riten < 0)
3585 riten = 0;
3586 v_bufstr += riten;
3587 if (v_bufstr >= v_bufptr) /* we wrote it all */
3588 v_bufstr = v_bufptr = v_buffer;
3589 }
3590 /*
3591 * If we have lots of unused memory allocated, return it
3592 */
3593 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3594 /* save pointers across realloc */
3595 unsigned int start = v_bufstr - v_buffer;
3596 unsigned int size = v_bufptr - v_buffer;
3597 unsigned int reallocto;
3598
3599 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3600 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3601 if (v_buffer) {
3602 v_bufstr = v_buffer + start;
3603 v_bufptr = v_buffer + size;
3604 v_bufend = v_buffer + reallocto;
3605 } else {
3606 /* should we print a warning if couldn't return memory? */
3607 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3608 }
3609 }
3610 R->v_buffer = v_buffer;
3611 R->v_bufstr = v_bufstr;
3612 R->v_bufptr = v_bufptr;
3613 R->v_bufend = v_bufend;
3614} 3481}
3482
3615/*----------------------- end-of-file (C source) -----------------------*/ 3483/*----------------------- end-of-file (C source) -----------------------*/
3616 3484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines