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.20 by pcg, Thu Dec 18 07:31:18 2003 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.20 2003/12/18 07:31:18 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 = R->kbuf; 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.
… …
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)
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)
… …
688 705
689void 706void
690rxvt_term::check_cb (check_watcher &w) 707rxvt_term::check_cb (check_watcher &w)
691{ 708{
692 SET_R (this); 709 SET_R (this);
710 SET_LOCALE (locale);
693 711
694 flush (); 712 flush ();
695} 713}
696 714
697void 715void
… …
741} 759}
742 760
743void 761void
744rxvt_term::blink_cb (time_watcher &w) 762rxvt_term::blink_cb (time_watcher &w)
745{ 763{
746 SET_R (this);
747
748 w.at += BLINK_INTERVAL; 764 w.at += BLINK_INTERVAL;
749 hidden_cursor = !hidden_cursor; 765 hidden_cursor = !hidden_cursor;
750 want_refresh = 1; 766 want_refresh = 1;
751} 767}
752 768
753void 769void
754rxvt_term::x_cb (io_watcher &w, short revents) 770rxvt_term::x_cb (io_watcher &w, short revents)
755{ 771{
756 SET_R (this); 772 SET_R (this);
773 SET_LOCALE (locale);
757 774
758 process_x_events (); 775 process_x_events ();
759} 776}
760 777
761bool 778bool
… …
772 if (n > 0) 789 if (n > 0)
773 { 790 {
774 cmdbuf_endp += n; 791 cmdbuf_endp += n;
775 return true; 792 return true;
776 } 793 }
777 else if (n < 0 && errno == EAGAIN) 794 else if (n < 0 && errno != EAGAIN)
795 destroy ();
796
778 return false; 797 return false;
779
780 destroy ();
781} 798}
782 799
783void 800void
784rxvt_term::pty_cb (io_watcher &w, short revents) 801rxvt_term::pty_cb (io_watcher &w, short revents)
785{ 802{
786 SET_R (this); 803 SET_R (this);
804 SET_LOCALE (locale);
787 805
788 if (revents & EVENT_WRITE) 806 if (revents & EVENT_WRITE)
789 tt_write (0, 0); 807 tt_write (0, 0);
790 else if (revents & EVENT_READ) 808 else if (revents & EVENT_READ)
809 {
810 bool flag = true;
811
791 // loop, but don't allow a single term to monopolize us 812 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong 813 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); ) 814 while (flag && pty_fill ())
794 { 815 {
795 if (!seen_input) 816 if (!seen_input)
796 { 817 {
797 seen_input = 1; 818 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */ 819 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch (); 820 tt_winch ();
800 } 821 }
801 822
802 uint32_t ch = NOCHAR; 823 uint32_t ch = NOCHAR;
803 824
804 for (;;) 825 for (;;)
805 { 826 {
806 if (ch == NOCHAR) 827 if (ch == NOCHAR)
807 ch = next_char (); 828 ch = next_char ();
808 829
809 if (ch == NOCHAR) // TODO: improve 830 if (ch == NOCHAR) // TODO: improve
810 break; 831 break;
811 832
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 833 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 { 834 {
814 /* Read a text string from the input buffer */ 835 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ]; 836 uint32_t buf[BUFSIZ];
816 bool refreshnow = false; 837 bool refreshnow = false;
817 int nlines = 0; 838 int nlines = 0;
818 uint32_t *str = buf; 839 uint32_t *str = buf;
819 840
820 *str++ = ch; 841 *str++ = ch;
821 842
822 for (;;) 843 for (;;)
823 { 844 {
824 ch = next_char (); 845 ch = next_char ();
825 846
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 847 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break; 848 break;
828 else 849 else
829 { 850 {
830 *str++ = ch; 851 *str++ = ch;
831 852
832 if (ch == '\n') 853 if (ch == '\n')
833 { 854 {
834 nlines++; 855 nlines++;
835 refresh_count++; 856 refresh_count++;
836 857
837 if (!(Options & Opt_jumpScroll) 858 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 859 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 { 860 {
840 refreshnow = true; 861 refreshnow = true;
862 flag = false;
841 ch = NOCHAR; 863 ch = NOCHAR;
842 break; 864 break;
843 } 865 }
844 } 866 }
845 867
846 if (str >= buf + BUFSIZ) 868 if (str >= buf + BUFSIZ)
847 { 869 {
848 ch = NOCHAR; 870 ch = NOCHAR;
849 break; 871 break;
850 } 872 }
851 } 873 }
852 } 874 }
853 875
854 rxvt_scr_add_lines (this, buf, nlines, str - buf); 876 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855 877
856 /* 878 /*
857 * If there have been a lot of new lines, then update the screen 879 * 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. 880 * 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 881 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling. 882 * is incremented here because we must be doing flat-out scrolling.
861 * 883 *
862 * refreshing should be correct for small scrolls, because of the 884 * refreshing should be correct for small scrolls, because of the
863 * time-out 885 * time-out
864 */ 886 */
865 if (refreshnow) 887 if (refreshnow)
866 { 888 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++; 890 refresh_limit++;
869 891
870 rxvt_scr_refresh (this, refresh_type); 892 rxvt_scr_refresh (this, refresh_type);
871 } 893 }
872 894
873 } 895 }
874 else 896 else
875 { 897 {
876 switch (ch) 898 switch (ch)
877 { 899 {
878 default: 900 default:
879 rxvt_process_nonprinting (this, ch); 901 rxvt_process_nonprinting (this, ch);
880 break; 902 break;
881 case C0_ESC: /* escape char */ 903 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this); 904 rxvt_process_escape_seq (this);
883 break; 905 break;
884 /*case 0x9b: */ /* CSI */ 906 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */ 907 /* rxvt_process_csi_seq (this); */
886 } 908 }
887 909
888 ch = NOCHAR; 910 ch = NOCHAR;
889 } 911 }
890 } 912 }
891 } 913 }
914 }
892} 915}
893 916
894// read the next character, currently handles UTF-8 917// read the next character, currently handles UTF-8
895// will probably handle all sorts of other stuff in the future 918// will probably handle all sorts of other stuff in the future
896uint32_t 919uint32_t
897rxvt_term::next_char () 920rxvt_term::next_char ()
898{ 921{
899 struct mbstate &s = mbstate;
900
901 while (cmdbuf_ptr < cmdbuf_endp) 922 while (cmdbuf_ptr < cmdbuf_endp)
902 { 923 {
903 uint8_t ch = *cmdbuf_ptr; 924 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++; 925 return *cmdbuf_ptr++;
929 926
930 /* first byte */ 927 wchar_t wc;
931 s.orig = ch; /* for broken encodings */ 928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
932 s.reg = ch; 929
933 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 930 if (len == (size_t)-2)
934 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 931 return NOCHAR;
935 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 932
936 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 933 if (len == (size_t)-1)
937 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
938 } 935
939 else 936 // assume wchar == unicode
940 { 937 cmdbuf_ptr += len;
941 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
942 return ch; 938 return wc;
943 }
944 } 939 }
945 940
946 return NOCHAR; 941 return NOCHAR;
947} 942}
948 943
… …
1030 1025
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 1032#ifdef POINTER_BLANK
1038 hidden_pointer = 0; 1033 hidden_pointer = 0;
1039 1034
1040 if (Options & Opt_pointerBlank) 1035 if (Options & Opt_pointerBlank)
… …
1059 1054
1060void 1055void
1061rxvt_term::pointer_cb (time_watcher &w) 1056rxvt_term::pointer_cb (time_watcher &w)
1062{ 1057{
1063 SET_R (this); 1058 SET_R (this);
1059 SET_LOCALE (locale);
1064 1060
1065 pointer_blank (); 1061 pointer_blank ();
1066} 1062}
1067#endif 1063#endif
1068 1064
… …
1150{ 1146{
1151 int i, want_timeout; 1147 int i, want_timeout;
1152 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1153 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1154 unsigned int unused_mask; 1150 unsigned int unused_mask;
1155 struct timeval tp;
1156 1151
1157#ifdef DEBUG_X 1152#ifdef DEBUG_X
1158 const char *const eventnames[] = 1153 const char *const eventnames[] =
1159 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1160 "", 1155 "",
… …
1191 "SelectionNotify", 1186 "SelectionNotify",
1192 "ColormapNotify", 1187 "ColormapNotify",
1193 "ClientMessage", 1188 "ClientMessage",
1194 "MappingNotify" 1189 "MappingNotify"
1195 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1196 struct tm *ltt; 1195 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); 1196 (void)gettimeofday(&tp, NULL);
1213
1214#ifdef DEBUG_X
1215 ltt = localtime(&(tp.tv_sec)); 1197 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)); 1198 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 1199#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 1200
1239 switch (ev->type) { 1201 switch (ev->type) {
1240 case KeyPress: 1202 case KeyPress:
1241 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1242 break; 1204 break;
… …
1458 &unused_xevent)) ; 1420 &unused_xevent)) ;
1459 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1460 GraphicsExpose, 1422 GraphicsExpose,
1461 &unused_xevent)) ; 1423 &unused_xevent)) ;
1462 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev->xany.window)) {
1463 scrollbar_setIdle(); 1425 R->scrollBar.setIdle();
1464 rxvt_scrollbar_show(aR_ 0); 1426 rxvt_scrollbar_show(aR_ 0);
1465 } 1427 }
1466#ifdef MENUBAR 1428#ifdef MENUBAR
1467 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1468 rxvt_menubar_expose(aR); 1430 rxvt_menubar_expose(aR);
… …
1581 */ 1543 */
1582 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1583 { 1545 {
1584#if RXVT_GRAPHICS 1546#if RXVT_GRAPHICS
1585 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1586 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress (ev->x, ev->y);
1587 else 1549 else
1588#endif 1550#endif
1589 { 1551 {
1590 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1591 if (reportmode) 1553 if (reportmode)
… …
1653/* 1615/*
1654 * Scrollbar window processing of button press 1616 * Scrollbar window processing of button press
1655 */ 1617 */
1656 if (isScrollbarWindow(ev->window)) 1618 if (isScrollbarWindow(ev->window))
1657 { 1619 {
1658 scrollbar_setIdle(); 1620 R->scrollBar.setIdle ();
1659 /* 1621 /*
1660 * Rxvt-style scrollbar: 1622 * Rxvt-style scrollbar:
1661 * move up if mouse is above slider 1623 * move up if mouse is above slider
1662 * move dn if mouse is below slider 1624 * move dn if mouse is below slider
1663 * 1625 *
… …
1716#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1717 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1718#endif 1680#endif
1719 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1720 if (upordown < 0) 1682 if (upordown < 0)
1721 scrollbar_setUp(); 1683 R->scrollBar.setUp ();
1722 else 1684 else
1723 scrollbar_setDn(); 1685 R->scrollBar.setDn ();
1724 } 1686 }
1725 } else 1687 } else
1726 switch (ev->button) { 1688 switch (ev->button) {
1727 case Button2: 1689 case Button2:
1728 switch (R->scrollbar_align) { 1690 switch (R->scrollbar_align) {
… …
1740 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1741 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1742 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1743 scrollbar_position(ev->y) - R->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1744 scrollbar_size()); 1706 scrollbar_size());
1745 scrollbar_setMotion(); 1707 R->scrollBar.setMotion ();
1746 break; 1708 break;
1747 1709
1748 case Button1: 1710 case Button1:
1749 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1750 R->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
… …
1763 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1725 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1764# else 1726# else
1765 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1727 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1766# endif 1728# endif
1767 else 1729 else
1768 scrollbar_setMotion(); 1730 R->scrollBar.setMotion ();
1769 } else { 1731 } else {
1770 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1732 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1771 (R->TermWin.nrow 1733 (R->TermWin.nrow
1772 * scrollbar_position(ev->y) 1734 * scrollbar_position(ev->y)
1773 / scrollbar_size())); 1735 / scrollbar_size()));
… …
1795 R->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1796 if (!R->bypass_keystate) 1758 if (!R->bypass_keystate)
1797 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1798 1760
1799 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1800 scrollbar_setIdle(); 1762 R->scrollBar.setIdle ();
1801 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1802#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1803 R->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1804#endif 1766#endif
1805 } 1767 }
… …
1856 break; 1818 break;
1857#ifdef MOUSE_WHEEL 1819#ifdef MOUSE_WHEEL
1858 case Button4: 1820 case Button4:
1859 case Button5: 1821 case Button5:
1860 { 1822 {
1861 int i, v; 1823 int i;
1824 page_dirn v;
1862 1825
1863 v = (ev->button == Button4) ? UP : DN; 1826 v = (ev->button == Button4) ? UP : DN;
1864 if (ev->state & ShiftMask) 1827 if (ev->state & ShiftMask)
1865 i = 1; 1828 i = 1;
1866 else if ((R->Options & Opt_mouseWheelScrollPage)) 1829 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2041 n = 0; 2004 n = 0;
2042 if (pchanged) { 2005 if (pchanged) {
2043 for (; n < (unsigned int)i; n++) { 2006 for (; n < (unsigned int)i; n++) {
2044 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2007 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")); 2008 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) { 2009 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2047 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2010 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2048 break; 2011 break;
2049 } 2012 }
2050 } 2013 }
2051 } 2014 }
… …
2620 2583
2621 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2622 arg[0] = -arg[0]; 2585 arg[0] = -arg[0];
2623 /* FALLTHROUGH */ 2586 /* FALLTHROUGH */
2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2625 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2588 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2626 break; 2589 break;
2627 2590
2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2629 R->tt_write((const unsigned char *)VT100_ANS, 2592 R->tt_write((const unsigned char *)VT100_ANS,
2630 (unsigned int)(sizeof(VT100_ANS) - 1)); 2593 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
3399 } 3362 }
3400 3363
3401 if ((cmd == 'T') && (nargs >= 5)) { 3364 if ((cmd == 'T') && (nargs >= 5)) {
3402 int i, len = args[4]; 3365 int i, len = args[4];
3403 3366
3404 text = rxvt_malloc((len + 1) * sizeof(char)); 3367 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3405 3368
3406 if (text != NULL) { 3369 if (text != NULL) {
3407 for (i = 0; i < len; i++) 3370 for (i = 0; i < len; i++)
3408 text[i] = rxvt_cmd_getc(aR); 3371 text[i] = rxvt_cmd_getc(aR);
3409 text[len] = '\0'; 3372 text[len] = '\0';

Diff Legend

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