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.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.29 by pcg, Mon Jan 19 17:26:43 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.11 2003/12/02 21:49:46 pcg Exp $ 4 * $Id: command.C,v 1.29 2004/01/19 17:26:43 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() */
… …
662{ 679{
663#ifdef TRANSPARENT 680#ifdef TRANSPARENT
664 if (want_full_refresh) 681 if (want_full_refresh)
665 { 682 {
666 want_full_refresh = 0; 683 want_full_refresh = 0;
667 rxvt_scr_clear (this); 684 scr_clear ();
668 rxvt_scr_touch (this, False); 685 scr_touch (false);
669 want_refresh = 1; 686 want_refresh = 1;
670 } 687 }
671#endif 688#endif
672 689
673 if (want_refresh) 690 if (want_refresh)
674 { 691 {
675 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
676 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
677#ifdef USE_XIM 694#ifdef USE_XIM
678 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
679#endif 696#endif
680 } 697 }
681 698
682 XFlush (Xdisplay); 699 XFlush (Xdisplay);
683#if 0
684 if (XPending (Xdisplay)) process_x_events ();
685 if (XPending (Xdisplay)) process_x_events ();
686#endif
687} 700}
688 701
689void 702void
690rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
691{ 704{
692 SET_R (this); 705 SET_R (this);
706 SET_LOCALE (locale);
693 707
694 flush (); 708 flush ();
695} 709}
696 710
697void 711void
… …
738 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
739 } 753 }
740 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
741} 755}
742 756
757#ifdef CURSOR_BLINK
743void 758void
744rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
745{ 760{
746 SET_R (this);
747
748 w.at += BLINK_INTERVAL;
749 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
750 want_refresh = 1; 762 want_refresh = 1;
763
764 w.start (w.at + BLINK_INTERVAL);
751} 765}
766#endif
752 767
753void 768void
754rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
755{ 770{
756 SET_R (this); 771 SET_R (this);
772 SET_LOCALE (locale);
757 773
758 process_x_events (); 774 process_x_events ();
759} 775}
760 776
761bool 777bool
… …
772 if (n > 0) 788 if (n > 0)
773 { 789 {
774 cmdbuf_endp += n; 790 cmdbuf_endp += n;
775 return true; 791 return true;
776 } 792 }
777 else if (n < 0 && errno == EAGAIN) 793 else if (n < 0 && errno != EAGAIN)
794 destroy ();
795
778 return false; 796 return false;
779
780 destroy ();
781} 797}
782 798
783void 799void
784rxvt_term::pty_cb (io_watcher &w, short revents) 800rxvt_term::pty_cb (io_watcher &w, short revents)
785{ 801{
786 SET_R (this); 802 SET_R (this);
803 SET_LOCALE (locale);
787 804
788 if (revents & EVENT_WRITE) 805 if (revents & EVENT_WRITE)
789 tt_write (0, 0); 806 tt_write (0, 0);
790 else if (revents & EVENT_READ) 807 else if (revents & EVENT_READ)
808 {
809 bool flag = true;
810
791 // loop, but don't allow a single term to monopolize us 811 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong 812 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); ) 813 while (flag && pty_fill ())
794 { 814 {
795 if (!seen_input) 815 if (!seen_input)
796 { 816 {
797 seen_input = 1; 817 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */ 818 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch (); 819 tt_winch ();
800 } 820 }
801 821
802 uint32_t ch = NOCHAR; 822 uint32_t ch = NOCHAR;
803 823
804 for (;;) 824 for (;;)
805 { 825 {
806 if (ch == NOCHAR) 826 if (ch == NOCHAR)
807 ch = next_char (); 827 ch = next_char ();
808 828
809 if (ch == NOCHAR) // TODO: improve 829 if (ch == NOCHAR) // TODO: improve
810 break; 830 break;
811 831
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 { 833 {
814 /* Read a text string from the input buffer */ 834 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ]; 835 uint32_t buf[BUFSIZ];
816 bool refreshnow = false; 836 bool refreshnow = false;
817 int nlines = 0; 837 int nlines = 0;
818 uint32_t *str = buf; 838 uint32_t *str = buf;
819 839
820 *str++ = ch; 840 *str++ = ch;
821 841
822 for (;;) 842 for (;;)
823 { 843 {
824 ch = next_char (); 844 ch = next_char ();
825 845
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break; 847 break;
828 else 848 else
829 { 849 {
830 *str++ = ch; 850 *str++ = ch;
831 851
832 if (ch == '\n') 852 if (ch == '\n')
833 { 853 {
834 nlines++; 854 nlines++;
835 refresh_count++; 855 refresh_count++;
836 856
837 if (!(Options & Opt_jumpScroll) 857 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 { 859 {
840 refreshnow = true; 860 refreshnow = true;
861 flag = false;
841 ch = NOCHAR; 862 ch = NOCHAR;
842 break; 863 break;
843 } 864 }
844 } 865 }
845 866
846 if (str >= buf + BUFSIZ) 867 if (str >= buf + BUFSIZ)
847 { 868 {
848 ch = NOCHAR; 869 ch = NOCHAR;
849 break; 870 break;
850 } 871 }
851 } 872 }
852 } 873 }
853 874
854 rxvt_scr_add_lines (this, buf, nlines, str - buf); 875 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855 876
856 /* 877 /*
857 * If there have been a lot of new lines, then update the screen 878 * If there have been a lot of new lines, then update the screen
858 * What the heck I'll cheat and only refresh less than every page-full. 879 * What the heck I'll cheat and only refresh less than every page-full.
859 * the number of pages between refreshes is refresh_limit, which 880 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling. 881 * is incremented here because we must be doing flat-out scrolling.
861 * 882 *
862 * refreshing should be correct for small scrolls, because of the 883 * refreshing should be correct for small scrolls, because of the
863 * time-out 884 * time-out
864 */ 885 */
865 if (refreshnow) 886 if (refreshnow)
866 { 887 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++; 889 refresh_limit++;
869 890
870 rxvt_scr_refresh (this, refresh_type); 891 scr_refresh (refresh_type);
871 } 892 }
872 893
873 } 894 }
874 else 895 else
875 { 896 {
876 switch (ch) 897 switch (ch)
877 { 898 {
878 default: 899 default:
879 rxvt_process_nonprinting (this, ch); 900 rxvt_process_nonprinting (this, ch);
880 break; 901 break;
881 case C0_ESC: /* escape char */ 902 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this); 903 rxvt_process_escape_seq (this);
883 break; 904 break;
884 /*case 0x9b: */ /* CSI */ 905 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */ 906 /* rxvt_process_csi_seq (this); */
886 } 907 }
887 908
888 ch = NOCHAR; 909 ch = NOCHAR;
889 } 910 }
890 } 911 }
891 } 912 }
913 }
892} 914}
893 915
894// read the next character, currently handles UTF-8 916// read the next character, currently handles UTF-8
895// will probably handle all sorts of other stuff in the future 917// will probably handle all sorts of other stuff in the future
896uint32_t 918uint32_t
897rxvt_term::next_char () 919rxvt_term::next_char ()
898{ 920{
899 struct mbstate &s = mbstate;
900
901 while (cmdbuf_ptr < cmdbuf_endp) 921 while (cmdbuf_ptr < cmdbuf_endp)
902 { 922 {
903 uint8_t ch = *cmdbuf_ptr; 923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
904
905 if (s.cnt)
906 {
907 if ((ch & 0xc0) == 0x80)
908 {
909 cmdbuf_ptr++;
910
911 /* continuation */
912 s.reg = (s.reg << 6) | (ch & 0x7f);
913
914 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
915 return s.reg;
916
917 continue;
918 }
919 else
920 {
921 s.cnt = 0;
922 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
923 }
924 }
925
926 if ((ch & 0xc0) == 0xc0)
927 {
928 cmdbuf_ptr++; 924 return *cmdbuf_ptr++;
929 925
930 /* first byte */ 926 wchar_t wc;
931 s.orig = ch; /* for broken encodings */ 927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
932 s.reg = ch; 928
933 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if (len == (size_t)-2)
934 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 930 return NOCHAR;
935 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 931
936 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if (len == (size_t)-1)
937 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
938 } 934
939 else 935 // assume wchar == unicode
940 { 936 cmdbuf_ptr += len;
941 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
942 return ch; 937 return wc;
943 }
944 } 938 }
945 939
946 return NOCHAR; 940 return NOCHAR;
947} 941}
948 942
… …
1000 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
1001 quick_timeout = 1; 995 quick_timeout = 1;
1002 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
1003 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1004 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
1005 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
1006 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
1007 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1008 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
1009 R->want_refresh = 1; 1003 R->want_refresh = 1;
1010 } 1004 }
… …
1026 quick_timeout |= R->want_full_refresh; 1020 quick_timeout |= R->want_full_refresh;
1027#endif 1021#endif
1028#endif 1022#endif
1029} 1023}
1030 1024
1025#ifdef POINTER_BLANK
1031void 1026void
1032rxvt_term::pointer_unblank () 1027rxvt_term::pointer_unblank ()
1033{ 1028{
1034 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1035 rxvt_recolour_cursor (this); 1030 recolour_cursor ();
1036 1031
1037#ifdef POINTER_BLANK
1038 hidden_pointer = 0; 1032 hidden_pointer = 0;
1039 1033
1040 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
1041 pointer_ev.start (NOW + pointerBlankDelay); 1035 pointer_ev.start (NOW + pointerBlankDelay);
1042#endif
1043} 1036}
1044 1037
1045#ifdef POINTER_BLANK
1046void 1038void
1047rxvt_term::pointer_blank () 1039rxvt_term::pointer_blank ()
1048{ 1040{
1049 pointer_ev.stop ();
1050
1051 if (!(Options & Opt_pointerBlank)) 1041 if (!(Options & Opt_pointerBlank))
1052 return; 1042 return;
1053 1043
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1044 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 1045 XFlush (Xdisplay);
… …
1059 1049
1060void 1050void
1061rxvt_term::pointer_cb (time_watcher &w) 1051rxvt_term::pointer_cb (time_watcher &w)
1062{ 1052{
1063 SET_R (this); 1053 SET_R (this);
1054 SET_LOCALE (locale);
1064 1055
1065 pointer_blank (); 1056 pointer_blank ();
1066} 1057}
1067#endif 1058#endif
1068 1059
… …
1073 int button_number, key_state = 0; 1064 int button_number, key_state = 0;
1074 int x, y; 1065 int x, y;
1075 1066
1076 x = ev->x; 1067 x = ev->x;
1077 y = ev->y; 1068 y = ev->y;
1078 rxvt_pixel_position(aR_ &x, &y); 1069 R->pixel_position (&x, &y);
1079 1070
1080 if (R->MEvent.button == AnyButton) { 1071 if (R->MEvent.button == AnyButton) {
1081 button_number = 3; 1072 button_number = 3;
1082 } else { 1073 } else {
1083 button_number = R->MEvent.button - Button1; 1074 button_number = R->MEvent.button - Button1;
… …
1150{ 1141{
1151 int i, want_timeout; 1142 int i, want_timeout;
1152 Window unused_root, unused_child; 1143 Window unused_root, unused_child;
1153 int unused_root_x, unused_root_y; 1144 int unused_root_x, unused_root_y;
1154 unsigned int unused_mask; 1145 unsigned int unused_mask;
1155 struct timeval tp;
1156 1146
1157#ifdef DEBUG_X 1147#ifdef DEBUG_X
1158 const char *const eventnames[] = 1148 const char *const eventnames[] =
1159 { /* mason - this matches my system */ 1149 { /* mason - this matches my system */
1160 "", 1150 "",
… …
1191 "SelectionNotify", 1181 "SelectionNotify",
1192 "ColormapNotify", 1182 "ColormapNotify",
1193 "ClientMessage", 1183 "ClientMessage",
1194 "MappingNotify" 1184 "MappingNotify"
1195 }; 1185 };
1186#endif
1187
1188#ifdef DEBUG_X
1189 struct timeval tp;
1196 struct tm *ltt; 1190 struct tm *ltt;
1197#endif
1198
1199 /*
1200 * check if we need to get the time for any timeouts
1201 */
1202
1203 for (i = NUM_TIMEOUTS; i--; )
1204 if (R->timeout[i].tv_sec) {
1205 want_timeout = 1;
1206 break;
1207 }
1208
1209#ifndef DEBUG_X
1210 if (want_timeout)
1211#endif
1212 (void)gettimeofday(&tp, NULL); 1191 (void)gettimeofday(&tp, NULL);
1213
1214#ifdef DEBUG_X
1215 ltt = localtime(&(tp.tv_sec)); 1192 ltt = localtime(&(tp.tv_sec));
1216 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));
1217#endif 1194#endif
1218
1219 /* X event timeouts */
1220 if (want_timeout)
1221 for (i = NUM_TIMEOUTS; i--; ) {
1222 if (R->timeout[i].tv_sec == 0)
1223 continue;
1224 if ((tp.tv_sec < R->timeout[i].tv_sec)
1225 || (tp.tv_sec == R->timeout[i].tv_sec
1226 && tp.tv_usec < R->timeout[i].tv_usec))
1227 continue;
1228 R->timeout[i].tv_sec = 0;
1229 switch(i) {
1230 case TIMEOUT_INCR:
1231 rxvt_print_error("data loss: timeout on INCR selection paste");
1232 R->selection_wait = Sel_none;
1233 break;
1234 default:
1235 break;
1236 }
1237 }
1238 1195
1239 switch (ev->type) { 1196 switch (ev->type) {
1240 case KeyPress: 1197 case KeyPress:
1241 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1242 break; 1199 break;
… …
1368 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1325 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1369 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1326 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1370 ConfigureNotify, ev)); 1327 ConfigureNotify, ev));
1371 if (R->szHint.width != width || R->szHint.height != height) { 1328 if (R->szHint.width != width || R->szHint.height != height) {
1372 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));
1373 rxvt_resize_all_windows(aR_ (unsigned int)width, 1330 R->resize_all_windows (width, height, 1);
1374 (unsigned int)height, 1);
1375 } 1331 }
1376#ifdef DEBUG_SIZE 1332#ifdef DEBUG_SIZE
1377 else { 1333 else {
1378 D_SIZE((stderr, "Size: Not resizing")); 1334 D_SIZE((stderr, "Size: Not resizing"));
1379 } 1335 }
… …
1438 1394
1439 case GraphicsExpose: 1395 case GraphicsExpose:
1440 case Expose: 1396 case Expose:
1441 if (ev->xany.window == R->TermWin.vt) { 1397 if (ev->xany.window == R->TermWin.vt) {
1442#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1443 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1400 ev->xexpose.width, ev->xexpose.height, False);
1445#else 1401#else
1446 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1447 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1448 ev->xexpose.width, ev->xexpose.height, False); 1404 ev->xexpose.width, ev->xexpose.height, False);
1449 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1450 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev->xexpose.width, R->TermWin.height, False);
1451#endif 1407#endif
1452 R->want_refresh = 1; 1408 R->want_refresh = 1;
1453 } else { 1409 } else {
… …
1458 &unused_xevent)) ; 1414 &unused_xevent)) ;
1459 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1415 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1460 GraphicsExpose, 1416 GraphicsExpose,
1461 &unused_xevent)) ; 1417 &unused_xevent)) ;
1462 if (isScrollbarWindow(ev->xany.window)) { 1418 if (isScrollbarWindow(ev->xany.window)) {
1463 scrollbar_setIdle(); 1419 R->scrollBar.setIdle();
1464 rxvt_scrollbar_show(aR_ 0); 1420 rxvt_scrollbar_show(aR_ 0);
1465 } 1421 }
1466#ifdef MENUBAR 1422#ifdef MENUBAR
1467 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1423 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1468 rxvt_menubar_expose(aR); 1424 rxvt_menubar_expose(aR);
… …
1498 &unused_mask); 1454 &unused_mask);
1499#ifdef MOUSE_THRESHOLD 1455#ifdef MOUSE_THRESHOLD
1500 /* deal with a `jumpy' mouse */ 1456 /* deal with a `jumpy' mouse */
1501 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1457 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1502#endif 1458#endif
1503 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1459 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1460 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1461#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y<R->TermWin.int_bwidth || 1462 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1507 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1463 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1508 int dist; 1464 int dist;
… …
1557 &unused_root_x, &unused_root_y, 1513 &unused_root_x, &unused_root_y,
1558 &(ev->xbutton.x), &(ev->xbutton.y), 1514 &(ev->xbutton.x), &(ev->xbutton.y),
1559 &unused_mask); 1515 &unused_mask);
1560 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,
1561 scrollbar_size()); 1517 scrollbar_size());
1562 rxvt_scr_refresh(aR_ R->refresh_type); 1518 R->scr_refresh (R->refresh_type);
1563 R->refresh_limit = 0; 1519 R->refresh_limit = 0;
1564 rxvt_scrollbar_show(aR_ 1); 1520 rxvt_scrollbar_show(aR_ 1);
1565 } 1521 }
1566 break; 1522 break;
1567 } 1523 }
… …
1569 1525
1570/* INTPROTO */ 1526/* INTPROTO */
1571void 1527void
1572rxvt_button_press(pR_ XButtonEvent *ev) 1528rxvt_button_press(pR_ XButtonEvent *ev)
1573{ 1529{
1574 int reportmode = 0, clickintime; 1530 int reportmode = 0, clickintime;
1575 1531
1576 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1532 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1577 if (!R->bypass_keystate) 1533 if (!R->bypass_keystate)
1578 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1534 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1579/* 1535/*
… …
1581 */ 1537 */
1582 if (ev->window == R->TermWin.vt) 1538 if (ev->window == R->TermWin.vt)
1583 { 1539 {
1584#if RXVT_GRAPHICS 1540#if RXVT_GRAPHICS
1585 if (ev->subwindow != None) 1541 if (ev->subwindow != None)
1586 rxvt_Gr_ButtonPress(ev->x, ev->y); 1542 rxvt_Gr_ButtonPress (ev->x, ev->y);
1587 else 1543 else
1588#endif 1544#endif
1589 { 1545 {
1590 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1546 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1591 if (reportmode) 1547 if (reportmode)
… …
1626 if (ev->button != R->MEvent.button) 1582 if (ev->button != R->MEvent.button)
1627 R->MEvent.clicks = 0; 1583 R->MEvent.clicks = 0;
1628 switch (ev->button) 1584 switch (ev->button)
1629 { 1585 {
1630 case Button1: 1586 case Button1:
1587 /* allow shift+left click to extend selection */
1588 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1589 {
1631 if (R->MEvent.button == Button1 && clickintime) 1590 if (R->MEvent.button == Button1 && clickintime)
1591 R->selection_rotate (ev->x, ev->y);
1632 R->MEvent.clicks++; 1592 else
1593 R->selection_extend (ev->x, ev->y, 1);
1594 }
1633 else 1595 else
1596 {
1597 if (R->MEvent.button == Button1 && clickintime)
1598 R->MEvent.clicks++;
1599 else
1634 R->MEvent.clicks = 1; 1600 R->MEvent.clicks = 1;
1601
1635 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1602 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1603 }
1604
1636 R->MEvent.button = Button1; 1605 R->MEvent.button = Button1;
1637 break; 1606 break;
1638 1607
1639 case Button3: 1608 case Button3:
1640 if (R->MEvent.button == Button3 && clickintime) 1609 if (R->MEvent.button == Button3 && clickintime)
1641 rxvt_selection_rotate(aR_ ev->x, ev->y); 1610 R->selection_rotate (ev->x, ev->y);
1642 else 1611 else
1643 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1612 R->selection_extend (ev->x, ev->y, 1);
1644 R->MEvent.button = Button3; 1613 R->MEvent.button = Button3;
1645 break; 1614 break;
1646 } 1615 }
1647 } 1616 }
1648 R->MEvent.time = ev->time; 1617 R->MEvent.time = ev->time;
… …
1653/* 1622/*
1654 * Scrollbar window processing of button press 1623 * Scrollbar window processing of button press
1655 */ 1624 */
1656 if (isScrollbarWindow(ev->window)) 1625 if (isScrollbarWindow(ev->window))
1657 { 1626 {
1658 scrollbar_setIdle(); 1627 R->scrollBar.setIdle ();
1659 /* 1628 /*
1660 * Rxvt-style scrollbar: 1629 * Rxvt-style scrollbar:
1661 * move up if mouse is above slider 1630 * move up if mouse is above slider
1662 * move dn if mouse is below slider 1631 * move dn if mouse is below slider
1663 * 1632 *
… …
1716#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1685#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1717 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1686 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1718#endif 1687#endif
1719 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1688 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1720 if (upordown < 0) 1689 if (upordown < 0)
1721 scrollbar_setUp(); 1690 R->scrollBar.setUp ();
1722 else 1691 else
1723 scrollbar_setDn(); 1692 R->scrollBar.setDn ();
1724 } 1693 }
1725 } else 1694 } else
1726 switch (ev->button) { 1695 switch (ev->button) {
1727 case Button2: 1696 case Button2:
1728 switch (R->scrollbar_align) { 1697 switch (R->scrollbar_align) {
… …
1740 || scrollbar_above_slider(ev->y) 1709 || scrollbar_above_slider(ev->y)
1741 || scrollbar_below_slider(ev->y)) 1710 || scrollbar_below_slider(ev->y))
1742 rxvt_scr_move_to(aR_ 1711 rxvt_scr_move_to(aR_
1743 scrollbar_position(ev->y) - R->csrO, 1712 scrollbar_position(ev->y) - R->csrO,
1744 scrollbar_size()); 1713 scrollbar_size());
1745 scrollbar_setMotion(); 1714 R->scrollBar.setMotion ();
1746 break; 1715 break;
1747 1716
1748 case Button1: 1717 case Button1:
1749 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1718 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1750 R->csrO = ev->y - R->scrollBar.top; 1719 R->csrO = ev->y - R->scrollBar.top;
… …
1763 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1732 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1764# else 1733# else
1765 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1766# endif 1735# endif
1767 else 1736 else
1768 scrollbar_setMotion(); 1737 R->scrollBar.setMotion ();
1769 } else { 1738 } else {
1770 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1739 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1771 (R->TermWin.nrow 1740 (R->TermWin.nrow
1772 * scrollbar_position(ev->y) 1741 * scrollbar_position(ev->y)
1773 / scrollbar_size())); 1742 / scrollbar_size()));
… …
1795 R->csrO = 0; /* reset csr Offset */ 1764 R->csrO = 0; /* reset csr Offset */
1796 if (!R->bypass_keystate) 1765 if (!R->bypass_keystate)
1797 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1766 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1798 1767
1799 if (scrollbar_isUpDn()) { 1768 if (scrollbar_isUpDn()) {
1800 scrollbar_setIdle(); 1769 R->scrollBar.setIdle ();
1801 rxvt_scrollbar_show(aR_ 0); 1770 rxvt_scrollbar_show(aR_ 0);
1802#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1771#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1803 R->refresh_type &= ~SMOOTH_REFRESH; 1772 R->refresh_type &= ~SMOOTH_REFRESH;
1804#endif 1773#endif
1805 } 1774 }
… …
1842 * when overriding mouse reporting 1811 * when overriding mouse reporting
1843 */ 1812 */
1844 if (R->PrivateModes & PrivMode_mouse_report 1813 if (R->PrivateModes & PrivMode_mouse_report
1845 && R->bypass_keystate 1814 && R->bypass_keystate
1846 && ev->button == Button1 && R->MEvent.clicks <= 1) 1815 && ev->button == Button1 && R->MEvent.clicks <= 1)
1847 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1816 R->selection_extend (ev->x, ev->y, 0);
1848 1817
1849 switch (ev->button) { 1818 switch (ev->button) {
1850 case Button1: 1819 case Button1:
1851 case Button3: 1820 case Button3:
1852 rxvt_selection_make(aR_ ev->time); 1821 rxvt_selection_make(aR_ ev->time);
… …
1856 break; 1825 break;
1857#ifdef MOUSE_WHEEL 1826#ifdef MOUSE_WHEEL
1858 case Button4: 1827 case Button4:
1859 case Button5: 1828 case Button5:
1860 { 1829 {
1861 int i, v; 1830 int i;
1831 page_dirn v;
1862 1832
1863 v = (ev->button == Button4) ? UP : DN; 1833 v = (ev->button == Button4) ? UP : DN;
1864 if (ev->state & ShiftMask) 1834 if (ev->state & ShiftMask)
1865 i = 1; 1835 i = 1;
1866 else if ((R->Options & Opt_mouseWheelScrollPage)) 1836 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1874 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1844 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1875 } 1845 }
1876# endif 1846# endif
1877# ifdef JUMP_MOUSE_WHEEL 1847# ifdef JUMP_MOUSE_WHEEL
1878 rxvt_scr_page(aR_ v, i); 1848 rxvt_scr_page(aR_ v, i);
1879 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1849 R->scr_refresh (SMOOTH_REFRESH);
1880 rxvt_scrollbar_show(aR_ 1); 1850 rxvt_scrollbar_show(aR_ 1);
1881# else 1851# else
1882 for (; i--;) 1852 while (i--)
1883 { 1853 {
1884 rxvt_scr_page(aR_ v, 1); 1854 rxvt_scr_page(aR_ v, 1);
1885 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1855 R->scr_refresh (SMOOTH_REFRESH);
1886 rxvt_scrollbar_show(aR_ 1); 1856 rxvt_scrollbar_show(aR_ 1);
1887 } 1857 }
1888# endif 1858# endif
1889 } 1859 }
1890 break; 1860 break;
… …
2041 n = 0; 2011 n = 0;
2042 if (pchanged) { 2012 if (pchanged) {
2043 for (; n < (unsigned int)i; n++) { 2013 for (; n < (unsigned int)i; n++) {
2044 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2014 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2045 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"));
2046 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2047 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2017 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2048 break; 2018 break;
2049 } 2019 }
2050 } 2020 }
2051 } 2021 }
… …
2244 break; 2214 break;
2245 case 'I': /* cursor up and scroll down if needed */ 2215 case 'I': /* cursor up and scroll down if needed */
2246 rxvt_scr_index(aR_ DN); 2216 rxvt_scr_index(aR_ DN);
2247 break; 2217 break;
2248 case 'J': /* erase to end of screen */ 2218 case 'J': /* erase to end of screen */
2249 rxvt_scr_erase_screen(aR_ 0); 2219 R->scr_erase_screen (0);
2250 break; 2220 break;
2251 case 'K': /* erase to end of line */ 2221 case 'K': /* erase to end of line */
2252 rxvt_scr_erase_line(aR_ 0); 2222 rxvt_scr_erase_line(aR_ 0);
2253 break; 2223 break;
2254 case 'Y': /* move to specified row and col */ 2224 case 'Y': /* move to specified row and col */
… …
2589 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2559 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2590 rxvt_scr_tab(aR_ arg[0]); 2560 rxvt_scr_tab(aR_ arg[0]);
2591 break; 2561 break;
2592 2562
2593 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2563 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2594 rxvt_scr_erase_screen(aR_ arg[0]); 2564 R->scr_erase_screen (arg[0]);
2595 break; 2565 break;
2596 2566
2597 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2567 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2598 rxvt_scr_erase_line(aR_ arg[0]); 2568 rxvt_scr_erase_line(aR_ arg[0]);
2599 break; 2569 break;
… …
2620 2590
2621 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2591 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2622 arg[0] = -arg[0]; 2592 arg[0] = -arg[0];
2623 /* FALLTHROUGH */ 2593 /* FALLTHROUGH */
2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2594 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2625 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);
2626 break; 2596 break;
2627 2597
2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2598 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2629 R->tt_write((const unsigned char *)VT100_ANS, 2599 R->tt_write((const unsigned char *)VT100_ANS,
2630 (unsigned int)(sizeof(VT100_ANS) - 1)); 2600 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2769 break; 2739 break;
2770 case 6: /* lower window */ 2740 case 6: /* lower window */
2771 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2741 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2772 break; 2742 break;
2773 case 7: /* refresh window */ 2743 case 7: /* refresh window */
2774 rxvt_scr_touch(aR_ True); 2744 R->scr_touch (true);
2775 break; 2745 break;
2776 case 8: /* set size (chars) */ 2746 case 8: /* set size (chars) */
2777 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2747 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2778 (unsigned int)(args[1] * R->TermWin.fheight)); 2748 (unsigned int)(args[1] * R->TermWin.fheight));
2779 break; 2749 break;
… …
2990 if (*str != ';') { 2960 if (*str != ';') {
2991#if XPM_BACKGROUND 2961#if XPM_BACKGROUND
2992 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2962 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2993 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2963 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2994#endif 2964#endif
2995 rxvt_scr_touch(aR_ True); 2965 R->scr_touch (true);
2996 } 2966 }
2997 while ((str = STRCHR(str, ';')) != NULL) { 2967 while ((str = STRCHR(str, ';')) != NULL) {
2998 str++; 2968 str++;
2999#if XPM_BACKGROUND 2969#if XPM_BACKGROUND
3000 changed += rxvt_scale_pixmap(aR_ str); 2970 changed += rxvt_scale_pixmap(aR_ str);
… …
3002 } 2972 }
3003 if (changed) { 2973 if (changed) {
3004#ifdef XPM_BACKGROUND 2974#ifdef XPM_BACKGROUND
3005 rxvt_resize_pixmap(aR); 2975 rxvt_resize_pixmap(aR);
3006#endif 2976#endif
3007 rxvt_scr_touch(aR_ True); 2977 R->scr_touch (true);
3008 } 2978 }
3009 break; 2979 break;
3010 2980
3011 case XTerm_restoreFG: 2981 case XTerm_restoreFG:
3012 rxvt_set_window_color(aR_ Color_fg, str); 2982 rxvt_set_window_color(aR_ Color_fg, str);
… …
3178 break; 3148 break;
3179#endif 3149#endif
3180#ifdef scrollBar_esc 3150#ifdef scrollBar_esc
3181 case scrollBar_esc: 3151 case scrollBar_esc:
3182 if (rxvt_scrollbar_mapping(aR_ state)) { 3152 if (rxvt_scrollbar_mapping(aR_ state)) {
3183 rxvt_resize_all_windows(aR_ 0, 0, 0); 3153 R->resize_all_windows (0, 0, 0);
3184 rxvt_scr_touch(aR_ True); 3154 R->scr_touch (true);
3185 } 3155 }
3186 break; 3156 break;
3187#endif 3157#endif
3188 case 25: /* visible/invisible cursor */ 3158 case 25: /* visible/invisible cursor */
3189 rxvt_scr_cursor_visible(aR_ state); 3159 rxvt_scr_cursor_visible(aR_ state);
… …
3215 else 3185 else
3216 R->Options &= ~Opt_scrollTtyKeypress; 3186 R->Options &= ~Opt_scrollTtyKeypress;
3217 break; 3187 break;
3218 case 1047: /* secondary screen w/ clearing */ 3188 case 1047: /* secondary screen w/ clearing */
3219 if (R->current_screen != PRIMARY) 3189 if (R->current_screen != PRIMARY)
3220 rxvt_scr_erase_screen(aR_ 2); 3190 R->scr_erase_screen (2);
3221 rxvt_scr_change_screen(aR_ state); 3191 rxvt_scr_change_screen(aR_ state);
3222 /* FALLTHROUGH */ 3192 /* FALLTHROUGH */
3223 default: 3193 default:
3224 break; 3194 break;
3225 } 3195 }
… …
3399 } 3369 }
3400 3370
3401 if ((cmd == 'T') && (nargs >= 5)) { 3371 if ((cmd == 'T') && (nargs >= 5)) {
3402 int i, len = args[4]; 3372 int i, len = args[4];
3403 3373
3404 text = rxvt_malloc((len + 1) * sizeof(char)); 3374 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3405 3375
3406 if (text != NULL) { 3376 if (text != NULL) {
3407 for (i = 0; i < len; i++) 3377 for (i = 0; i < len; i++)
3408 text[i] = rxvt_cmd_getc(aR); 3378 text[i] = rxvt_cmd_getc(aR);
3409 text[len] = '\0'; 3379 text[len] = '\0';

Diff Legend

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