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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.32 by pcg, Thu Jan 29 23:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.5 2003/11/25 15:44:38 pcg Exp $ 4 * $Id: command.C,v 1.32 2004/01/29 23:31:45 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) { 722 {
672 if (hidden_cursor) { 723 if (hidden_cursor)
724 {
673 hidden_cursor = 0; 725 hidden_cursor = 0;
674 want_refresh = 1; 726 want_refresh = 1;
675 } 727 }
728
676 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
677 } 730 }
678#endif 731#endif
679 732
680#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
681 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
682 && (pointerBlankDelay > 0)) { 735 {
683 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
684 || xev.type == ButtonPress 737 || xev.type == ButtonPress
685 || xev.type == ButtonRelease) { 738 || xev.type == ButtonRelease)
686 if (hidden_pointer) 739 if (hidden_pointer)
687 rxvt_pointer_unblank(aR); 740 pointer_unblank ();
688 want_motion_time = 1; 741
689 }
690 if (xev.type == KeyPress && hidden_pointer == 0) 742 if (xev.type == KeyPress && hidden_pointer == 0)
691 rxvt_pointer_blank (this); 743 pointer_blank ();
692 } 744 }
693#endif 745#endif
694 746
695#ifdef USE_XIM 747#ifdef USE_XIM
696 if (!XFilterEvent (&xev, xev.xany.window)) 748 if (!XFilterEvent (&xev, xev.xany.window))
697#endif 749#endif
698 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
699 } 751 }
700 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
701} 753}
702 754
755#ifdef CURSOR_BLINK
703void 756void
704rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
705{ 758{
706 w.at += BLINK_INTERVAL;
707 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
708 want_refresh = 1; 760 want_refresh = 1;
709 flush(); 761
762 w.start (w.at + BLINK_INTERVAL);
710} 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
711 778
712void 779void
713rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
714{ 781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
715 process_x_events (); 785 process_x_events ();
786}
716 787
717 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 }
718} 925}
719 926
720// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
721// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
722uint32_t 929uint32_t
723rxvt_term::next_char () 930rxvt_term::next_char ()
724{ 931{
725 struct mbstate &s = mbstate;
726
727 while (cmdbuf_ptr < cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
728 { 933 {
729 uint8_t ch = *cmdbuf_ptr; 934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
730
731 if (s.cnt)
732 {
733 if ((ch & 0xc0) == 0x80)
734 {
735 cmdbuf_ptr++;
736
737 /* continuation */
738 s.reg = (s.reg << 6) | (ch & 0x7f);
739
740 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
741 return s.reg;
742
743 continue;
744 }
745 else
746 {
747 s.cnt = 0;
748 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
749 }
750 }
751
752 if ((ch & 0xc0) == 0xc0)
753 {
754 cmdbuf_ptr++; 935 return *cmdbuf_ptr++;
755 936
756 /* first byte */ 937 wchar_t wc;
757 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
758 s.reg = ch; 939
759 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
760 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
761 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
762 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
763 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
764 } 945
765 else 946 // assume wchar == unicode
766 { 947 cmdbuf_ptr += len;
767 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
768 return ch; 948 return wc;
769 }
770 } 949 }
771 950
772 return NOCHAR; 951 return NOCHAR;
773}
774
775bool
776rxvt_term::pty_fill (size_t count)
777{
778 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779
780 memmove (cmdbuf_base, cmdbuf_ptr, n);
781 cmdbuf_ptr = cmdbuf_base;
782 cmdbuf_endp = cmdbuf_ptr + n;
783
784 n = read (cmd_fd, cmdbuf_endp, count);
785
786 if (n > 0)
787 {
788 cmdbuf_endp += n;
789 return true;
790 }
791 else if (n < 0 && errno == EAGAIN)
792 return false;
793
794 rxvt_clean_exit();
795 exit(EXIT_FAILURE); /* bad order of events? */
796}
797
798void
799rxvt_term::pty_cb (io_watcher &w, short revents)
800{
801 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
802 {
803 /* once we know the shell is running, send the screen size. Again! */
804 //ch = rxvt_cmd_getc(aR); /* wait for something */
805 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806
807 uint32_t ch = NOCHAR;
808
809 for (;;)
810 {
811 if (ch == NOCHAR)
812 ch = next_char ();
813
814 if (ch == NOCHAR) // TODO: improve
815 break;
816
817 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818 {
819 /* Read a text string from the input buffer */
820 uint32_t buf[BUFSIZ];
821 bool refreshnow = false;
822 int nlines = 0;
823 uint32_t *str = buf;
824
825 *str++ = ch;
826
827 for (;;)
828 {
829 ch = next_char ();
830
831 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832 break;
833 else
834 {
835 *str++ = ch;
836
837 if (ch == '\n')
838 {
839 nlines++;
840 refresh_count++;
841
842 if (!(Options & Opt_jumpScroll)
843 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844 {
845 refreshnow = true;
846 ch = NOCHAR;
847 break;
848 }
849 }
850
851 if (str >= buf + BUFSIZ)
852 {
853 ch = NOCHAR;
854 break;
855 }
856 }
857 }
858
859 rxvt_scr_add_lines (this, buf, nlines, str - buf);
860
861 /*
862 * If there have been a lot of new lines, then update the screen
863 * What the heck I'll cheat and only refresh less than every page-full.
864 * the number of pages between refreshes is refresh_limit, which
865 * is incremented here because we must be doing flat-out scrolling.
866 *
867 * refreshing should be correct for small scrolls, because of the
868 * time-out
869 */
870 if (refreshnow)
871 {
872 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873 refresh_limit++;
874
875 rxvt_scr_refresh (this, refresh_type);
876 }
877
878 }
879 else
880 {
881 switch (ch)
882 {
883 default:
884 rxvt_process_nonprinting (this, ch);
885 break;
886 case C0_ESC: /* escape char */
887 rxvt_process_escape_seq (this);
888 break;
889 /*case 0x9b: */ /* CSI */
890 /* rxvt_process_csi_seq (this); */
891 }
892
893 ch = NOCHAR;
894 }
895 }
896 }
897
898 flush ();
899}
900
901void
902rxvt_term::flush ()
903{
904#ifdef TRANSPARENT
905 if (want_full_refresh)
906 {
907 want_full_refresh = 0;
908 rxvt_scr_clear (this);
909 rxvt_scr_touch (this, False);
910 want_refresh = 1;
911 }
912#endif
913
914 if (want_refresh)
915 {
916 rxvt_scr_refresh (this, refresh_type);
917 rxvt_scrollbar_show (this, 1);
918#ifdef USE_XIM
919 rxvt_IMSendSpot (this);
920#endif
921 }
922
923 XFlush (Xdisplay);
924} 952}
925 953
926/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
927/* 955/*
928 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
939 return c; 967 return c;
940 968
941 // incomplete sequences should occur rarely, still, a better solution 969 // incomplete sequences should occur rarely, still, a better solution
942 // would be preferred. either setjmp/longjmp or better design. 970 // would be preferred. either setjmp/longjmp or better design.
943 fcntl (R->cmd_fd, F_SETFL, 0); 971 fcntl (R->cmd_fd, F_SETFL, 0);
944 R->pty_fill (1); 972 R->pty_fill ();
945 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946 } 974 }
947 975
976#if 0
948#define TIMEOUT_USEC 5000 977#define TIMEOUT_USEC 5000
949 fd_set readfds; 978 fd_set readfds;
950 int quick_timeout, select_res; 979 int quick_timeout, select_res;
951 int want_motion_time, want_keypress_time; 980 int want_motion_time, want_keypress_time;
952 struct timeval value; 981 struct timeval value;
956 985
957 for (;;) { 986 for (;;) {
958 /* loop until we can return something */ 987 /* loop until we can return something */
959 988
960 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961 rxvt_tt_write(aR_ NULL, 0); 990 R->tt_write(NULL, 0);
962
963#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
964 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
965#endif
966#if defined(CURSOR_BLINK)
967 want_keypress_time = 0;
968#endif
969#if defined(POINTER_BLANK)
970 want_motion_time = 0;
971#endif
972
973 if (XPending (R->Xdisplay))
974 {
975 R->process_x_events ();
976
977 /* in case button actions pushed chars to cmdbuf */
978 if (R->cmdbuf_ptr < R->cmdbuf_endp)
979 return *R->cmdbuf_ptr++;
980 }
981
982#if defined(CURSOR_BLINK)
983 if (want_keypress_time) {
984 (void)gettimeofday(&tp, NULL);
985 R->lastcursorchange.tv_sec = tp.tv_sec;
986 R->lastcursorchange.tv_usec = tp.tv_usec;
987 }
988#endif
989#if defined(POINTER_BLANK)
990 if (want_motion_time) {
991 if (!tp.tv_sec)
992 (void)gettimeofday(&tp, NULL);
993 R->lastmotion.tv_sec = tp.tv_sec;
994 R->lastmotion.tv_usec = tp.tv_usec;
995 }
996#endif
997
998/*
999 * the command input buffer is empty and we have no pending X events
1000 */
1001 quick_timeout = 0;
1002 991
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004 if (R->mouse_slip_wheel_speed) { 993 if (R->mouse_slip_wheel_speed) {
1005 quick_timeout = 1; 994 quick_timeout = 1;
1006 if (!R->mouse_slip_wheel_delay-- 995 if (!R->mouse_slip_wheel_delay--
1016 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
1017 quick_timeout = 1; 1006 quick_timeout = 1;
1018 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
1019 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1020 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
1021 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
1022 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1023 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1024 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1025 R->want_refresh = 1; 1014 R->want_refresh = 1;
1026 } 1015 }
1036 R->want_refresh = 1; 1025 R->want_refresh = 1;
1037 } 1026 }
1038 } 1027 }
1039#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040 1029
1041 FD_ZERO(&readfds);
1042 FD_SET(R->cmd_fd, &readfds);
1043 FD_SET(R->Xfd, &readfds);
1044 value.tv_usec = TIMEOUT_USEC;
1045 value.tv_sec = 0;
1046
1047 if (!R->TermWin.mapped)
1048 quick_timeout = 0;
1049 else {
1050 quick_timeout |= R->want_refresh;
1051#ifdef TRANSPARENT 1030#ifdef TRANSPARENT
1052 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1053#endif 1032#endif
1054 }
1055
1056#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1057 {
1058 int set_quick_timeout = 0;
1059 long csdiff, psdiff;
1060
1061#define BLINK_TIME 500000L
1062 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1063# if defined(CURSOR_BLINK)
1064 if (R->Options & Opt_cursorBlink) {
1065 if (!tp.tv_sec) /* didn't get it before so get it now */
1066 (void)gettimeofday(&tp, NULL);
1067
1068 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1069 + tp.tv_usec - R->lastcursorchange.tv_usec;
1070 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1071 R->lastcursorchange.tv_sec = tp.tv_sec;
1072 R->lastcursorchange.tv_usec = tp.tv_usec;
1073 R->hidden_cursor = !R->hidden_cursor;
1074 csdiff = 0;
1075 } else
1076 csdiff = BLINK_TIME - csdiff;
1077 set_quick_timeout = 1;
1078 }
1079# endif 1033#endif
1034}
1035
1080# if defined(POINTER_BLANK) 1036#ifdef POINTER_BLANK
1081 /*
1082 * If we haven't moved the pointer for a while
1083 */
1084 if ((R->Options & Opt_pointerBlank)
1085 && (R->pointerBlankDelay > 0)
1086 && (R->hidden_pointer == 0)) {
1087 long pdelay;
1088
1089 if (!tp.tv_sec) /* didn't get it before so get it now */
1090 (void)gettimeofday(&tp, NULL);
1091 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1092 + tp.tv_usec - R->lastmotion.tv_usec;
1093 pdelay = R->pointerBlankDelay * 1000000L;
1094 if (psdiff >= pdelay)
1095 rxvt_pointer_blank(aR);
1096 else {
1097 set_quick_timeout = 1;
1098 psdiff = pdelay - psdiff;
1099 }
1100 }
1101# endif
1102 if (!quick_timeout && set_quick_timeout) {
1103 MIN_IT(csdiff, psdiff);
1104 value.tv_sec = csdiff / 1000000L;
1105 value.tv_usec = csdiff % 1000000L;
1106 quick_timeout = 1;
1107 }
1108 }
1109#endif
1110
1111 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1112 (quick_timeout ? &value : NULL))) == 0) {
1113 /* select statement timed out - we're not hard and fast scrolling */
1114 R->refresh_limit = 1;
1115 }
1116#if defined(CURSOR_BLINK)
1117 if (R->Options & Opt_cursorBlink)
1118 R->want_refresh = 1;
1119#endif
1120 }
1121}
1122
1123/* EXTPROTO */
1124void 1037void
1125rxvt_pointer_unblank(pR) 1038rxvt_term::pointer_unblank ()
1126{ 1039{
1127 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128 rxvt_recolour_cursor(aR); 1041 recolour_cursor ();
1129#ifdef POINTER_BLANK 1042
1130 R->hidden_pointer = 0; 1043 hidden_pointer = 0;
1131 if (R->pointerBlankDelay > 0) {
1132 struct timeval tp;
1133 1044
1134 (void)gettimeofday(&tp, NULL); 1045 if (Options & Opt_pointerBlank)
1135 R->lastmotion.tv_sec = tp.tv_sec; 1046 pointer_ev.start (NOW + pointerBlankDelay);
1136 R->lastmotion.tv_usec = tp.tv_usec;
1137 }
1138#endif
1139} 1047}
1140 1048
1141#ifdef POINTER_BLANK
1142/* INTPROTO */
1143void 1049void
1144rxvt_pointer_blank(pR) 1050rxvt_term::pointer_blank ()
1145{ 1051{
1052 if (!(Options & Opt_pointerBlank))
1053 return;
1054
1146 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147 XFlush(R->Xdisplay); 1056 XFlush (Xdisplay);
1057
1148 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 ();
1149} 1068}
1150#endif 1069#endif
1151 1070
1152/* INTPROTO */ 1071/* INTPROTO */
1153void 1072void
1156 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1157 int x, y; 1076 int x, y;
1158 1077
1159 x = ev->x; 1078 x = ev->x;
1160 y = ev->y; 1079 y = ev->y;
1161 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1162 1081
1163 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1164 button_number = 3; 1083 button_number = 3;
1165 } else { 1084 } else {
1166 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
1206 fprintf(stderr, "]: <%d>, %d/%d\n", 1125 fprintf(stderr, "]: <%d>, %d/%d\n",
1207 button_number, 1126 button_number,
1208 x + 1, 1127 x + 1,
1209 y + 1); 1128 y + 1);
1210#else 1129#else
1211 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1130 R->tt_printf("\033[M%c%c%c",
1212 (32 + button_number + key_state), 1131 (32 + button_number + key_state),
1213 (32 + x + 1), 1132 (32 + x + 1),
1214 (32 + y + 1)); 1133 (32 + y + 1));
1215#endif 1134#endif
1216} 1135}
1233{ 1152{
1234 int i, want_timeout; 1153 int i, want_timeout;
1235 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1236 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1237 unsigned int unused_mask; 1156 unsigned int unused_mask;
1238 struct timeval tp;
1239 1157
1240#ifdef DEBUG_X 1158#ifdef DEBUG_X
1241 const char *const eventnames[] = 1159 const char *const eventnames[] =
1242 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1243 "", 1161 "",
1274 "SelectionNotify", 1192 "SelectionNotify",
1275 "ColormapNotify", 1193 "ColormapNotify",
1276 "ClientMessage", 1194 "ClientMessage",
1277 "MappingNotify" 1195 "MappingNotify"
1278 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1279 struct tm *ltt; 1201 struct tm *ltt;
1280#endif
1281
1282 /*
1283 * check if we need to get the time for any timeouts
1284 */
1285
1286 for (i = NUM_TIMEOUTS; i--; )
1287 if (R->timeout[i].tv_sec) {
1288 want_timeout = 1;
1289 break;
1290 }
1291
1292#ifndef DEBUG_X
1293 if (want_timeout)
1294#endif
1295 (void)gettimeofday(&tp, NULL); 1202 (void)gettimeofday(&tp, NULL);
1296
1297#ifdef DEBUG_X
1298 ltt = localtime(&(tp.tv_sec)); 1203 ltt = localtime(&(tp.tv_sec));
1299 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));
1300#endif 1205#endif
1301
1302 /* X event timeouts */
1303 if (want_timeout)
1304 for (i = NUM_TIMEOUTS; i--; ) {
1305 if (R->timeout[i].tv_sec == 0)
1306 continue;
1307 if ((tp.tv_sec < R->timeout[i].tv_sec)
1308 || (tp.tv_sec == R->timeout[i].tv_sec
1309 && tp.tv_usec < R->timeout[i].tv_usec))
1310 continue;
1311 R->timeout[i].tv_sec = 0;
1312 switch(i) {
1313 case TIMEOUT_INCR:
1314 rxvt_print_error("data loss: timeout on INCR selection paste");
1315 R->selection_wait = Sel_none;
1316 break;
1317 default:
1318 break;
1319 }
1320 }
1321 1206
1322 switch (ev->type) { 1207 switch (ev->type) {
1323 case KeyPress: 1208 case KeyPress:
1324 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1325 break; 1210 break;
1349 break; 1234 break;
1350 1235
1351 case ClientMessage: 1236 case ClientMessage:
1352 if (ev->xclient.format == 32 1237 if (ev->xclient.format == 32
1353 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354 exit(EXIT_SUCCESS); 1239 R->destroy ();
1355#ifdef OFFIX_DND 1240#ifdef OFFIX_DND
1356 /* OffiX Dnd (drag 'n' drop) protocol */ 1241 /* OffiX Dnd (drag 'n' drop) protocol */
1357 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358 && (ev->xclient.data.l[0] == DndFile 1243 && (ev->xclient.data.l[0] == DndFile
1359 || ev->xclient.data.l[0] == DndDir 1244 || ev->xclient.data.l[0] == DndDir
1360 || ev->xclient.data.l[0] == DndLink)) { 1245 || ev->xclient.data.l[0] == DndLink)) {
1361 /* Get Dnd data */ 1246 /* Get Dnd data */
1362 Atom ActualType; 1247 Atom ActualType;
1394 * in the GraphicsExpose parts, which means that after each refresh, 1279 * in the GraphicsExpose parts, which means that after each refresh,
1395 * we need to wait for the graphics expose or Noexpose events, 1280 * we need to wait for the graphics expose or Noexpose events,
1396 * which ought to make things real slow! 1281 * which ought to make things real slow!
1397 */ 1282 */
1398 case VisibilityNotify: 1283 case VisibilityNotify:
1399 switch (ev->xvisibility.state) { 1284 switch (ev->xvisibility.state)
1285 {
1400 case VisibilityUnobscured: 1286 case VisibilityUnobscured:
1401 R->refresh_type = FAST_REFRESH; 1287 R->refresh_type = FAST_REFRESH;
1402 break; 1288 break;
1403 case VisibilityPartiallyObscured: 1289 case VisibilityPartiallyObscured:
1404 R->refresh_type = SLOW_REFRESH; 1290 R->refresh_type = SLOW_REFRESH;
1405 break; 1291 break;
1406 default: 1292 default:
1407 R->refresh_type = NO_REFRESH; 1293 R->refresh_type = NO_REFRESH;
1408 break; 1294 break;
1409 } 1295 }
1410 break; 1296 break;
1411 1297
1412 case FocusIn: 1298 case FocusIn:
1413 if (!R->TermWin.focus) { 1299 if (!R->TermWin.focus) {
1414 R->TermWin.focus = 1; 1300 R->TermWin.focus = 1;
1417 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1418 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1419#endif 1305#endif
1420#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1421 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1422 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1423#endif 1309#endif
1424 } 1310 }
1425 break; 1311 break;
1426 1312
1427 case FocusOut: 1313 case FocusOut:
1432 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1433 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1434#endif 1320#endif
1435#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1436 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1437 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1438 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1439#endif 1325#endif
1440 } 1326 }
1441 break; 1327 break;
1442 1328
1450 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1452 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1453 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1454 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));
1455 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1456 (unsigned int)height, 1);
1457 } 1342 }
1458#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1459 else { 1344 else {
1460 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1461 } 1346 }
1484 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1485 break; 1370 break;
1486 1371
1487 case UnmapNotify: 1372 case UnmapNotify:
1488 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1489 break; 1377 break;
1490 1378
1491 case MapNotify: 1379 case MapNotify:
1492 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
1493 break; 1384 break;
1494 1385
1495 case PropertyNotify: 1386 case PropertyNotify:
1496 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1497 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
1520 1411
1521 case GraphicsExpose: 1412 case GraphicsExpose:
1522 case Expose: 1413 case Expose:
1523 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1524#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1525 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1526 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1527#else 1418#else
1528 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1529 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1530 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1531 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1532 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1533#endif 1424#endif
1534 R->want_refresh = 1; 1425 R->want_refresh = 1;
1535 } else { 1426 } else {
1540 &unused_xevent)) ; 1431 &unused_xevent)) ;
1541 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1542 GraphicsExpose, 1433 GraphicsExpose,
1543 &unused_xevent)) ; 1434 &unused_xevent)) ;
1544 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1545 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1546 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1547 } 1438 }
1548#ifdef MENUBAR 1439#ifdef MENUBAR
1549 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1550 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
1556 break; 1447 break;
1557 1448
1558 case MotionNotify: 1449 case MotionNotify:
1559#ifdef POINTER_BLANK 1450#ifdef POINTER_BLANK
1560 if (R->hidden_pointer) 1451 if (R->hidden_pointer)
1561 rxvt_pointer_unblank(aR); 1452 R->pointer_unblank ();
1562#endif 1453#endif
1563#if MENUBAR 1454#if MENUBAR
1564 if (isMenuBarWindow(ev->xany.window)) { 1455 if (isMenuBarWindow(ev->xany.window)) {
1565 rxvt_menubar_control(aR_ &(ev->xbutton)); 1456 rxvt_menubar_control(aR_ &(ev->xbutton));
1566 break; 1457 break;
1580 &unused_mask); 1471 &unused_mask);
1581#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1582 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1583 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1584#endif 1475#endif
1585 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1586 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1587#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1588 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1589 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1590 int dist; 1481 int dist;
1639 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1640 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1641 &unused_mask); 1532 &unused_mask);
1642 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,
1643 scrollbar_size()); 1534 scrollbar_size());
1644 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1645 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1646 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1647 } 1538 }
1648 break; 1539 break;
1649 } 1540 }
1651 1542
1652/* INTPROTO */ 1543/* INTPROTO */
1653void 1544void
1654rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1655{ 1546{
1656 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1657 1548
1658 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1659 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1660 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1661/* 1552/*
1663 */ 1554 */
1664 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1665 { 1556 {
1666#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1667 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1668 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1669 else 1560 else
1670#endif 1561#endif
1671 { 1562 {
1672 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1673 if (reportmode) 1564 if (reportmode)
1708 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1709 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1710 switch (ev->button) 1601 switch (ev->button)
1711 { 1602 {
1712 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1713 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1714 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1715 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1716 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1717 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1718 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1719 break; 1623 break;
1720 1624
1721 case Button3: 1625 case Button3:
1722 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1723 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1724 else 1628 else
1725 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1726 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1727 break; 1631 break;
1728 } 1632 }
1729 } 1633 }
1730 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
1735/* 1639/*
1736 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1737 */ 1641 */
1738 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1739 { 1643 {
1740 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1741 /* 1645 /*
1742 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1743 * move up if mouse is above slider 1647 * move up if mouse is above slider
1744 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1745 * 1649 *
1757 */ 1661 */
1758 if ((R->scrollBar.style == R_SB_NEXT 1662 if ((R->scrollBar.style == R_SB_NEXT
1759 && scrollbarnext_upButton(ev->y)) 1663 && scrollbarnext_upButton(ev->y))
1760 || (R->scrollBar.style == R_SB_RXVT 1664 || (R->scrollBar.style == R_SB_RXVT
1761 && scrollbarrxvt_upButton(ev->y))) 1665 && scrollbarrxvt_upButton(ev->y)))
1762 rxvt_tt_printf(aR_ "\033[A"); 1666 R->tt_printf("\033[A");
1763 else if ((R->scrollBar.style == R_SB_NEXT 1667 else if ((R->scrollBar.style == R_SB_NEXT
1764 && scrollbarnext_dnButton(ev->y)) 1668 && scrollbarnext_dnButton(ev->y))
1765 || (R->scrollBar.style == R_SB_RXVT 1669 || (R->scrollBar.style == R_SB_RXVT
1766 && scrollbarrxvt_dnButton(ev->y))) 1670 && scrollbarrxvt_dnButton(ev->y)))
1767 rxvt_tt_printf(aR_ "\033[B"); 1671 R->tt_printf("\033[B");
1768 else 1672 else
1769 switch (ev->button) { 1673 switch (ev->button) {
1770 case Button2: 1674 case Button2:
1771 rxvt_tt_printf(aR_ "\014"); 1675 R->tt_printf("\014");
1772 break; 1676 break;
1773 case Button1: 1677 case Button1:
1774 rxvt_tt_printf(aR_ "\033[6~"); 1678 R->tt_printf("\033[6~");
1775 break; 1679 break;
1776 case Button3: 1680 case Button3:
1777 rxvt_tt_printf(aR_ "\033[5~"); 1681 R->tt_printf("\033[5~");
1778 break; 1682 break;
1779 } 1683 }
1780 } 1684 }
1781 else 1685 else
1782#endif /* NO_SCROLLBAR_REPORT */ 1686#endif /* NO_SCROLLBAR_REPORT */
1798#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1800#endif 1704#endif
1801 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1802 if (upordown < 0) 1706 if (upordown < 0)
1803 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1804 else 1708 else
1805 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1806 } 1710 }
1807 } else 1711 } else
1808 switch (ev->button) { 1712 switch (ev->button) {
1809 case Button2: 1713 case Button2:
1810 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
1822 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1823 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1824 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1825 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1826 scrollbar_size()); 1730 scrollbar_size());
1827 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1828 break; 1732 break;
1829 1733
1830 case Button1: 1734 case Button1:
1831 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1832 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
1845 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1846# else 1750# else
1847 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1848# endif 1752# endif
1849 else 1753 else
1850 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1851 } else { 1755 } else {
1852 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1853 (R->TermWin.nrow 1757 (R->TermWin.nrow
1854 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1855 / scrollbar_size())); 1759 / scrollbar_size()));
1877 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1878 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1879 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1880 1784
1881 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1882 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1883 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1885 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1886#endif 1790#endif
1887 } 1791 }
1924 * when overriding mouse reporting 1828 * when overriding mouse reporting
1925 */ 1829 */
1926 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1927 && R->bypass_keystate 1831 && R->bypass_keystate
1928 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1929 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1930 1834
1931 switch (ev->button) { 1835 switch (ev->button) {
1932 case Button1: 1836 case Button1:
1933 case Button3: 1837 case Button3:
1934 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
1938 break; 1842 break;
1939#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1940 case Button4: 1844 case Button4:
1941 case Button5: 1845 case Button5:
1942 { 1846 {
1943 int i, v; 1847 int i;
1848 page_dirn v;
1944 1849
1945 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1946 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1947 i = 1; 1852 i = 1;
1948 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
1956 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1957 } 1862 }
1958# endif 1863# endif
1959# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1960 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1961 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1962 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1963# else 1868# else
1964 for (; i--;) 1869 while (i--)
1965 { 1870 {
1966 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1967 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1968 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1969 } 1874 }
1970# endif 1875# endif
1971 } 1876 }
1972 break; 1877 break;
2123 n = 0; 2028 n = 0;
2124 if (pchanged) { 2029 if (pchanged) {
2125 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2126 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2127 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"));
2128 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2129 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2130 break; 2035 break;
2131 } 2036 }
2132 } 2037 }
2133 } 2038 }
2183 return stream; 2088 return stream;
2184} 2089}
2185 2090
2186/* EXTPROTO */ 2091/* EXTPROTO */
2187int 2092int
2188rxvt_pclose_printer(FILE *stream) 2093rxvt_pclose_printer (FILE *stream)
2189{ 2094{
2190 fflush(stream); 2095 fflush (stream);
2191/* pclose() reported not to work on SunOS 4.1.3 */ 2096/* pclose() reported not to work on SunOS 4.1.3 */
2192# if defined (__sun__) /* TODO: RESOLVE THIS */ 2097# if defined (__sun__) /* TODO: RESOLVE THIS */
2193/* pclose works provided SIGCHLD handler uses waitpid */ 2098/* pclose works provided SIGCHLD handler uses waitpid */
2194 return pclose(stream); /* return fclose (stream); */ 2099 return pclose (stream); /* return fclose (stream); */
2195# else 2100# else
2196 return pclose(stream); 2101 return pclose (stream);
2197# endif 2102# endif
2198} 2103}
2199 2104
2200/* 2105/*
2201 * simulate attached vt100 printer 2106 * simulate attached vt100 printer
2264rxvt_process_nonprinting(pR_ unsigned char ch) 2169rxvt_process_nonprinting(pR_ unsigned char ch)
2265{ 2170{
2266 switch (ch) { 2171 switch (ch) {
2267 case C0_ENQ: /* terminal Status */ 2172 case C0_ENQ: /* terminal Status */
2268 if (R->rs[Rs_answerbackstring]) 2173 if (R->rs[Rs_answerbackstring])
2269 rxvt_tt_write(aR_ 2174 R->tt_write(
2270 (const unsigned char *)R->rs[Rs_answerbackstring], 2175 (const unsigned char *)R->rs[Rs_answerbackstring],
2271 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272 else 2177 else
2273 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2178 R->tt_write((unsigned char *)VT100_ANS,
2274 (unsigned int)STRLEN(VT100_ANS)); 2179 (unsigned int)STRLEN(VT100_ANS));
2275 break; 2180 break;
2276 case C0_BEL: /* bell */ 2181 case C0_BEL: /* bell */
2277 rxvt_scr_bell(aR); 2182 rxvt_scr_bell(aR);
2278 break; 2183 break;
2326 break; 2231 break;
2327 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2328 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2329 break; 2234 break;
2330 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2331 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2332 break; 2237 break;
2333 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2334 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2335 break; 2240 break;
2336 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
2341 row = rxvt_cmd_getc(aR) - ' '; 2246 row = rxvt_cmd_getc(aR) - ' ';
2342 col = rxvt_cmd_getc(aR) - ' '; 2247 col = rxvt_cmd_getc(aR) - ' ';
2343 rxvt_scr_gotorc(aR_ row, col, 0); 2248 rxvt_scr_gotorc(aR_ row, col, 0);
2344 break; 2249 break;
2345 case 'Z': /* identify the terminal type */ 2250 case 'Z': /* identify the terminal type */
2346 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 */
2347 break; 2252 break;
2348 case '<': /* turn off VT52 mode */ 2253 case '<': /* turn off VT52 mode */
2349 PrivMode(0, PrivMode_vt52); 2254 PrivMode(0, PrivMode_vt52);
2350 break; 2255 break;
2351 case 'F': /* use special graphics character set */ 2256 case 'F': /* use special graphics character set */
2458 rxvt_process_dcs_seq(aR); 2363 rxvt_process_dcs_seq(aR);
2459 break; 2364 break;
2460 2365
2461 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462 case C1_SCI: /* ESC Z */ 2367 case C1_SCI: /* ESC Z */
2463 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2368 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465 break; /* steal obsolete ESC [ c */ 2370 break; /* steal obsolete ESC [ c */
2466 2371
2467 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468 case C1_CSI: /* ESC [ */ 2373 case C1_CSI: /* ESC [ */
2589 */ 2494 */
2590 if (priv) { 2495 if (priv) {
2591 switch (priv) { 2496 switch (priv) {
2592 case '>': 2497 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2498 if (ch == CSI_DA) /* secondary device attributes */
2594 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2500 break;
2596 case '?': 2501 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599 break; 2504 break;
2671 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2672 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2673 break; 2578 break;
2674 2579
2675 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2676 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2677 break; 2582 break;
2678 2583
2679 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2680 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2681 break; 2586 break;
2702 2607
2703 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2704 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2705 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 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);
2708 break; 2613 break;
2709 2614
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
2713 break; 2618 break;
2714 2619
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 rxvt_process_sgr_mode(aR_ nargs, arg); 2621 rxvt_process_sgr_mode(aR_ nargs, arg);
2717 break; 2622 break;
2718 2623
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) { 2625 switch (arg[0]) {
2721 case 5: /* DSR requested */ 2626 case 5: /* DSR requested */
2722 rxvt_tt_printf(aR_ "\033[0n"); 2627 R->tt_printf("\033[0n");
2723 break; 2628 break;
2724 case 6: /* CPR requested */ 2629 case 6: /* CPR requested */
2725 rxvt_scr_report_position(aR); 2630 rxvt_scr_report_position(aR);
2726 break; 2631 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2632#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2633 case 7: /* unofficial extension */
2729 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730 break; 2635 break;
2731#endif 2636#endif
2732 case 8: /* unofficial extension */ 2637 case 8: /* unofficial extension */
2733 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2639 break;
2803 break; 2708 break;
2804#endif 2709#endif
2805 2710
2806 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2807 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2808 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);
2809 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2810 2715
2811 default: 2716 default:
2812 break; 2717 break;
2813 } 2718 }
2851 break; 2756 break;
2852 case 6: /* lower window */ 2757 case 6: /* lower window */
2853 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2854 break; 2759 break;
2855 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2856 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2857 break; 2762 break;
2858 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2859 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2860 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2861 break; 2766 break;
2867 /* 2772 /*
2868 * reports - some output format copied from XTerm 2773 * reports - some output format copied from XTerm
2869 */ 2774 */
2870 case 11: /* report window state */ 2775 case 11: /* report window state */
2871 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873 break; 2778 break;
2874 case 13: /* report window position */ 2779 case 13: /* report window position */
2875 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877 -wattr.border_width, -wattr.border_width, 2782 -wattr.border_width, -wattr.border_width,
2878 &x, &y, &wdummy); 2783 &x, &y, &wdummy);
2879 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2784 R->tt_printf("\033[3;%d;%dt", x, y);
2880 break; 2785 break;
2881 case 14: /* report window size (pixels) */ 2786 case 14: /* report window size (pixels) */
2882 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884 break; 2789 break;
2885 case 18: /* report window size (chars) */ 2790 case 18: /* report window size (chars) */
2886 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);
2887 break; 2792 break;
2888#if 0 /* XXX: currently disabled due to security concerns */ 2793#if 0 /* XXX: currently disabled due to security concerns */
2889 case 20: /* report icon label */ 2794 case 20: /* report icon label */
2890 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892 break; 2797 break;
2893 case 21: /* report window title */ 2798 case 21: /* report window title */
2894 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896 break; 2801 break;
2897#endif 2802#endif
2898 } 2803 }
2899} 2804}
2900#endif 2805#endif
3072 if (*str != ';') { 2977 if (*str != ';') {
3073#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
3074 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
3075 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
3076#endif 2981#endif
3077 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
3078 } 2983 }
3079 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
3080 str++; 2985 str++;
3081#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
3082 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
3084 } 2989 }
3085 if (changed) { 2990 if (changed) {
3086#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
3087 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
3088#endif 2993#endif
3089 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
3090 } 2995 }
3091 break; 2996 break;
3092 2997
3093 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
3094 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
3180#endif 3085#endif
3181 { 1000, PrivMode_MouseX11 }, 3086 { 1000, PrivMode_MouseX11 },
3182 { 1010, PrivMode_TtyOutputInh }, 3087 { 1010, PrivMode_TtyOutputInh },
3183 { 1011, PrivMode_Keypress }, 3088 { 1011, PrivMode_Keypress },
3184 { 1047, PrivMode_Screen }, 3089 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3185 }; 3091 };
3186 3092
3187 if (nargs == 0) 3093 if (nargs == 0)
3188 return; 3094 return;
3189 3095
3260 break; 3166 break;
3261#endif 3167#endif
3262#ifdef scrollBar_esc 3168#ifdef scrollBar_esc
3263 case scrollBar_esc: 3169 case scrollBar_esc:
3264 if (rxvt_scrollbar_mapping(aR_ state)) { 3170 if (rxvt_scrollbar_mapping(aR_ state)) {
3265 rxvt_resize_all_windows(aR_ 0, 0, 0); 3171 R->resize_all_windows (0, 0, 0);
3266 rxvt_scr_touch(aR_ True); 3172 R->scr_touch (true);
3267 } 3173 }
3268 break; 3174 break;
3269#endif 3175#endif
3270 case 25: /* visible/invisible cursor */ 3176 case 25: /* visible/invisible cursor */
3271 rxvt_scr_cursor_visible(aR_ state); 3177 rxvt_scr_cursor_visible(aR_ state);
3296 R->Options |= Opt_scrollTtyKeypress; 3202 R->Options |= Opt_scrollTtyKeypress;
3297 else 3203 else
3298 R->Options &= ~Opt_scrollTtyKeypress; 3204 R->Options &= ~Opt_scrollTtyKeypress;
3299 break; 3205 break;
3300 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 */
3301 if (R->current_screen != PRIMARY) 3208 if (R->current_screen != PRIMARY)
3302 rxvt_scr_erase_screen(aR_ 2); 3209 R->scr_erase_screen (2);
3303 rxvt_scr_change_screen(aR_ state); 3210 rxvt_scr_change_screen(aR_ state);
3304 /* FALLTHROUGH */ 3211 /* FALLTHROUGH */
3305 default: 3212 default:
3306 break; 3213 break;
3307 } 3214 }
3443{ 3350{
3444 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3351 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445 3352
3446#ifndef RXVT_GRAPHICS 3353#ifndef RXVT_GRAPHICS
3447 if (cmd == 'Q') { /* query graphics */ 3354 if (cmd == 'Q') { /* query graphics */
3448 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3355 R->tt_printf("\033G0\n"); /* no graphics */
3449 return; 3356 return;
3450 } 3357 }
3451/* swallow other graphics sequences until terminating ':' */ 3358/* swallow other graphics sequences until terminating ':' */
3452 do 3359 do
3453 ch = rxvt_cmd_getc(aR); 3360 ch = rxvt_cmd_getc(aR);
3456 unsigned int nargs; 3363 unsigned int nargs;
3457 int args[NGRX_PTS]; 3364 int args[NGRX_PTS];
3458 unsigned char *text = NULL; 3365 unsigned char *text = NULL;
3459 3366
3460 if (cmd == 'Q') { /* query graphics */ 3367 if (cmd == 'Q') { /* query graphics */
3461 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3368 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462 return; 3369 return;
3463 } 3370 }
3464 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3371 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465 int neg; 3372 int neg;
3466 3373
3481 } 3388 }
3482 3389
3483 if ((cmd == 'T') && (nargs >= 5)) { 3390 if ((cmd == 'T') && (nargs >= 5)) {
3484 int i, len = args[4]; 3391 int i, len = args[4];
3485 3392
3486 text = rxvt_malloc((len + 1) * sizeof(char)); 3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3487 3394
3488 if (text != NULL) { 3395 if (text != NULL) {
3489 for (i = 0; i < len; i++) 3396 for (i = 0; i < len; i++)
3490 text[i] = rxvt_cmd_getc(aR); 3397 text[i] = rxvt_cmd_getc(aR);
3491 text[len] = '\0'; 3398 text[len] = '\0';
3500 3407
3501/* 3408/*
3502 * Send printf() formatted output to the command. 3409 * Send printf() formatted output to the command.
3503 * Only use for small amounts of data. 3410 * Only use for small amounts of data.
3504 */ 3411 */
3505/* EXTPROTO */
3506void 3412void
3507rxvt_tt_printf(pR_ const char *fmt,...) 3413rxvt_term::tt_printf (const char *fmt,...)
3508{ 3414{
3509 va_list arg_ptr; 3415 va_list arg_ptr;
3510 unsigned char buf[256]; 3416 unsigned char buf[256];
3511 3417
3512 va_start(arg_ptr, fmt); 3418 va_start (arg_ptr, fmt);
3513 vsprintf((char *)buf, fmt, arg_ptr); 3419 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514 va_end(arg_ptr); 3420 va_end (arg_ptr);
3515 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3421 tt_write (buf, STRLEN (buf));
3516} 3422}
3517 3423
3518/* ---------------------------------------------------------------------- */ 3424/* ---------------------------------------------------------------------- */
3519/* Addresses pasting large amounts of data and rxvt hang
3520 * code pinched from xterm (v_write()) and applied originally to
3521 * rxvt-2.18 - Hops
3522 * 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,
3523 * or generated by us in response to a query ESC sequence. 3426 * or generated by us in response to a query ESC sequence.
3524 */ 3427 */
3525/* EXTPROTO */
3526void 3428void
3527rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3429rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528{ 3430{
3529#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3431 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3530 int riten;
3531 unsigned int p;
3532 unsigned char *v_buffer, /* start of physical buffer */
3533 *v_bufstr, /* start of current buffer pending */
3534 *v_bufptr, /* end of current buffer pending */
3535 *v_bufend; /* end of physical buffer */
3536 3432
3537 if (R->v_bufstr == NULL && len > 0) { 3433 if (len)
3538 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3539 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3540 v_bufend = v_buffer + p;
3541 } else {
3542 v_buffer = R->v_buffer;
3543 v_bufstr = R->v_bufstr;
3544 v_bufptr = R->v_bufptr;
3545 v_bufend = R->v_bufend;
3546 } 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;
3547 3440
3548 /* 3441 data += written;
3549 * Append to the block we already have. Always doing this simplifies the 3442 len -= written;
3550 * code, and isn't too bad, either. If this is a short block, it isn't 3443 }
3551 * too expensive, and if this is a long block, we won't be able to write 3444
3552 * it all anyway. 3445
3553 */ 3446 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554 if (len > 0) { 3447
3555 if (v_bufend < v_bufptr + len) { /* run out of room */ 3448 memcpy (v_buffer + v_buflen, data, len);
3556 if (v_bufstr != v_buffer) { 3449 v_buflen += len;
3557 /* there is unused space, move everything down */
3558 MEMMOVE(v_buffer, v_bufstr,
3559 (unsigned int)(v_bufptr - v_bufstr));
3560 v_bufptr -= v_bufstr - v_buffer;
3561 v_bufstr = v_buffer;
3562 } 3450 }
3563 if (v_bufend < v_bufptr + len) {
3564 /* still won't fit: get more space */
3565 /* use most basic realloc because an error is not fatal. */
3566 unsigned int size = v_bufptr - v_buffer;
3567 unsigned int reallocto;
3568 3451
3569 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3452 for (;;)
3570 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3453 {
3571 /* save across realloc */ 3454 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572 if (v_buffer) { 3455
3573 v_bufstr = v_buffer; 3456 if (written > 0)
3574 v_bufptr = v_buffer + size; 3457 {
3575 v_bufend = v_buffer + reallocto; 3458 v_buflen -= written;
3576 } else { /* no memory: ignore entire write request */ 3459
3577 rxvt_print_error("data loss: cannot allocate buffer space"); 3460 if (v_buflen == 0)
3578 v_buffer = v_bufstr; /* restore clobbered pointer */ 3461 {
3579 } 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 }
3580 } 3480 }
3581 }
3582 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3583 MEMCPY(v_bufptr, d, len);
3584 v_bufptr += len;
3585 }
3586 }
3587
3588 /*
3589 * Write out as much of the buffer as we can.
3590 * Be careful not to overflow the pty's input silo.
3591 * We are conservative here and only write a small amount at a time.
3592 *
3593 * If we can't push all the data into the pty yet, we expect write
3594 * to return a non-negative number less than the length requested
3595 * (if some data written) or -1 and set errno to EAGAIN,
3596 * EWOULDBLOCK, or EINTR (if no data written).
3597 *
3598 * (Not all systems do this, sigh, so the code is actually
3599 * a little more forgiving.)
3600 */
3601 if ((p = v_bufptr - v_bufstr) > 0) {
3602 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3603 if (riten < 0)
3604 riten = 0;
3605 v_bufstr += riten;
3606 if (v_bufstr >= v_bufptr) /* we wrote it all */
3607 v_bufstr = v_bufptr = v_buffer;
3608 }
3609 /*
3610 * If we have lots of unused memory allocated, return it
3611 */
3612 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3613 /* save pointers across realloc */
3614 unsigned int start = v_bufstr - v_buffer;
3615 unsigned int size = v_bufptr - v_buffer;
3616 unsigned int reallocto;
3617
3618 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3619 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3620 if (v_buffer) {
3621 v_bufstr = v_buffer + start;
3622 v_bufptr = v_buffer + size;
3623 v_bufend = v_buffer + reallocto;
3624 } else {
3625 /* should we print a warning if couldn't return memory? */
3626 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3627 }
3628 }
3629 R->v_buffer = v_buffer;
3630 R->v_bufstr = v_bufstr;
3631 R->v_bufptr = v_bufptr;
3632 R->v_bufend = v_bufend;
3633} 3481}
3482
3634/*----------------------- end-of-file (C source) -----------------------*/ 3483/*----------------------- end-of-file (C source) -----------------------*/
3635 3484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines