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.8 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.30 by pcg, Thu Jan 29 21:35:58 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.8 2003/11/26 10:42:34 pcg Exp $ 4 * $Id: command.C,v 1.30 2004/01/29 21:35:58 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
61 unsigned int newlen; 63 unsigned int newlen;
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66#ifdef USE_XIM
67 int valid_keysym; 68 int valid_keysym;
68#endif 69 unsigned char kbuf[KBUFSZ];
69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 81 if (R->numlock_state || (ev->state & R->ModNumLockMask))
82 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 83 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 84 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 85 }
86
87 kbuf[0] = 0;
88
84#ifdef USE_XIM 89#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 90 if (R->Input_Context)
91 {
86 Status status_return; 92 Status status_return;
87 93
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0)
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
92#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
95#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
96 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
127 }
98 } else { 128 else
129#endif
130 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 132 valid_keysym = !len;
102 } 133 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 134
120#ifdef USE_XIM
121 if (valid_keysym) 135 if (valid_keysym)
122#endif
123 { 136 {
124/* for some backwards compatibility */ 137/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
127 if (ctrl) { 140 if (ctrl)
128# else 141# else
129 if (meta) { 142 if (meta)
130# endif 143# endif
144 {
131 if (keysym == R->ks_bigfont) { 145 if (keysym == R->ks_bigfont)
146 {
132 rxvt_change_font(aR_ 0, FONT_UP); 147 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 148 return;
149 }
134 } else if (keysym == R->ks_smallfont) { 150 else if (keysym == R->ks_smallfont)
151 {
135 rxvt_change_font(aR_ 0, FONT_DN); 152 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 153 return;
137 } 154 }
138 } 155 }
139#endif 156#endif
140 157
141 if (R->TermWin.saveLines) { 158 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 254 /* escape prefix */
238 if (meta) 255 if (meta)
239# ifdef META8_OPTION 256# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 257 if (R->meta_char == C0_ESC)
241# endif 258# endif
242 rxvt_tt_write(aR_ &ch, 1); 259 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 260 R->tt_write (kbuf0, l);
244 return; 261 return;
245 } else 262 } else
246#endif 263#endif
247 { 264 {
248 newlen = 1; 265 newlen = 1;
… …
572 if (R->greek_mode) 589 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 590 len = greek_xlat(kbuf, len);
574#endif 591#endif
575 /* nil */ ; 592 /* nil */ ;
576 } 593 }
577 } 594 }
578 595
579 if (len <= 0) 596 if (len <= 0)
580 return; /* not mapped */ 597 return; /* not mapped */
581 598
582 if (R->Options & Opt_scrollTtyKeypress) 599 if (R->Options & Opt_scrollTtyKeypress)
… …
605 && (R->meta_char == C0_ESC) 622 && (R->meta_char == C0_ESC)
606#endif 623#endif
607 ) { 624 ) {
608 const unsigned char ch = C0_ESC; 625 const unsigned char ch = C0_ESC;
609 626
610 rxvt_tt_write(aR_ &ch, 1); 627 R->tt_write(&ch, 1);
611 } 628 }
612#ifdef DEBUG_CMD 629#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 630 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 631 char *p;
615 int i; 632 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
621 } 638 }
622#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
624} 641}
625/*}}} */ 642/*}}} */
626 643
627#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
654 R->cmdbuf_ptr = cmdbuf_ptr; 671 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->cmdbuf_endp = cmdbuf_endp; 672 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
676
677void
678rxvt_term::flush ()
679{
680#ifdef TRANSPARENT
681 if (want_full_refresh)
682 {
683 want_full_refresh = 0;
684 scr_clear ();
685 scr_touch (false);
686 want_refresh = 1;
687 }
688#endif
689
690 if (want_refresh)
691 {
692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM
695 rxvt_IMSendSpot (this);
696#endif
697 }
698
699 XFlush (Xdisplay);
700}
701
702void
703rxvt_term::check_cb (check_watcher &w)
704{
705 SET_R (this);
706 SET_LOCALE (locale);
707
708 flush ();
709}
659 710
660void 711void
661rxvt_term::process_x_events () 712rxvt_term::process_x_events ()
662{ 713{
663 do 714 do
… …
701 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
702 } 753 }
703 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
704} 755}
705 756
757#ifdef CURSOR_BLINK
706void 758void
707rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
708{ 760{
709 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 762 want_refresh = 1;
712 flush (); 763
764 w.start (w.at + BLINK_INTERVAL);
713} 765}
766#endif
714 767
715void 768void
716rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
717{ 770{
771 SET_R (this);
772 SET_LOCALE (locale);
773
718 process_x_events (); 774 process_x_events ();
719
720 flush ();
721}
722
723// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future
725uint32_t
726rxvt_term::next_char ()
727{
728 struct mbstate &s = mbstate;
729
730 while (cmdbuf_ptr < cmdbuf_endp)
731 {
732 uint8_t ch = *cmdbuf_ptr;
733
734 if (s.cnt)
735 {
736 if ((ch & 0xc0) == 0x80)
737 {
738 cmdbuf_ptr++;
739
740 /* continuation */
741 s.reg = (s.reg << 6) | (ch & 0x7f);
742
743 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
744 return s.reg;
745
746 continue;
747 }
748 else
749 {
750 s.cnt = 0;
751 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
752 }
753 }
754
755 if ((ch & 0xc0) == 0xc0)
756 {
757 cmdbuf_ptr++;
758
759 /* first byte */
760 s.orig = ch; /* for broken encodings */
761 s.reg = ch;
762 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
763 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
764 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
765 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
766 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
767 }
768 else
769 {
770 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
771 return ch;
772 }
773 }
774
775 return NOCHAR;
776} 775}
777 776
778bool 777bool
779rxvt_term::pty_fill () 778rxvt_term::pty_fill ()
780{ 779{
… …
789 if (n > 0) 788 if (n > 0)
790 { 789 {
791 cmdbuf_endp += n; 790 cmdbuf_endp += n;
792 return true; 791 return true;
793 } 792 }
794 else if (n < 0 && errno == EAGAIN) 793 else if (n < 0 && errno != EAGAIN)
794 destroy ();
795
795 return false; 796 return false;
796
797 rxvt_clean_exit ();
798 exit (EXIT_FAILURE); /* bad order of events? */
799} 797}
800 798
801void 799void
802rxvt_term::pty_cb (io_watcher &w, short revents) 800rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 801{
804 // loop, but don't allow a single term to monopolize us 802 SET_R (this);
805 // the number of loops is fully arbitrary, and thus wrong 803 SET_LOCALE (locale);
806 for (int i = 7; i-- && pty_fill (); ) 804
805 if (revents & EVENT_WRITE)
806 tt_write (0, 0);
807 else if (revents & EVENT_READ)
807 { 808 {
808 //TODO: 809 bool flag = true;
809 /* once we know the shell is running, send the screen size. Again! */
810 //ch = rxvt_cmd_getc(aR); /* wait for something */
811 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
812 810
813 uint32_t ch = NOCHAR; 811 // loop, but don't allow a single term to monopolize us
814 812 // the number of loops is fully arbitrary, and thus wrong
815 for (;;) 813 while (flag && pty_fill ())
816 { 814 {
817 if (ch == NOCHAR) 815 if (!seen_input)
818 ch = next_char ();
819
820 if (ch == NOCHAR) // TODO: improve
821 break;
822
823 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
824 { 816 {
825 /* Read a text string from the input buffer */ 817 seen_input = 1;
826 uint32_t buf[BUFSIZ]; 818 /* once we know the shell is running, send the screen size. Again! */
827 bool refreshnow = false; 819 tt_winch ();
828 int nlines = 0; 820 }
829 uint32_t *str = buf;
830 821
831 *str++ = ch; 822 uint32_t ch = NOCHAR;
832 823
833 for (;;) 824 for (;;)
825 {
826 if (ch == NOCHAR)
827 ch = next_char ();
828
829 if (ch == NOCHAR) // TODO: improve
830 break;
831
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
834 { 833 {
835 ch = next_char (); 834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
836 839
837 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 840 *str++ = ch;
841
838 break; 842 for (;;)
839 else
840 { 843 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
841 *str++ = ch; 848 else
842
843 if (ch == '\n')
844 { 849 {
845 nlines++; 850 *str++ = ch;
846 refresh_count++;
847 851
848 if (!(Options & Opt_jumpScroll) 852 if (ch == '\n')
849 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
850 { 853 {
854 nlines++;
855 refresh_count++;
856
857 if (!(Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
851 refreshnow = true; 860 refreshnow = true;
861 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865 }
866
867 if (str >= buf + BUFSIZ)
868 {
852 ch = NOCHAR; 869 ch = NOCHAR;
853 break; 870 break;
854 } 871 }
855 } 872 }
856
857 if (str >= buf + BUFSIZ)
858 {
859 ch = NOCHAR;
860 break;
861 }
862 } 873 }
874
875 rxvt_scr_add_lines (this, buf, nlines, str - buf);
876
877 /*
878 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which
881 * is incremented here because we must be doing flat-out scrolling.
882 *
883 * refreshing should be correct for small scrolls, because of the
884 * time-out
885 */
886 if (refreshnow)
887 {
888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
889 refresh_limit++;
890
891 scr_refresh (refresh_type);
892 }
893
863 } 894 }
864
865 rxvt_scr_add_lines (this, buf, nlines, str - buf);
866
867 /* 895 else
868 * If there have been a lot of new lines, then update the screen
869 * What the heck I'll cheat and only refresh less than every page-full.
870 * the number of pages between refreshes is refresh_limit, which
871 * is incremented here because we must be doing flat-out scrolling.
872 *
873 * refreshing should be correct for small scrolls, because of the
874 * time-out
875 */
876 if (refreshnow)
877 { 896 {
878 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 897 switch (ch)
879 refresh_limit++; 898 {
899 default:
900 rxvt_process_nonprinting (this, ch);
901 break;
902 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this);
904 break;
905 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */
907 }
880 908
881 rxvt_scr_refresh (this, refresh_type); 909 ch = NOCHAR;
882 } 910 }
883
884 }
885 else
886 {
887 switch (ch)
888 {
889 default:
890 rxvt_process_nonprinting (this, ch);
891 break;
892 case C0_ESC: /* escape char */
893 rxvt_process_escape_seq (this);
894 break;
895 /*case 0x9b: */ /* CSI */
896 /* rxvt_process_csi_seq (this); */
897 }
898
899 ch = NOCHAR;
900 } 911 }
901 } 912 }
902 } 913 }
903
904 flush ();
905} 914}
906 915
907void 916// read the next character, currently handles UTF-8
908rxvt_term::flush () 917// will probably handle all sorts of other stuff in the future
918uint32_t
919rxvt_term::next_char ()
909{ 920{
910#ifdef TRANSPARENT 921 while (cmdbuf_ptr < cmdbuf_endp)
911 if (want_full_refresh)
912 { 922 {
913 want_full_refresh = 0; 923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
914 rxvt_scr_clear (this); 924 return *cmdbuf_ptr++;
915 rxvt_scr_touch (this, False);
916 want_refresh = 1;
917 }
918#endif
919 925
920 if (want_refresh) 926 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928
929 if (len == (size_t)-2)
930 return NOCHAR;
931
932 if (len == (size_t)-1)
933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934
935 // assume wchar == unicode
936 cmdbuf_ptr += len;
937 return wc;
921 { 938 }
922 rxvt_scr_refresh (this, refresh_type);
923 rxvt_scrollbar_show (this, 1);
924#ifdef USE_XIM
925 rxvt_IMSendSpot (this);
926#endif
927 }
928 939
929 if (XPending (Xdisplay)) process_x_events (); 940 return NOCHAR;
930 XFlush (Xdisplay);
931 if (XPending (Xdisplay)) process_x_events ();
932} 941}
933 942
934/* rxvt_cmd_getc() - Return next input character */ 943/* rxvt_cmd_getc() - Return next input character */
935/* 944/*
936 * Return the next input character after first passing any keyboard input 945 * Return the next input character after first passing any keyboard input
… …
965 974
966 for (;;) { 975 for (;;) {
967 /* loop until we can return something */ 976 /* loop until we can return something */
968 977
969 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
970 rxvt_tt_write(aR_ NULL, 0); 979 R->tt_write(NULL, 0);
971 980
972#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
973 if (R->mouse_slip_wheel_speed) { 982 if (R->mouse_slip_wheel_speed) {
974 quick_timeout = 1; 983 quick_timeout = 1;
975 if (!R->mouse_slip_wheel_delay-- 984 if (!R->mouse_slip_wheel_delay--
… …
985 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
986 quick_timeout = 1; 995 quick_timeout = 1;
987 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
988 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
989 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
990 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
991 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
992 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
993 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
994 R->want_refresh = 1; 1003 R->want_refresh = 1;
995 } 1004 }
… …
1011 quick_timeout |= R->want_full_refresh; 1020 quick_timeout |= R->want_full_refresh;
1012#endif 1021#endif
1013#endif 1022#endif
1014} 1023}
1015 1024
1025#ifdef POINTER_BLANK
1016void 1026void
1017rxvt_term::pointer_unblank () 1027rxvt_term::pointer_unblank ()
1018{ 1028{
1019 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1020 rxvt_recolour_cursor (this); 1030 recolour_cursor ();
1021 1031
1022#ifdef POINTER_BLANK
1023 hidden_pointer = 0; 1032 hidden_pointer = 0;
1024 1033
1025 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
1026 pointer_ev.start (NOW + pointerBlankDelay); 1035 pointer_ev.start (NOW + pointerBlankDelay);
1027#endif
1028} 1036}
1029 1037
1030#ifdef POINTER_BLANK
1031void 1038void
1032rxvt_term::pointer_blank () 1039rxvt_term::pointer_blank ()
1033{ 1040{
1034 pointer_ev.stop ();
1035
1036 if (!(Options & Opt_pointerBlank)) 1041 if (!(Options & Opt_pointerBlank))
1037 return; 1042 return;
1038 1043
1039 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1044 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1040 XFlush (Xdisplay); 1045 XFlush (Xdisplay);
… …
1043} 1048}
1044 1049
1045void 1050void
1046rxvt_term::pointer_cb (time_watcher &w) 1051rxvt_term::pointer_cb (time_watcher &w)
1047{ 1052{
1053 SET_R (this);
1054 SET_LOCALE (locale);
1055
1048 pointer_blank (); 1056 pointer_blank ();
1049} 1057}
1050#endif 1058#endif
1051 1059
1052/* INTPROTO */ 1060/* INTPROTO */
… …
1056 int button_number, key_state = 0; 1064 int button_number, key_state = 0;
1057 int x, y; 1065 int x, y;
1058 1066
1059 x = ev->x; 1067 x = ev->x;
1060 y = ev->y; 1068 y = ev->y;
1061 rxvt_pixel_position(aR_ &x, &y); 1069 R->pixel_position (&x, &y);
1062 1070
1063 if (R->MEvent.button == AnyButton) { 1071 if (R->MEvent.button == AnyButton) {
1064 button_number = 3; 1072 button_number = 3;
1065 } else { 1073 } else {
1066 button_number = R->MEvent.button - Button1; 1074 button_number = R->MEvent.button - Button1;
… …
1106 fprintf(stderr, "]: <%d>, %d/%d\n", 1114 fprintf(stderr, "]: <%d>, %d/%d\n",
1107 button_number, 1115 button_number,
1108 x + 1, 1116 x + 1,
1109 y + 1); 1117 y + 1);
1110#else 1118#else
1111 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1119 R->tt_printf("\033[M%c%c%c",
1112 (32 + button_number + key_state), 1120 (32 + button_number + key_state),
1113 (32 + x + 1), 1121 (32 + x + 1),
1114 (32 + y + 1)); 1122 (32 + y + 1));
1115#endif 1123#endif
1116} 1124}
… …
1133{ 1141{
1134 int i, want_timeout; 1142 int i, want_timeout;
1135 Window unused_root, unused_child; 1143 Window unused_root, unused_child;
1136 int unused_root_x, unused_root_y; 1144 int unused_root_x, unused_root_y;
1137 unsigned int unused_mask; 1145 unsigned int unused_mask;
1138 struct timeval tp;
1139 1146
1140#ifdef DEBUG_X 1147#ifdef DEBUG_X
1141 const char *const eventnames[] = 1148 const char *const eventnames[] =
1142 { /* mason - this matches my system */ 1149 { /* mason - this matches my system */
1143 "", 1150 "",
… …
1174 "SelectionNotify", 1181 "SelectionNotify",
1175 "ColormapNotify", 1182 "ColormapNotify",
1176 "ClientMessage", 1183 "ClientMessage",
1177 "MappingNotify" 1184 "MappingNotify"
1178 }; 1185 };
1186#endif
1187
1188#ifdef DEBUG_X
1189 struct timeval tp;
1179 struct tm *ltt; 1190 struct tm *ltt;
1180#endif
1181
1182 /*
1183 * check if we need to get the time for any timeouts
1184 */
1185
1186 for (i = NUM_TIMEOUTS; i--; )
1187 if (R->timeout[i].tv_sec) {
1188 want_timeout = 1;
1189 break;
1190 }
1191
1192#ifndef DEBUG_X
1193 if (want_timeout)
1194#endif
1195 (void)gettimeofday(&tp, NULL); 1191 (void)gettimeofday(&tp, NULL);
1196
1197#ifdef DEBUG_X
1198 ltt = localtime(&(tp.tv_sec)); 1192 ltt = localtime(&(tp.tv_sec));
1199 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)); 1193 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1200#endif 1194#endif
1201
1202 /* X event timeouts */
1203 if (want_timeout)
1204 for (i = NUM_TIMEOUTS; i--; ) {
1205 if (R->timeout[i].tv_sec == 0)
1206 continue;
1207 if ((tp.tv_sec < R->timeout[i].tv_sec)
1208 || (tp.tv_sec == R->timeout[i].tv_sec
1209 && tp.tv_usec < R->timeout[i].tv_usec))
1210 continue;
1211 R->timeout[i].tv_sec = 0;
1212 switch(i) {
1213 case TIMEOUT_INCR:
1214 rxvt_print_error("data loss: timeout on INCR selection paste");
1215 R->selection_wait = Sel_none;
1216 break;
1217 default:
1218 break;
1219 }
1220 }
1221 1195
1222 switch (ev->type) { 1196 switch (ev->type) {
1223 case KeyPress: 1197 case KeyPress:
1224 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1225 break; 1199 break;
… …
1249 break; 1223 break;
1250 1224
1251 case ClientMessage: 1225 case ClientMessage:
1252 if (ev->xclient.format == 32 1226 if (ev->xclient.format == 32
1253 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1227 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1254 exit(EXIT_SUCCESS); 1228 R->destroy ();
1255#ifdef OFFIX_DND 1229#ifdef OFFIX_DND
1256 /* OffiX Dnd (drag 'n' drop) protocol */ 1230 /* OffiX Dnd (drag 'n' drop) protocol */
1257 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1231 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1258 && (ev->xclient.data.l[0] == DndFile 1232 && (ev->xclient.data.l[0] == DndFile
1259 || ev->xclient.data.l[0] == DndDir 1233 || ev->xclient.data.l[0] == DndDir
1260 || ev->xclient.data.l[0] == DndLink)) { 1234 || ev->xclient.data.l[0] == DndLink)) {
1261 /* Get Dnd data */ 1235 /* Get Dnd data */
1262 Atom ActualType; 1236 Atom ActualType;
… …
1351 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1325 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1352 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1326 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1353 ConfigureNotify, ev)); 1327 ConfigureNotify, ev));
1354 if (R->szHint.width != width || R->szHint.height != height) { 1328 if (R->szHint.width != width || R->szHint.height != height) {
1355 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1329 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1356 rxvt_resize_all_windows(aR_ (unsigned int)width, 1330 R->resize_all_windows (width, height, 1);
1357 (unsigned int)height, 1);
1358 } 1331 }
1359#ifdef DEBUG_SIZE 1332#ifdef DEBUG_SIZE
1360 else { 1333 else {
1361 D_SIZE((stderr, "Size: Not resizing")); 1334 D_SIZE((stderr, "Size: Not resizing"));
1362 } 1335 }
… …
1421 1394
1422 case GraphicsExpose: 1395 case GraphicsExpose:
1423 case Expose: 1396 case Expose:
1424 if (ev->xany.window == R->TermWin.vt) { 1397 if (ev->xany.window == R->TermWin.vt) {
1425#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1426 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1427 ev->xexpose.width, ev->xexpose.height, False); 1400 ev->xexpose.width, ev->xexpose.height, False);
1428#else 1401#else
1429 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1430 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1431 ev->xexpose.width, ev->xexpose.height, False); 1404 ev->xexpose.width, ev->xexpose.height, False);
1432 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1433 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev->xexpose.width, R->TermWin.height, False);
1434#endif 1407#endif
1435 R->want_refresh = 1; 1408 R->want_refresh = 1;
1436 } else { 1409 } else {
… …
1441 &unused_xevent)) ; 1414 &unused_xevent)) ;
1442 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1415 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1443 GraphicsExpose, 1416 GraphicsExpose,
1444 &unused_xevent)) ; 1417 &unused_xevent)) ;
1445 if (isScrollbarWindow(ev->xany.window)) { 1418 if (isScrollbarWindow(ev->xany.window)) {
1446 scrollbar_setIdle(); 1419 R->scrollBar.setIdle();
1447 rxvt_scrollbar_show(aR_ 0); 1420 rxvt_scrollbar_show(aR_ 0);
1448 } 1421 }
1449#ifdef MENUBAR 1422#ifdef MENUBAR
1450 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1423 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1451 rxvt_menubar_expose(aR); 1424 rxvt_menubar_expose(aR);
… …
1481 &unused_mask); 1454 &unused_mask);
1482#ifdef MOUSE_THRESHOLD 1455#ifdef MOUSE_THRESHOLD
1483 /* deal with a `jumpy' mouse */ 1456 /* deal with a `jumpy' mouse */
1484 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1457 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1485#endif 1458#endif
1486 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1459 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1487 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1460 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1488#ifdef SELECTION_SCROLLING 1461#ifdef SELECTION_SCROLLING
1489 if (ev->xbutton.y<R->TermWin.int_bwidth || 1462 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1490 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1463 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1491 int dist; 1464 int dist;
… …
1540 &unused_root_x, &unused_root_y, 1513 &unused_root_x, &unused_root_y,
1541 &(ev->xbutton.x), &(ev->xbutton.y), 1514 &(ev->xbutton.x), &(ev->xbutton.y),
1542 &unused_mask); 1515 &unused_mask);
1543 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1516 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1544 scrollbar_size()); 1517 scrollbar_size());
1545 rxvt_scr_refresh(aR_ R->refresh_type); 1518 R->scr_refresh (R->refresh_type);
1546 R->refresh_limit = 0; 1519 R->refresh_limit = 0;
1547 rxvt_scrollbar_show(aR_ 1); 1520 rxvt_scrollbar_show(aR_ 1);
1548 } 1521 }
1549 break; 1522 break;
1550 } 1523 }
… …
1552 1525
1553/* INTPROTO */ 1526/* INTPROTO */
1554void 1527void
1555rxvt_button_press(pR_ XButtonEvent *ev) 1528rxvt_button_press(pR_ XButtonEvent *ev)
1556{ 1529{
1557 int reportmode = 0, clickintime; 1530 int reportmode = 0, clickintime;
1558 1531
1559 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1532 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1560 if (!R->bypass_keystate) 1533 if (!R->bypass_keystate)
1561 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1534 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1562/* 1535/*
… …
1564 */ 1537 */
1565 if (ev->window == R->TermWin.vt) 1538 if (ev->window == R->TermWin.vt)
1566 { 1539 {
1567#if RXVT_GRAPHICS 1540#if RXVT_GRAPHICS
1568 if (ev->subwindow != None) 1541 if (ev->subwindow != None)
1569 rxvt_Gr_ButtonPress(ev->x, ev->y); 1542 rxvt_Gr_ButtonPress (ev->x, ev->y);
1570 else 1543 else
1571#endif 1544#endif
1572 { 1545 {
1573 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1546 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1574 if (reportmode) 1547 if (reportmode)
… …
1609 if (ev->button != R->MEvent.button) 1582 if (ev->button != R->MEvent.button)
1610 R->MEvent.clicks = 0; 1583 R->MEvent.clicks = 0;
1611 switch (ev->button) 1584 switch (ev->button)
1612 { 1585 {
1613 case Button1: 1586 case Button1:
1587 /* allow shift+left click to extend selection */
1588 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1589 {
1614 if (R->MEvent.button == Button1 && clickintime) 1590 if (R->MEvent.button == Button1 && clickintime)
1591 R->selection_rotate (ev->x, ev->y);
1615 R->MEvent.clicks++; 1592 else
1593 R->selection_extend (ev->x, ev->y, 1);
1594 }
1616 else 1595 else
1596 {
1597 if (R->MEvent.button == Button1 && clickintime)
1598 R->MEvent.clicks++;
1599 else
1617 R->MEvent.clicks = 1; 1600 R->MEvent.clicks = 1;
1601
1618 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1602 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1603 }
1604
1619 R->MEvent.button = Button1; 1605 R->MEvent.button = Button1;
1620 break; 1606 break;
1621 1607
1622 case Button3: 1608 case Button3:
1623 if (R->MEvent.button == Button3 && clickintime) 1609 if (R->MEvent.button == Button3 && clickintime)
1624 rxvt_selection_rotate(aR_ ev->x, ev->y); 1610 R->selection_rotate (ev->x, ev->y);
1625 else 1611 else
1626 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1612 R->selection_extend (ev->x, ev->y, 1);
1627 R->MEvent.button = Button3; 1613 R->MEvent.button = Button3;
1628 break; 1614 break;
1629 } 1615 }
1630 } 1616 }
1631 R->MEvent.time = ev->time; 1617 R->MEvent.time = ev->time;
… …
1636/* 1622/*
1637 * Scrollbar window processing of button press 1623 * Scrollbar window processing of button press
1638 */ 1624 */
1639 if (isScrollbarWindow(ev->window)) 1625 if (isScrollbarWindow(ev->window))
1640 { 1626 {
1641 scrollbar_setIdle(); 1627 R->scrollBar.setIdle ();
1642 /* 1628 /*
1643 * Rxvt-style scrollbar: 1629 * Rxvt-style scrollbar:
1644 * move up if mouse is above slider 1630 * move up if mouse is above slider
1645 * move dn if mouse is below slider 1631 * move dn if mouse is below slider
1646 * 1632 *
… …
1658 */ 1644 */
1659 if ((R->scrollBar.style == R_SB_NEXT 1645 if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_upButton(ev->y)) 1646 && scrollbarnext_upButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT 1647 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_upButton(ev->y))) 1648 && scrollbarrxvt_upButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[A"); 1649 R->tt_printf("\033[A");
1664 else if ((R->scrollBar.style == R_SB_NEXT 1650 else if ((R->scrollBar.style == R_SB_NEXT
1665 && scrollbarnext_dnButton(ev->y)) 1651 && scrollbarnext_dnButton(ev->y))
1666 || (R->scrollBar.style == R_SB_RXVT 1652 || (R->scrollBar.style == R_SB_RXVT
1667 && scrollbarrxvt_dnButton(ev->y))) 1653 && scrollbarrxvt_dnButton(ev->y)))
1668 rxvt_tt_printf(aR_ "\033[B"); 1654 R->tt_printf("\033[B");
1669 else 1655 else
1670 switch (ev->button) { 1656 switch (ev->button) {
1671 case Button2: 1657 case Button2:
1672 rxvt_tt_printf(aR_ "\014"); 1658 R->tt_printf("\014");
1673 break; 1659 break;
1674 case Button1: 1660 case Button1:
1675 rxvt_tt_printf(aR_ "\033[6~"); 1661 R->tt_printf("\033[6~");
1676 break; 1662 break;
1677 case Button3: 1663 case Button3:
1678 rxvt_tt_printf(aR_ "\033[5~"); 1664 R->tt_printf("\033[5~");
1679 break; 1665 break;
1680 } 1666 }
1681 } 1667 }
1682 else 1668 else
1683#endif /* NO_SCROLLBAR_REPORT */ 1669#endif /* NO_SCROLLBAR_REPORT */
… …
1699#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1685#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1700 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1686 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1701#endif 1687#endif
1702 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1688 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1703 if (upordown < 0) 1689 if (upordown < 0)
1704 scrollbar_setUp(); 1690 R->scrollBar.setUp ();
1705 else 1691 else
1706 scrollbar_setDn(); 1692 R->scrollBar.setDn ();
1707 } 1693 }
1708 } else 1694 } else
1709 switch (ev->button) { 1695 switch (ev->button) {
1710 case Button2: 1696 case Button2:
1711 switch (R->scrollbar_align) { 1697 switch (R->scrollbar_align) {
… …
1723 || scrollbar_above_slider(ev->y) 1709 || scrollbar_above_slider(ev->y)
1724 || scrollbar_below_slider(ev->y)) 1710 || scrollbar_below_slider(ev->y))
1725 rxvt_scr_move_to(aR_ 1711 rxvt_scr_move_to(aR_
1726 scrollbar_position(ev->y) - R->csrO, 1712 scrollbar_position(ev->y) - R->csrO,
1727 scrollbar_size()); 1713 scrollbar_size());
1728 scrollbar_setMotion(); 1714 R->scrollBar.setMotion ();
1729 break; 1715 break;
1730 1716
1731 case Button1: 1717 case Button1:
1732 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1718 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1733 R->csrO = ev->y - R->scrollBar.top; 1719 R->csrO = ev->y - R->scrollBar.top;
… …
1746 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1732 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1747# else 1733# else
1748 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1749# endif 1735# endif
1750 else 1736 else
1751 scrollbar_setMotion(); 1737 R->scrollBar.setMotion ();
1752 } else { 1738 } else {
1753 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1739 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1754 (R->TermWin.nrow 1740 (R->TermWin.nrow
1755 * scrollbar_position(ev->y) 1741 * scrollbar_position(ev->y)
1756 / scrollbar_size())); 1742 / scrollbar_size()));
… …
1778 R->csrO = 0; /* reset csr Offset */ 1764 R->csrO = 0; /* reset csr Offset */
1779 if (!R->bypass_keystate) 1765 if (!R->bypass_keystate)
1780 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1766 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1781 1767
1782 if (scrollbar_isUpDn()) { 1768 if (scrollbar_isUpDn()) {
1783 scrollbar_setIdle(); 1769 R->scrollBar.setIdle ();
1784 rxvt_scrollbar_show(aR_ 0); 1770 rxvt_scrollbar_show(aR_ 0);
1785#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1771#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1786 R->refresh_type &= ~SMOOTH_REFRESH; 1772 R->refresh_type &= ~SMOOTH_REFRESH;
1787#endif 1773#endif
1788 } 1774 }
… …
1825 * when overriding mouse reporting 1811 * when overriding mouse reporting
1826 */ 1812 */
1827 if (R->PrivateModes & PrivMode_mouse_report 1813 if (R->PrivateModes & PrivMode_mouse_report
1828 && R->bypass_keystate 1814 && R->bypass_keystate
1829 && ev->button == Button1 && R->MEvent.clicks <= 1) 1815 && ev->button == Button1 && R->MEvent.clicks <= 1)
1830 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1816 R->selection_extend (ev->x, ev->y, 0);
1831 1817
1832 switch (ev->button) { 1818 switch (ev->button) {
1833 case Button1: 1819 case Button1:
1834 case Button3: 1820 case Button3:
1835 rxvt_selection_make(aR_ ev->time); 1821 rxvt_selection_make(aR_ ev->time);
… …
1839 break; 1825 break;
1840#ifdef MOUSE_WHEEL 1826#ifdef MOUSE_WHEEL
1841 case Button4: 1827 case Button4:
1842 case Button5: 1828 case Button5:
1843 { 1829 {
1844 int i, v; 1830 int i;
1831 page_dirn v;
1845 1832
1846 v = (ev->button == Button4) ? UP : DN; 1833 v = (ev->button == Button4) ? UP : DN;
1847 if (ev->state & ShiftMask) 1834 if (ev->state & ShiftMask)
1848 i = 1; 1835 i = 1;
1849 else if ((R->Options & Opt_mouseWheelScrollPage)) 1836 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1857 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1844 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1858 } 1845 }
1859# endif 1846# endif
1860# ifdef JUMP_MOUSE_WHEEL 1847# ifdef JUMP_MOUSE_WHEEL
1861 rxvt_scr_page(aR_ v, i); 1848 rxvt_scr_page(aR_ v, i);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1849 R->scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1850 rxvt_scrollbar_show(aR_ 1);
1864# else 1851# else
1865 for (; i--;) 1852 while (i--)
1866 { 1853 {
1867 rxvt_scr_page(aR_ v, 1); 1854 rxvt_scr_page(aR_ v, 1);
1868 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1855 R->scr_refresh (SMOOTH_REFRESH);
1869 rxvt_scrollbar_show(aR_ 1); 1856 rxvt_scrollbar_show(aR_ 1);
1870 } 1857 }
1871# endif 1858# endif
1872 } 1859 }
1873 break; 1860 break;
… …
2024 n = 0; 2011 n = 0;
2025 if (pchanged) { 2012 if (pchanged) {
2026 for (; n < (unsigned int)i; n++) { 2013 for (; n < (unsigned int)i; n++) {
2027 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2014 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2028 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2029 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2030 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2017 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2031 break; 2018 break;
2032 } 2019 }
2033 } 2020 }
2034 } 2021 }
… …
2084 return stream; 2071 return stream;
2085} 2072}
2086 2073
2087/* EXTPROTO */ 2074/* EXTPROTO */
2088int 2075int
2089rxvt_pclose_printer(FILE *stream) 2076rxvt_pclose_printer (FILE *stream)
2090{ 2077{
2091 fflush(stream); 2078 fflush (stream);
2092/* pclose() reported not to work on SunOS 4.1.3 */ 2079/* pclose() reported not to work on SunOS 4.1.3 */
2093# if defined (__sun__) /* TODO: RESOLVE THIS */ 2080# if defined (__sun__) /* TODO: RESOLVE THIS */
2094/* pclose works provided SIGCHLD handler uses waitpid */ 2081/* pclose works provided SIGCHLD handler uses waitpid */
2095 return pclose(stream); /* return fclose (stream); */ 2082 return pclose (stream); /* return fclose (stream); */
2096# else 2083# else
2097 return pclose(stream); 2084 return pclose (stream);
2098# endif 2085# endif
2099} 2086}
2100 2087
2101/* 2088/*
2102 * simulate attached vt100 printer 2089 * simulate attached vt100 printer
… …
2165rxvt_process_nonprinting(pR_ unsigned char ch) 2152rxvt_process_nonprinting(pR_ unsigned char ch)
2166{ 2153{
2167 switch (ch) { 2154 switch (ch) {
2168 case C0_ENQ: /* terminal Status */ 2155 case C0_ENQ: /* terminal Status */
2169 if (R->rs[Rs_answerbackstring]) 2156 if (R->rs[Rs_answerbackstring])
2170 rxvt_tt_write(aR_ 2157 R->tt_write(
2171 (const unsigned char *)R->rs[Rs_answerbackstring], 2158 (const unsigned char *)R->rs[Rs_answerbackstring],
2172 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2159 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2173 else 2160 else
2174 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2161 R->tt_write((unsigned char *)VT100_ANS,
2175 (unsigned int)STRLEN(VT100_ANS)); 2162 (unsigned int)STRLEN(VT100_ANS));
2176 break; 2163 break;
2177 case C0_BEL: /* bell */ 2164 case C0_BEL: /* bell */
2178 rxvt_scr_bell(aR); 2165 rxvt_scr_bell(aR);
2179 break; 2166 break;
… …
2227 break; 2214 break;
2228 case 'I': /* cursor up and scroll down if needed */ 2215 case 'I': /* cursor up and scroll down if needed */
2229 rxvt_scr_index(aR_ DN); 2216 rxvt_scr_index(aR_ DN);
2230 break; 2217 break;
2231 case 'J': /* erase to end of screen */ 2218 case 'J': /* erase to end of screen */
2232 rxvt_scr_erase_screen(aR_ 0); 2219 R->scr_erase_screen (0);
2233 break; 2220 break;
2234 case 'K': /* erase to end of line */ 2221 case 'K': /* erase to end of line */
2235 rxvt_scr_erase_line(aR_ 0); 2222 rxvt_scr_erase_line(aR_ 0);
2236 break; 2223 break;
2237 case 'Y': /* move to specified row and col */ 2224 case 'Y': /* move to specified row and col */
… …
2242 row = rxvt_cmd_getc(aR) - ' '; 2229 row = rxvt_cmd_getc(aR) - ' ';
2243 col = rxvt_cmd_getc(aR) - ' '; 2230 col = rxvt_cmd_getc(aR) - ' ';
2244 rxvt_scr_gotorc(aR_ row, col, 0); 2231 rxvt_scr_gotorc(aR_ row, col, 0);
2245 break; 2232 break;
2246 case 'Z': /* identify the terminal type */ 2233 case 'Z': /* identify the terminal type */
2247 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2234 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2248 break; 2235 break;
2249 case '<': /* turn off VT52 mode */ 2236 case '<': /* turn off VT52 mode */
2250 PrivMode(0, PrivMode_vt52); 2237 PrivMode(0, PrivMode_vt52);
2251 break; 2238 break;
2252 case 'F': /* use special graphics character set */ 2239 case 'F': /* use special graphics character set */
… …
2359 rxvt_process_dcs_seq(aR); 2346 rxvt_process_dcs_seq(aR);
2360 break; 2347 break;
2361 2348
2362 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2349 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2363 case C1_SCI: /* ESC Z */ 2350 case C1_SCI: /* ESC Z */
2364 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2351 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2365 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2352 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2366 break; /* steal obsolete ESC [ c */ 2353 break; /* steal obsolete ESC [ c */
2367 2354
2368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2355 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2369 case C1_CSI: /* ESC [ */ 2356 case C1_CSI: /* ESC [ */
… …
2490 */ 2477 */
2491 if (priv) { 2478 if (priv) {
2492 switch (priv) { 2479 switch (priv) {
2493 case '>': 2480 case '>':
2494 if (ch == CSI_DA) /* secondary device attributes */ 2481 if (ch == CSI_DA) /* secondary device attributes */
2495 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2482 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2496 break; 2483 break;
2497 case '?': 2484 case '?':
2498 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2485 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2499 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2486 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2500 break; 2487 break;
… …
2572 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2559 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2573 rxvt_scr_tab(aR_ arg[0]); 2560 rxvt_scr_tab(aR_ arg[0]);
2574 break; 2561 break;
2575 2562
2576 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2563 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2577 rxvt_scr_erase_screen(aR_ arg[0]); 2564 R->scr_erase_screen (arg[0]);
2578 break; 2565 break;
2579 2566
2580 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2567 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2581 rxvt_scr_erase_line(aR_ arg[0]); 2568 rxvt_scr_erase_line(aR_ arg[0]);
2582 break; 2569 break;
… …
2603 2590
2604 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2591 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2605 arg[0] = -arg[0]; 2592 arg[0] = -arg[0];
2606 /* FALLTHROUGH */ 2593 /* FALLTHROUGH */
2607 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2594 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2608 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2595 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2609 break; 2596 break;
2610 2597
2611 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2598 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2612 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2599 R->tt_write((const unsigned char *)VT100_ANS,
2613 (unsigned int)(sizeof(VT100_ANS) - 1)); 2600 (unsigned int)(sizeof(VT100_ANS) - 1));
2614 break; 2601 break;
2615 2602
2616 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2603 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2617 rxvt_process_sgr_mode(aR_ nargs, arg); 2604 rxvt_process_sgr_mode(aR_ nargs, arg);
2618 break; 2605 break;
2619 2606
2620 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2607 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2621 switch (arg[0]) { 2608 switch (arg[0]) {
2622 case 5: /* DSR requested */ 2609 case 5: /* DSR requested */
2623 rxvt_tt_printf(aR_ "\033[0n"); 2610 R->tt_printf("\033[0n");
2624 break; 2611 break;
2625 case 6: /* CPR requested */ 2612 case 6: /* CPR requested */
2626 rxvt_scr_report_position(aR); 2613 rxvt_scr_report_position(aR);
2627 break; 2614 break;
2628#if defined (ENABLE_DISPLAY_ANSWER) 2615#if defined (ENABLE_DISPLAY_ANSWER)
2629 case 7: /* unofficial extension */ 2616 case 7: /* unofficial extension */
2630 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2617 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2631 break; 2618 break;
2632#endif 2619#endif
2633 case 8: /* unofficial extension */ 2620 case 8: /* unofficial extension */
2634 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2621 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2635 break; 2622 break;
… …
2704 break; 2691 break;
2705#endif 2692#endif
2706 2693
2707 case CSI_78: /* DECREQTPARM */ 2694 case CSI_78: /* DECREQTPARM */
2708 if (arg[0] == 0 || arg[0] == 1) 2695 if (arg[0] == 0 || arg[0] == 1)
2709 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2696 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2710 /* FALLTHROUGH */ 2697 /* FALLTHROUGH */
2711 2698
2712 default: 2699 default:
2713 break; 2700 break;
2714 } 2701 }
… …
2752 break; 2739 break;
2753 case 6: /* lower window */ 2740 case 6: /* lower window */
2754 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2741 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2755 break; 2742 break;
2756 case 7: /* refresh window */ 2743 case 7: /* refresh window */
2757 rxvt_scr_touch(aR_ True); 2744 R->scr_touch (true);
2758 break; 2745 break;
2759 case 8: /* set size (chars) */ 2746 case 8: /* set size (chars) */
2760 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2747 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2761 (unsigned int)(args[1] * R->TermWin.fheight)); 2748 (unsigned int)(args[1] * R->TermWin.fheight));
2762 break; 2749 break;
… …
2768 /* 2755 /*
2769 * reports - some output format copied from XTerm 2756 * reports - some output format copied from XTerm
2770 */ 2757 */
2771 case 11: /* report window state */ 2758 case 11: /* report window state */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2759 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2773 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2760 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2774 break; 2761 break;
2775 case 13: /* report window position */ 2762 case 13: /* report window position */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2763 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2777 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2764 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2778 -wattr.border_width, -wattr.border_width, 2765 -wattr.border_width, -wattr.border_width,
2779 &x, &y, &wdummy); 2766 &x, &y, &wdummy);
2780 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2767 R->tt_printf("\033[3;%d;%dt", x, y);
2781 break; 2768 break;
2782 case 14: /* report window size (pixels) */ 2769 case 14: /* report window size (pixels) */
2783 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2770 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2784 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2771 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2785 break; 2772 break;
2786 case 18: /* report window size (chars) */ 2773 case 18: /* report window size (chars) */
2787 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2774 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2788 break; 2775 break;
2789#if 0 /* XXX: currently disabled due to security concerns */ 2776#if 0 /* XXX: currently disabled due to security concerns */
2790 case 20: /* report icon label */ 2777 case 20: /* report icon label */
2791 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2778 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2792 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2779 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2793 break; 2780 break;
2794 case 21: /* report window title */ 2781 case 21: /* report window title */
2795 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2782 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2796 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2783 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2784 break;
2798#endif 2785#endif
2799 } 2786 }
2800} 2787}
2801#endif 2788#endif
… …
2973 if (*str != ';') { 2960 if (*str != ';') {
2974#if XPM_BACKGROUND 2961#if XPM_BACKGROUND
2975 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2962 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2976 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2963 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2977#endif 2964#endif
2978 rxvt_scr_touch(aR_ True); 2965 R->scr_touch (true);
2979 } 2966 }
2980 while ((str = STRCHR(str, ';')) != NULL) { 2967 while ((str = STRCHR(str, ';')) != NULL) {
2981 str++; 2968 str++;
2982#if XPM_BACKGROUND 2969#if XPM_BACKGROUND
2983 changed += rxvt_scale_pixmap(aR_ str); 2970 changed += rxvt_scale_pixmap(aR_ str);
… …
2985 } 2972 }
2986 if (changed) { 2973 if (changed) {
2987#ifdef XPM_BACKGROUND 2974#ifdef XPM_BACKGROUND
2988 rxvt_resize_pixmap(aR); 2975 rxvt_resize_pixmap(aR);
2989#endif 2976#endif
2990 rxvt_scr_touch(aR_ True); 2977 R->scr_touch (true);
2991 } 2978 }
2992 break; 2979 break;
2993 2980
2994 case XTerm_restoreFG: 2981 case XTerm_restoreFG:
2995 rxvt_set_window_color(aR_ Color_fg, str); 2982 rxvt_set_window_color(aR_ Color_fg, str);
… …
3161 break; 3148 break;
3162#endif 3149#endif
3163#ifdef scrollBar_esc 3150#ifdef scrollBar_esc
3164 case scrollBar_esc: 3151 case scrollBar_esc:
3165 if (rxvt_scrollbar_mapping(aR_ state)) { 3152 if (rxvt_scrollbar_mapping(aR_ state)) {
3166 rxvt_resize_all_windows(aR_ 0, 0, 0); 3153 R->resize_all_windows (0, 0, 0);
3167 rxvt_scr_touch(aR_ True); 3154 R->scr_touch (true);
3168 } 3155 }
3169 break; 3156 break;
3170#endif 3157#endif
3171 case 25: /* visible/invisible cursor */ 3158 case 25: /* visible/invisible cursor */
3172 rxvt_scr_cursor_visible(aR_ state); 3159 rxvt_scr_cursor_visible(aR_ state);
… …
3198 else 3185 else
3199 R->Options &= ~Opt_scrollTtyKeypress; 3186 R->Options &= ~Opt_scrollTtyKeypress;
3200 break; 3187 break;
3201 case 1047: /* secondary screen w/ clearing */ 3188 case 1047: /* secondary screen w/ clearing */
3202 if (R->current_screen != PRIMARY) 3189 if (R->current_screen != PRIMARY)
3203 rxvt_scr_erase_screen(aR_ 2); 3190 R->scr_erase_screen (2);
3204 rxvt_scr_change_screen(aR_ state); 3191 rxvt_scr_change_screen(aR_ state);
3205 /* FALLTHROUGH */ 3192 /* FALLTHROUGH */
3206 default: 3193 default:
3207 break; 3194 break;
3208 } 3195 }
… …
3344{ 3331{
3345 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3332 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3346 3333
3347#ifndef RXVT_GRAPHICS 3334#ifndef RXVT_GRAPHICS
3348 if (cmd == 'Q') { /* query graphics */ 3335 if (cmd == 'Q') { /* query graphics */
3349 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3336 R->tt_printf("\033G0\n"); /* no graphics */
3350 return; 3337 return;
3351 } 3338 }
3352/* swallow other graphics sequences until terminating ':' */ 3339/* swallow other graphics sequences until terminating ':' */
3353 do 3340 do
3354 ch = rxvt_cmd_getc(aR); 3341 ch = rxvt_cmd_getc(aR);
… …
3357 unsigned int nargs; 3344 unsigned int nargs;
3358 int args[NGRX_PTS]; 3345 int args[NGRX_PTS];
3359 unsigned char *text = NULL; 3346 unsigned char *text = NULL;
3360 3347
3361 if (cmd == 'Q') { /* query graphics */ 3348 if (cmd == 'Q') { /* query graphics */
3362 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3349 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3363 return; 3350 return;
3364 } 3351 }
3365 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3352 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3366 int neg; 3353 int neg;
3367 3354
… …
3382 } 3369 }
3383 3370
3384 if ((cmd == 'T') && (nargs >= 5)) { 3371 if ((cmd == 'T') && (nargs >= 5)) {
3385 int i, len = args[4]; 3372 int i, len = args[4];
3386 3373
3387 text = rxvt_malloc((len + 1) * sizeof(char)); 3374 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3388 3375
3389 if (text != NULL) { 3376 if (text != NULL) {
3390 for (i = 0; i < len; i++) 3377 for (i = 0; i < len; i++)
3391 text[i] = rxvt_cmd_getc(aR); 3378 text[i] = rxvt_cmd_getc(aR);
3392 text[len] = '\0'; 3379 text[len] = '\0';
… …
3401 3388
3402/* 3389/*
3403 * Send printf() formatted output to the command. 3390 * Send printf() formatted output to the command.
3404 * Only use for small amounts of data. 3391 * Only use for small amounts of data.
3405 */ 3392 */
3406/* EXTPROTO */
3407void 3393void
3408rxvt_tt_printf(pR_ const char *fmt,...) 3394rxvt_term::tt_printf (const char *fmt,...)
3409{ 3395{
3410 va_list arg_ptr; 3396 va_list arg_ptr;
3411 unsigned char buf[256]; 3397 unsigned char buf[256];
3412 3398
3413 va_start(arg_ptr, fmt); 3399 va_start (arg_ptr, fmt);
3414 vsprintf((char *)buf, fmt, arg_ptr); 3400 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3415 va_end(arg_ptr); 3401 va_end (arg_ptr);
3416 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3402 tt_write (buf, STRLEN (buf));
3417} 3403}
3418 3404
3419/* ---------------------------------------------------------------------- */ 3405/* ---------------------------------------------------------------------- */
3420/* Addresses pasting large amounts of data and rxvt hang
3421 * code pinched from xterm (v_write()) and applied originally to
3422 * rxvt-2.18 - Hops
3423 * Write data to the pty as typed by the user, pasted with the mouse, 3406/* Write data to the pty as typed by the user, pasted with the mouse,
3424 * or generated by us in response to a query ESC sequence. 3407 * or generated by us in response to a query ESC sequence.
3425 */ 3408 */
3426/* EXTPROTO */
3427void 3409void
3428rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3410rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3429{ 3411{
3430#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3412 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3431 int riten;
3432 unsigned int p;
3433 unsigned char *v_buffer, /* start of physical buffer */
3434 *v_bufstr, /* start of current buffer pending */
3435 *v_bufptr, /* end of current buffer pending */
3436 *v_bufend; /* end of physical buffer */
3437 3413
3438 if (R->v_bufstr == NULL && len > 0) { 3414 if (len)
3439 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3440 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3441 v_bufend = v_buffer + p;
3442 } else {
3443 v_buffer = R->v_buffer;
3444 v_bufstr = R->v_bufstr;
3445 v_bufptr = R->v_bufptr;
3446 v_bufend = R->v_bufend;
3447 } 3415 {
3416 if (v_buflen == 0)
3417 {
3418 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3419 if (written == len)
3420 return;
3448 3421
3449 /* 3422 data += written;
3450 * Append to the block we already have. Always doing this simplifies the 3423 len -= written;
3451 * code, and isn't too bad, either. If this is a short block, it isn't 3424 }
3452 * too expensive, and if this is a long block, we won't be able to write 3425
3453 * it all anyway. 3426
3454 */ 3427 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3455 if (len > 0) { 3428
3456 if (v_bufend < v_bufptr + len) { /* run out of room */ 3429 memcpy (v_buffer + v_buflen, data, len);
3457 if (v_bufstr != v_buffer) { 3430 v_buflen += len;
3458 /* there is unused space, move everything down */
3459 MEMMOVE(v_buffer, v_bufstr,
3460 (unsigned int)(v_bufptr - v_bufstr));
3461 v_bufptr -= v_bufstr - v_buffer;
3462 v_bufstr = v_buffer;
3463 } 3431 }
3464 if (v_bufend < v_bufptr + len) {
3465 /* still won't fit: get more space */
3466 /* use most basic realloc because an error is not fatal. */
3467 unsigned int size = v_bufptr - v_buffer;
3468 unsigned int reallocto;
3469 3432
3470 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3433 for (;;)
3471 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3434 {
3472 /* save across realloc */ 3435 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3473 if (v_buffer) { 3436
3474 v_bufstr = v_buffer; 3437 if (written > 0)
3475 v_bufptr = v_buffer + size; 3438 {
3476 v_bufend = v_buffer + reallocto; 3439 v_buflen -= written;
3477 } else { /* no memory: ignore entire write request */ 3440
3478 rxvt_print_error("data loss: cannot allocate buffer space"); 3441 if (v_buflen == 0)
3479 v_buffer = v_bufstr; /* restore clobbered pointer */ 3442 {
3480 } 3443 free (v_buffer);
3444 v_buffer = 0;
3445 v_buflen = 0;
3446
3447 pty_ev.set (EVENT_READ);
3448 return;
3449 }
3450
3451 memmove (v_buffer, v_buffer + written, v_buflen);
3452 }
3453 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3454 // original code just ignores this...
3455 destroy ();
3456 else
3457 {
3458 pty_ev.set (EVENT_READ | EVENT_WRITE);
3459 return;
3460 }
3481 } 3461 }
3482 }
3483 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3484 MEMCPY(v_bufptr, d, len);
3485 v_bufptr += len;
3486 }
3487 }
3488
3489 /*
3490 * Write out as much of the buffer as we can.
3491 * Be careful not to overflow the pty's input silo.
3492 * We are conservative here and only write a small amount at a time.
3493 *
3494 * If we can't push all the data into the pty yet, we expect write
3495 * to return a non-negative number less than the length requested
3496 * (if some data written) or -1 and set errno to EAGAIN,
3497 * EWOULDBLOCK, or EINTR (if no data written).
3498 *
3499 * (Not all systems do this, sigh, so the code is actually
3500 * a little more forgiving.)
3501 */
3502 if ((p = v_bufptr - v_bufstr) > 0) {
3503 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3504 if (riten < 0)
3505 riten = 0;
3506 v_bufstr += riten;
3507 if (v_bufstr >= v_bufptr) /* we wrote it all */
3508 v_bufstr = v_bufptr = v_buffer;
3509 }
3510 /*
3511 * If we have lots of unused memory allocated, return it
3512 */
3513 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3514 /* save pointers across realloc */
3515 unsigned int start = v_bufstr - v_buffer;
3516 unsigned int size = v_bufptr - v_buffer;
3517 unsigned int reallocto;
3518
3519 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3521 if (v_buffer) {
3522 v_bufstr = v_buffer + start;
3523 v_bufptr = v_buffer + size;
3524 v_bufend = v_buffer + reallocto;
3525 } else {
3526 /* should we print a warning if couldn't return memory? */
3527 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3528 }
3529 }
3530 R->v_buffer = v_buffer;
3531 R->v_bufstr = v_bufstr;
3532 R->v_bufptr = v_bufptr;
3533 R->v_bufend = v_bufend;
3534} 3462}
3463
3535/*----------------------- end-of-file (C source) -----------------------*/ 3464/*----------------------- end-of-file (C source) -----------------------*/
3536 3465

Diff Legend

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