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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.10 2003/11/27 16:49:45 pcg Exp $ 4 * $Id: command.C,v 1.33 2004/01/30 18:12:17 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
61 unsigned int newlen; 63 unsigned int newlen;
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66#ifdef USE_XIM
67 int valid_keysym; 68 int valid_keysym;
68#endif 69 unsigned char kbuf[KBUFSZ];
69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 81 if (R->numlock_state || (ev->state & R->ModNumLockMask))
82 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 83 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 84 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 85 }
86
87 kbuf[0] = 0;
88
84#ifdef USE_XIM 89#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 90 if (R->Input_Context)
91 {
86 Status status_return; 92 Status status_return;
87 93
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0)
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
92#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
95#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
96 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
127 }
98 } else { 128 else
129#endif
130 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 132 valid_keysym = !len;
102 } 133 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 134
120#ifdef USE_XIM
121 if (valid_keysym) 135 if (valid_keysym)
122#endif
123 { 136 {
124/* for some backwards compatibility */ 137/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
127 if (ctrl) { 140 if (ctrl)
128# else 141# else
129 if (meta) { 142 if (meta)
130# endif 143# endif
144 {
131 if (keysym == R->ks_bigfont) { 145 if (keysym == R->ks_bigfont)
146 {
132 rxvt_change_font(aR_ 0, FONT_UP); 147 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 148 return;
149 }
134 } else if (keysym == R->ks_smallfont) { 150 else if (keysym == R->ks_smallfont)
151 {
135 rxvt_change_font(aR_ 0, FONT_DN); 152 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 153 return;
137 } 154 }
138 } 155 }
139#endif 156#endif
140 157
141 if (R->TermWin.saveLines) { 158 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 254 /* escape prefix */
238 if (meta) 255 if (meta)
239# ifdef META8_OPTION 256# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 257 if (R->meta_char == C0_ESC)
241# endif 258# endif
242 R->tt_write(&ch, 1); 259 R->tt_write (&ch, 1);
243 R->tt_write(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)
… …
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 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
624} 641}
625/*}}} */ 642/*}}} */
626 643
627#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
656 return 0; 673 return 0;
657} 674}
658#endif /* MENUBAR_MAX */ 675#endif /* MENUBAR_MAX */
659 676
660void 677void
678rxvt_term::flush ()
679{
680#ifdef TRANSPARENT
681 if (want_full_refresh)
682 {
683 want_full_refresh = 0;
684 scr_clear ();
685 scr_touch (false);
686 want_refresh = 1;
687 }
688#endif
689
690 if (want_refresh)
691 {
692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM
695 rxvt_IMSendSpot (this);
696#endif
697 }
698
699 XFlush (Xdisplay);
700}
701
702void
703rxvt_term::check_cb (check_watcher &w)
704{
705 SET_R (this);
706 SET_LOCALE (locale);
707
708 flush ();
709}
710
711void
661rxvt_term::process_x_events () 712rxvt_term::process_x_events ()
662{ 713{
663 do 714 do
664 { 715 {
665 XEvent xev; 716 XEvent xev;
666 717
667 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
668 719
669#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
671 && xev.type == KeyPress)
672 { 722 {
673 if (hidden_cursor) 723 if (hidden_cursor)
674 { 724 {
675 hidden_cursor = 0; 725 hidden_cursor = 0;
676 want_refresh = 1; 726 want_refresh = 1;
677 } 727 }
678 728
679 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
680 } 730 }
681#endif 731#endif
682 732
683#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
684 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
685 && (pointerBlankDelay > 0))
686 { 735 {
687 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
688 || xev.type == ButtonPress 737 || xev.type == ButtonPress
689 || xev.type == ButtonRelease) 738 || xev.type == ButtonRelease)
690 if (hidden_pointer) 739 if (hidden_pointer)
… …
701 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
702 } 751 }
703 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
704} 753}
705 754
755#ifdef CURSOR_BLINK
706void 756void
707rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
708{ 758{
709 SET_R (this);
710
711 w.at += BLINK_INTERVAL;
712 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
713 want_refresh = 1; 760 want_refresh = 1;
714 flush (); 761
762 w.start (w.at + BLINK_INTERVAL);
715} 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
716 778
717void 779void
718rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
719{ 781{
720 SET_R (this); 782 SET_R (this);
783 SET_LOCALE (locale);
721 784
722 process_x_events (); 785 process_x_events ();
723
724 flush ();
725}
726
727// read the next character, currently handles UTF-8
728// will probably handle all sorts of other stuff in the future
729uint32_t
730rxvt_term::next_char ()
731{
732 struct mbstate &s = mbstate;
733
734 while (cmdbuf_ptr < cmdbuf_endp)
735 {
736 uint8_t ch = *cmdbuf_ptr;
737
738 if (s.cnt)
739 {
740 if ((ch & 0xc0) == 0x80)
741 {
742 cmdbuf_ptr++;
743
744 /* continuation */
745 s.reg = (s.reg << 6) | (ch & 0x7f);
746
747 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
748 return s.reg;
749
750 continue;
751 }
752 else
753 {
754 s.cnt = 0;
755 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
756 }
757 }
758
759 if ((ch & 0xc0) == 0xc0)
760 {
761 cmdbuf_ptr++;
762
763 /* first byte */
764 s.orig = ch; /* for broken encodings */
765 s.reg = ch;
766 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
767 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
768 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
769 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
770 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
771 }
772 else
773 {
774 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
775 return ch;
776 }
777 }
778
779 return NOCHAR;
780} 786}
781 787
782bool 788bool
783rxvt_term::pty_fill () 789rxvt_term::pty_fill ()
784{ 790{
… …
793 if (n > 0) 799 if (n > 0)
794 { 800 {
795 cmdbuf_endp += n; 801 cmdbuf_endp += n;
796 return true; 802 return true;
797 } 803 }
798 else if (n < 0 && errno == EAGAIN) 804 else if (n < 0 && errno != EAGAIN)
805 destroy ();
806
799 return false; 807 return false;
800
801 destroy ();
802} 808}
803 809
804void 810void
805rxvt_term::pty_cb (io_watcher &w, short revents) 811rxvt_term::pty_cb (io_watcher &w, short revents)
806{ 812{
807 SET_R (this); 813 SET_R (this);
814 SET_LOCALE (locale);
808 815
809 if (revents & EVENT_WRITE) 816 if (revents & EVENT_WRITE)
810 tt_write (0, 0); 817 tt_write (0, 0);
811 else if (revents & EVENT_READ) 818 else if (revents & EVENT_READ)
812 // loop, but don't allow a single term to monopolize us
813 // the number of loops is fully arbitrary, and thus wrong
814 for (int i = 7; i-- && pty_fill (); )
815 {
816 //TODO:
817 /* once we know the shell is running, send the screen size. Again! */
818 //ch = rxvt_cmd_getc(aR); /* wait for something */
819 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
820
821 uint32_t ch = NOCHAR;
822
823 for (;;)
824 {
825 if (ch == NOCHAR)
826 ch = next_char ();
827
828 if (ch == NOCHAR) // TODO: improve
829 break;
830
831 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
832 {
833 /* Read a text string from the input buffer */
834 uint32_t buf[BUFSIZ];
835 bool refreshnow = false;
836 int nlines = 0;
837 uint32_t *str = buf;
838
839 *str++ = ch;
840
841 for (;;)
842 {
843 ch = next_char ();
844
845 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
846 break;
847 else
848 {
849 *str++ = ch;
850
851 if (ch == '\n')
852 {
853 nlines++;
854 refresh_count++;
855
856 if (!(Options & Opt_jumpScroll)
857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
858 {
859 refreshnow = true;
860 ch = NOCHAR;
861 break;
862 }
863 }
864
865 if (str >= buf + BUFSIZ)
866 {
867 ch = NOCHAR;
868 break;
869 }
870 }
871 }
872
873 rxvt_scr_add_lines (this, buf, nlines, str - buf);
874
875 /*
876 * If there have been a lot of new lines, then update the screen
877 * What the heck I'll cheat and only refresh less than every page-full.
878 * the number of pages between refreshes is refresh_limit, which
879 * is incremented here because we must be doing flat-out scrolling.
880 *
881 * refreshing should be correct for small scrolls, because of the
882 * time-out
883 */
884 if (refreshnow)
885 {
886 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
887 refresh_limit++;
888
889 rxvt_scr_refresh (this, refresh_type);
890 }
891
892 }
893 else
894 {
895 switch (ch)
896 {
897 default:
898 rxvt_process_nonprinting (this, ch);
899 break;
900 case C0_ESC: /* escape char */
901 rxvt_process_escape_seq (this);
902 break;
903 /*case 0x9b: */ /* CSI */
904 /* rxvt_process_csi_seq (this); */
905 }
906
907 ch = NOCHAR;
908 }
909 }
910 }
911
912 flush ();
913}
914
915void
916rxvt_term::flush ()
917{
918#ifdef TRANSPARENT
919 if (want_full_refresh)
920 { 819 {
921 want_full_refresh = 0; 820 bool flag = true;
922 rxvt_scr_clear (this);
923 rxvt_scr_touch (this, False);
924 want_refresh = 1;
925 }
926#endif
927 821
928 if (want_refresh) 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 }
925}
926
927// read the next character, currently handles UTF-8
928// will probably handle all sorts of other stuff in the future
929uint32_t
930rxvt_term::next_char ()
931{
932 while (cmdbuf_ptr < cmdbuf_endp)
929 { 933 {
930 rxvt_scr_refresh (this, refresh_type); 934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
931 rxvt_scrollbar_show (this, 1); 935 return *cmdbuf_ptr++;
932#ifdef USE_XIM
933 rxvt_IMSendSpot (this);
934#endif
935 }
936 936
937 if (XPending (Xdisplay)) process_x_events (); 937 wchar_t wc;
938 XFlush (Xdisplay); 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
939 if (XPending (Xdisplay)) process_x_events (); 939
940 if (len == (size_t)-2)
941 return NOCHAR;
942
943 if (len == (size_t)-1)
944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
945
946 // assume wchar == unicode
947 cmdbuf_ptr += len;
948 return wc;
949 }
950
951 return NOCHAR;
940} 952}
941 953
942/* rxvt_cmd_getc() - Return next input character */ 954/* rxvt_cmd_getc() - Return next input character */
943/* 955/*
944 * Return the next input character after first passing any keyboard input 956 * Return the next input character after first passing any keyboard input
… …
993 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
994 quick_timeout = 1; 1006 quick_timeout = 1;
995 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
996 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
997 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
998 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
999 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1000 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1001 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1002 R->want_refresh = 1; 1014 R->want_refresh = 1;
1003 } 1015 }
… …
1019 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1020#endif 1032#endif
1021#endif 1033#endif
1022} 1034}
1023 1035
1036#ifdef POINTER_BLANK
1024void 1037void
1025rxvt_term::pointer_unblank () 1038rxvt_term::pointer_unblank ()
1026{ 1039{
1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1028 rxvt_recolour_cursor (this); 1041 recolour_cursor ();
1029 1042
1030#ifdef POINTER_BLANK
1031 hidden_pointer = 0; 1043 hidden_pointer = 0;
1032 1044
1033 if (Options & Opt_pointerBlank) 1045 if (Options & Opt_pointerBlank)
1034 pointer_ev.start (NOW + pointerBlankDelay); 1046 pointer_ev.start (NOW + pointerBlankDelay);
1035#endif
1036} 1047}
1037 1048
1038#ifdef POINTER_BLANK
1039void 1049void
1040rxvt_term::pointer_blank () 1050rxvt_term::pointer_blank ()
1041{ 1051{
1042 pointer_ev.stop ();
1043
1044 if (!(Options & Opt_pointerBlank)) 1052 if (!(Options & Opt_pointerBlank))
1045 return; 1053 return;
1046 1054
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 1056 XFlush (Xdisplay);
… …
1052 1060
1053void 1061void
1054rxvt_term::pointer_cb (time_watcher &w) 1062rxvt_term::pointer_cb (time_watcher &w)
1055{ 1063{
1056 SET_R (this); 1064 SET_R (this);
1065 SET_LOCALE (locale);
1057 1066
1058 pointer_blank (); 1067 pointer_blank ();
1059} 1068}
1060#endif 1069#endif
1061 1070
… …
1066 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1067 int x, y; 1076 int x, y;
1068 1077
1069 x = ev->x; 1078 x = ev->x;
1070 y = ev->y; 1079 y = ev->y;
1071 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1072 1081
1073 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1074 button_number = 3; 1083 button_number = 3;
1075 } else { 1084 } else {
1076 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1143{ 1152{
1144 int i, want_timeout; 1153 int i, want_timeout;
1145 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1156 unsigned int unused_mask;
1148 struct timeval tp;
1149 1157
1150#ifdef DEBUG_X 1158#ifdef DEBUG_X
1151 const char *const eventnames[] = 1159 const char *const eventnames[] =
1152 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1153 "", 1161 "",
… …
1184 "SelectionNotify", 1192 "SelectionNotify",
1185 "ColormapNotify", 1193 "ColormapNotify",
1186 "ClientMessage", 1194 "ClientMessage",
1187 "MappingNotify" 1195 "MappingNotify"
1188 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1189 struct tm *ltt; 1201 struct tm *ltt;
1190#endif
1191
1192 /*
1193 * check if we need to get the time for any timeouts
1194 */
1195
1196 for (i = NUM_TIMEOUTS; i--; )
1197 if (R->timeout[i].tv_sec) {
1198 want_timeout = 1;
1199 break;
1200 }
1201
1202#ifndef DEBUG_X
1203 if (want_timeout)
1204#endif
1205 (void)gettimeofday(&tp, NULL); 1202 (void)gettimeofday(&tp, NULL);
1206
1207#ifdef DEBUG_X
1208 ltt = localtime(&(tp.tv_sec)); 1203 ltt = localtime(&(tp.tv_sec));
1209 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));
1210#endif 1205#endif
1211
1212 /* X event timeouts */
1213 if (want_timeout)
1214 for (i = NUM_TIMEOUTS; i--; ) {
1215 if (R->timeout[i].tv_sec == 0)
1216 continue;
1217 if ((tp.tv_sec < R->timeout[i].tv_sec)
1218 || (tp.tv_sec == R->timeout[i].tv_sec
1219 && tp.tv_usec < R->timeout[i].tv_usec))
1220 continue;
1221 R->timeout[i].tv_sec = 0;
1222 switch(i) {
1223 case TIMEOUT_INCR:
1224 rxvt_print_error("data loss: timeout on INCR selection paste");
1225 R->selection_wait = Sel_none;
1226 break;
1227 default:
1228 break;
1229 }
1230 }
1231 1206
1232 switch (ev->type) { 1207 switch (ev->type) {
1233 case KeyPress: 1208 case KeyPress:
1234 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1235 break; 1210 break;
… …
1328 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1329 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1330#endif 1305#endif
1331#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1332 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1333 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1334#endif 1309#endif
1335 } 1310 }
1336 break; 1311 break;
1337 1312
1338 case FocusOut: 1313 case FocusOut:
… …
1343 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1344 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1345#endif 1320#endif
1346#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1347 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1348 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1349 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1350#endif 1325#endif
1351 } 1326 }
1352 break; 1327 break;
1353 1328
… …
1361 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1362 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1363 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1364 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1365 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));
1366 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1367 (unsigned int)height, 1);
1368 } 1342 }
1369#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1370 else { 1344 else {
1371 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1372 } 1346 }
… …
1395 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1396 break; 1370 break;
1397 1371
1398 case UnmapNotify: 1372 case UnmapNotify:
1399 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1400 break; 1377 break;
1401 1378
1402 case MapNotify: 1379 case MapNotify:
1403 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
1404 break; 1384 break;
1405 1385
1406 case PropertyNotify: 1386 case PropertyNotify:
1407 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1408 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1431 1411
1432 case GraphicsExpose: 1412 case GraphicsExpose:
1433 case Expose: 1413 case Expose:
1434 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1435#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1436 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1437 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1438#else 1418#else
1439 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1440 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1441 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1442 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1443 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1444#endif 1424#endif
1445 R->want_refresh = 1; 1425 R->want_refresh = 1;
1446 } else { 1426 } else {
… …
1451 &unused_xevent)) ; 1431 &unused_xevent)) ;
1452 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1453 GraphicsExpose, 1433 GraphicsExpose,
1454 &unused_xevent)) ; 1434 &unused_xevent)) ;
1455 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1456 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1457 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1458 } 1438 }
1459#ifdef MENUBAR 1439#ifdef MENUBAR
1460 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1461 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
… …
1491 &unused_mask); 1471 &unused_mask);
1492#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1493 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1494 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1495#endif 1475#endif
1496 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1497 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1498#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1499 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y < R->TermWin.int_bwidth
1500 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 || Pixel2Row(ev->xbutton.y) > (R->TermWin.nrow-1)) {
1501 int dist; 1481 int dist;
1502 1482
1503 R->pending_scroll_selection=1; 1483 R->pending_scroll_selection=1;
1504 1484
1505 /* don't clobber the current delay if we are 1485 /* don't clobber the current delay if we are
… …
1550 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1551 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1552 &unused_mask); 1532 &unused_mask);
1553 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,
1554 scrollbar_size()); 1534 scrollbar_size());
1555 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1556 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1557 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1558 } 1538 }
1559 break; 1539 break;
1560 } 1540 }
… …
1562 1542
1563/* INTPROTO */ 1543/* INTPROTO */
1564void 1544void
1565rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1566{ 1546{
1567 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1568 1548
1569 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1570 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1571 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1572/* 1552/*
… …
1574 */ 1554 */
1575 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1576 { 1556 {
1577#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1578 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1579 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1580 else 1560 else
1581#endif 1561#endif
1582 { 1562 {
1583 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1584 if (reportmode) 1564 if (reportmode)
… …
1619 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1620 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1621 switch (ev->button) 1601 switch (ev->button)
1622 { 1602 {
1623 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1624 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1625 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1626 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1627 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1628 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1629 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1630 break; 1623 break;
1631 1624
1632 case Button3: 1625 case Button3:
1633 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1634 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1635 else 1628 else
1636 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1637 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1638 break; 1631 break;
1639 } 1632 }
1640 } 1633 }
1641 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1646/* 1639/*
1647 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1648 */ 1641 */
1649 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1650 { 1643 {
1651 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1652 /* 1645 /*
1653 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1654 * move up if mouse is above slider 1647 * move up if mouse is above slider
1655 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1656 * 1649 *
… …
1709#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1710 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1711#endif 1704#endif
1712 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1713 if (upordown < 0) 1706 if (upordown < 0)
1714 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1715 else 1708 else
1716 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1717 } 1710 }
1718 } else 1711 } else
1719 switch (ev->button) { 1712 switch (ev->button) {
1720 case Button2: 1713 case Button2:
1721 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
… …
1733 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1734 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1735 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1736 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1737 scrollbar_size()); 1730 scrollbar_size());
1738 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1739 break; 1732 break;
1740 1733
1741 case Button1: 1734 case Button1:
1742 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1743 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
… …
1756 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1757# else 1750# else
1758 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1759# endif 1752# endif
1760 else 1753 else
1761 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1762 } else { 1755 } else {
1763 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1764 (R->TermWin.nrow 1757 (R->TermWin.nrow
1765 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1766 / scrollbar_size())); 1759 / scrollbar_size()));
… …
1788 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1789 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1790 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1791 1784
1792 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1793 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1794 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1795#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1796 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1797#endif 1790#endif
1798 } 1791 }
… …
1835 * when overriding mouse reporting 1828 * when overriding mouse reporting
1836 */ 1829 */
1837 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1838 && R->bypass_keystate 1831 && R->bypass_keystate
1839 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1840 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1841 1834
1842 switch (ev->button) { 1835 switch (ev->button) {
1843 case Button1: 1836 case Button1:
1844 case Button3: 1837 case Button3:
1845 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1849 break; 1842 break;
1850#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1851 case Button4: 1844 case Button4:
1852 case Button5: 1845 case Button5:
1853 { 1846 {
1854 int i, v; 1847 int i;
1848 page_dirn v;
1855 1849
1856 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1857 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1858 i = 1; 1852 i = 1;
1859 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1867 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1868 } 1862 }
1869# endif 1863# endif
1870# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1871 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1872 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1873 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1874# else 1868# else
1875 for (; i--;) 1869 while (i--)
1876 { 1870 {
1877 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1878 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1879 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1880 } 1874 }
1881# endif 1875# endif
1882 } 1876 }
1883 break; 1877 break;
… …
2034 n = 0; 2028 n = 0;
2035 if (pchanged) { 2029 if (pchanged) {
2036 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2037 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2038 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"));
2039 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2040 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2041 break; 2035 break;
2042 } 2036 }
2043 } 2037 }
2044 } 2038 }
… …
2094 return stream; 2088 return stream;
2095} 2089}
2096 2090
2097/* EXTPROTO */ 2091/* EXTPROTO */
2098int 2092int
2099rxvt_pclose_printer(FILE *stream) 2093rxvt_pclose_printer (FILE *stream)
2100{ 2094{
2101 fflush(stream); 2095 fflush (stream);
2102/* pclose() reported not to work on SunOS 4.1.3 */ 2096/* pclose() reported not to work on SunOS 4.1.3 */
2103# if defined (__sun__) /* TODO: RESOLVE THIS */ 2097# if defined (__sun__) /* TODO: RESOLVE THIS */
2104/* pclose works provided SIGCHLD handler uses waitpid */ 2098/* pclose works provided SIGCHLD handler uses waitpid */
2105 return pclose(stream); /* return fclose (stream); */ 2099 return pclose (stream); /* return fclose (stream); */
2106# else 2100# else
2107 return pclose(stream); 2101 return pclose (stream);
2108# endif 2102# endif
2109} 2103}
2110 2104
2111/* 2105/*
2112 * simulate attached vt100 printer 2106 * simulate attached vt100 printer
… …
2237 break; 2231 break;
2238 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2239 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2240 break; 2234 break;
2241 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2242 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2243 break; 2237 break;
2244 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2245 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2246 break; 2240 break;
2247 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2582 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2583 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2584 break; 2578 break;
2585 2579
2586 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2587 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2588 break; 2582 break;
2589 2583
2590 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2591 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2592 break; 2586 break;
… …
2613 2607
2614 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2615 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2616 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2617 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2618 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);
2619 break; 2613 break;
2620 2614
2621 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2622 R->tt_write((const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2623 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2714 break; 2708 break;
2715#endif 2709#endif
2716 2710
2717 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2718 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2719 R->tt_printf("\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);
2720 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2721 2715
2722 default: 2716 default:
2723 break; 2717 break;
2724 } 2718 }
… …
2762 break; 2756 break;
2763 case 6: /* lower window */ 2757 case 6: /* lower window */
2764 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2765 break; 2759 break;
2766 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2767 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2768 break; 2762 break;
2769 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2770 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2771 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2772 break; 2766 break;
… …
2983 if (*str != ';') { 2977 if (*str != ';') {
2984#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2985 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2986 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2987#endif 2981#endif
2988 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2989 } 2983 }
2990 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
2991 str++; 2985 str++;
2992#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
2993 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
2995 } 2989 }
2996 if (changed) { 2990 if (changed) {
2997#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
2998 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
2999#endif 2993#endif
3000 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
3001 } 2995 }
3002 break; 2996 break;
3003 2997
3004 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
3005 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3091#endif 3085#endif
3092 { 1000, PrivMode_MouseX11 }, 3086 { 1000, PrivMode_MouseX11 },
3093 { 1010, PrivMode_TtyOutputInh }, 3087 { 1010, PrivMode_TtyOutputInh },
3094 { 1011, PrivMode_Keypress }, 3088 { 1011, PrivMode_Keypress },
3095 { 1047, PrivMode_Screen }, 3089 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3096 }; 3091 };
3097 3092
3098 if (nargs == 0) 3093 if (nargs == 0)
3099 return; 3094 return;
3100 3095
… …
3171 break; 3166 break;
3172#endif 3167#endif
3173#ifdef scrollBar_esc 3168#ifdef scrollBar_esc
3174 case scrollBar_esc: 3169 case scrollBar_esc:
3175 if (rxvt_scrollbar_mapping(aR_ state)) { 3170 if (rxvt_scrollbar_mapping(aR_ state)) {
3176 rxvt_resize_all_windows(aR_ 0, 0, 0); 3171 R->resize_all_windows (0, 0, 0);
3177 rxvt_scr_touch(aR_ True); 3172 R->scr_touch (true);
3178 } 3173 }
3179 break; 3174 break;
3180#endif 3175#endif
3181 case 25: /* visible/invisible cursor */ 3176 case 25: /* visible/invisible cursor */
3182 rxvt_scr_cursor_visible(aR_ state); 3177 rxvt_scr_cursor_visible(aR_ state);
… …
3207 R->Options |= Opt_scrollTtyKeypress; 3202 R->Options |= Opt_scrollTtyKeypress;
3208 else 3203 else
3209 R->Options &= ~Opt_scrollTtyKeypress; 3204 R->Options &= ~Opt_scrollTtyKeypress;
3210 break; 3205 break;
3211 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 */
3212 if (R->current_screen != PRIMARY) 3208 if (R->current_screen != PRIMARY)
3213 rxvt_scr_erase_screen(aR_ 2); 3209 R->scr_erase_screen (2);
3214 rxvt_scr_change_screen(aR_ state); 3210 rxvt_scr_change_screen(aR_ state);
3215 /* FALLTHROUGH */ 3211 /* FALLTHROUGH */
3216 default: 3212 default:
3217 break; 3213 break;
3218 } 3214 }
… …
3392 } 3388 }
3393 3389
3394 if ((cmd == 'T') && (nargs >= 5)) { 3390 if ((cmd == 'T') && (nargs >= 5)) {
3395 int i, len = args[4]; 3391 int i, len = args[4];
3396 3392
3397 text = rxvt_malloc((len + 1) * sizeof(char)); 3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3398 3394
3399 if (text != NULL) { 3395 if (text != NULL) {
3400 for (i = 0; i < len; i++) 3396 for (i = 0; i < len; i++)
3401 text[i] = rxvt_cmd_getc(aR); 3397 text[i] = rxvt_cmd_getc(aR);
3402 text[len] = '\0'; 3398 text[len] = '\0';

Diff Legend

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