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.12 by pcg, Fri Dec 5 04:05:13 2003 UTC vs.
Revision 1.28 by pcg, Fri Jan 16 22:11:09 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.12 2003/12/05 04:05:13 pcg Exp $ 4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 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)
791 { 808 {
… …
869 if (refreshnow) 886 if (refreshnow)
870 { 887 {
871 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
872 refresh_limit++; 889 refresh_limit++;
873 890
874 rxvt_scr_refresh (this, refresh_type); 891 scr_refresh (refresh_type);
875 } 892 }
876 893
877 } 894 }
878 else 895 else
879 { 896 {
… …
899// read the next character, currently handles UTF-8 916// read the next character, currently handles UTF-8
900// will probably handle all sorts of other stuff in the future 917// will probably handle all sorts of other stuff in the future
901uint32_t 918uint32_t
902rxvt_term::next_char () 919rxvt_term::next_char ()
903{ 920{
904 struct mbstate &s = mbstate;
905
906 while (cmdbuf_ptr < cmdbuf_endp) 921 while (cmdbuf_ptr < cmdbuf_endp)
907 { 922 {
908 uint8_t ch = *cmdbuf_ptr; 923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
909
910 if (s.cnt)
911 {
912 if ((ch & 0xc0) == 0x80)
913 {
914 cmdbuf_ptr++;
915
916 /* continuation */
917 s.reg = (s.reg << 6) | (ch & 0x7f);
918
919 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
920 return s.reg;
921
922 continue;
923 }
924 else
925 {
926 s.cnt = 0;
927 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
928 }
929 }
930
931 if ((ch & 0xc0) == 0xc0)
932 {
933 cmdbuf_ptr++; 924 return *cmdbuf_ptr++;
934 925
935 /* first byte */ 926 wchar_t wc;
936 s.orig = ch; /* for broken encodings */ 927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
937 s.reg = ch; 928
938 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if (len == (size_t)-2)
939 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 930 return NOCHAR;
940 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 931
941 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if (len == (size_t)-1)
942 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
943 } 934
944 else 935 // assume wchar == unicode
945 { 936 cmdbuf_ptr += len;
946 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
947 return ch; 937 return wc;
948 }
949 } 938 }
950 939
951 return NOCHAR; 940 return NOCHAR;
952} 941}
953 942
… …
1005 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
1006 quick_timeout = 1; 995 quick_timeout = 1;
1007 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
1008 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1009 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
1010 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
1011 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1; 1003 R->want_refresh = 1;
1015 } 1004 }
… …
1035 1024
1036void 1025void
1037rxvt_term::pointer_unblank () 1026rxvt_term::pointer_unblank ()
1038{ 1027{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1040 rxvt_recolour_cursor (this); 1029 recolour_cursor ();
1041 1030
1042#ifdef POINTER_BLANK 1031#ifdef POINTER_BLANK
1043 hidden_pointer = 0; 1032 hidden_pointer = 0;
1044 1033
1045 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
… …
1049 1038
1050#ifdef POINTER_BLANK 1039#ifdef POINTER_BLANK
1051void 1040void
1052rxvt_term::pointer_blank () 1041rxvt_term::pointer_blank ()
1053{ 1042{
1054 pointer_ev.stop ();
1055
1056 if (!(Options & Opt_pointerBlank)) 1043 if (!(Options & Opt_pointerBlank))
1057 return; 1044 return;
1058 1045
1059 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1060 XFlush (Xdisplay); 1047 XFlush (Xdisplay);
… …
1064 1051
1065void 1052void
1066rxvt_term::pointer_cb (time_watcher &w) 1053rxvt_term::pointer_cb (time_watcher &w)
1067{ 1054{
1068 SET_R (this); 1055 SET_R (this);
1056 SET_LOCALE (locale);
1069 1057
1070 pointer_blank (); 1058 pointer_blank ();
1071} 1059}
1072#endif 1060#endif
1073 1061
… …
1078 int button_number, key_state = 0; 1066 int button_number, key_state = 0;
1079 int x, y; 1067 int x, y;
1080 1068
1081 x = ev->x; 1069 x = ev->x;
1082 y = ev->y; 1070 y = ev->y;
1083 rxvt_pixel_position(aR_ &x, &y); 1071 R->pixel_position (&x, &y);
1084 1072
1085 if (R->MEvent.button == AnyButton) { 1073 if (R->MEvent.button == AnyButton) {
1086 button_number = 3; 1074 button_number = 3;
1087 } else { 1075 } else {
1088 button_number = R->MEvent.button - Button1; 1076 button_number = R->MEvent.button - Button1;
… …
1155{ 1143{
1156 int i, want_timeout; 1144 int i, want_timeout;
1157 Window unused_root, unused_child; 1145 Window unused_root, unused_child;
1158 int unused_root_x, unused_root_y; 1146 int unused_root_x, unused_root_y;
1159 unsigned int unused_mask; 1147 unsigned int unused_mask;
1160 struct timeval tp;
1161 1148
1162#ifdef DEBUG_X 1149#ifdef DEBUG_X
1163 const char *const eventnames[] = 1150 const char *const eventnames[] =
1164 { /* mason - this matches my system */ 1151 { /* mason - this matches my system */
1165 "", 1152 "",
… …
1196 "SelectionNotify", 1183 "SelectionNotify",
1197 "ColormapNotify", 1184 "ColormapNotify",
1198 "ClientMessage", 1185 "ClientMessage",
1199 "MappingNotify" 1186 "MappingNotify"
1200 }; 1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1201 struct tm *ltt; 1192 struct tm *ltt;
1202#endif
1203
1204 /*
1205 * check if we need to get the time for any timeouts
1206 */
1207
1208 for (i = NUM_TIMEOUTS; i--; )
1209 if (R->timeout[i].tv_sec) {
1210 want_timeout = 1;
1211 break;
1212 }
1213
1214#ifndef DEBUG_X
1215 if (want_timeout)
1216#endif
1217 (void)gettimeofday(&tp, NULL); 1193 (void)gettimeofday(&tp, NULL);
1218
1219#ifdef DEBUG_X
1220 ltt = localtime(&(tp.tv_sec)); 1194 ltt = localtime(&(tp.tv_sec));
1221 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)); 1195 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));
1222#endif 1196#endif
1223
1224 /* X event timeouts */
1225 if (want_timeout)
1226 for (i = NUM_TIMEOUTS; i--; ) {
1227 if (R->timeout[i].tv_sec == 0)
1228 continue;
1229 if ((tp.tv_sec < R->timeout[i].tv_sec)
1230 || (tp.tv_sec == R->timeout[i].tv_sec
1231 && tp.tv_usec < R->timeout[i].tv_usec))
1232 continue;
1233 R->timeout[i].tv_sec = 0;
1234 switch(i) {
1235 case TIMEOUT_INCR:
1236 rxvt_print_error("data loss: timeout on INCR selection paste");
1237 R->selection_wait = Sel_none;
1238 break;
1239 default:
1240 break;
1241 }
1242 }
1243 1197
1244 switch (ev->type) { 1198 switch (ev->type) {
1245 case KeyPress: 1199 case KeyPress:
1246 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1247 break; 1201 break;
… …
1373 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1374 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1375 ConfigureNotify, ev)); 1329 ConfigureNotify, ev));
1376 if (R->szHint.width != width || R->szHint.height != height) { 1330 if (R->szHint.width != width || R->szHint.height != height) {
1377 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1378 rxvt_resize_all_windows(aR_ (unsigned int)width, 1332 R->resize_all_windows (width, height, 1);
1379 (unsigned int)height, 1);
1380 } 1333 }
1381#ifdef DEBUG_SIZE 1334#ifdef DEBUG_SIZE
1382 else { 1335 else {
1383 D_SIZE((stderr, "Size: Not resizing")); 1336 D_SIZE((stderr, "Size: Not resizing"));
1384 } 1337 }
… …
1443 1396
1444 case GraphicsExpose: 1397 case GraphicsExpose:
1445 case Expose: 1398 case Expose:
1446 if (ev->xany.window == R->TermWin.vt) { 1399 if (ev->xany.window == R->TermWin.vt) {
1447#ifdef NO_SLOW_LINK_SUPPORT 1400#ifdef NO_SLOW_LINK_SUPPORT
1448 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1449 ev->xexpose.width, ev->xexpose.height, False); 1402 ev->xexpose.width, ev->xexpose.height, False);
1450#else 1403#else
1451 // don't understand this, so commented it out 1404 // don't understand this, so commented it out
1452 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1453 ev->xexpose.width, ev->xexpose.height, False); 1406 ev->xexpose.width, ev->xexpose.height, False);
1454 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1455 // ev->xexpose.width, R->TermWin.height, False); 1408 // ev->xexpose.width, R->TermWin.height, False);
1456#endif 1409#endif
1457 R->want_refresh = 1; 1410 R->want_refresh = 1;
1458 } else { 1411 } else {
… …
1463 &unused_xevent)) ; 1416 &unused_xevent)) ;
1464 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1465 GraphicsExpose, 1418 GraphicsExpose,
1466 &unused_xevent)) ; 1419 &unused_xevent)) ;
1467 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow(ev->xany.window)) {
1468 scrollbar_setIdle(); 1421 R->scrollBar.setIdle();
1469 rxvt_scrollbar_show(aR_ 0); 1422 rxvt_scrollbar_show(aR_ 0);
1470 } 1423 }
1471#ifdef MENUBAR 1424#ifdef MENUBAR
1472 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1473 rxvt_menubar_expose(aR); 1426 rxvt_menubar_expose(aR);
… …
1503 &unused_mask); 1456 &unused_mask);
1504#ifdef MOUSE_THRESHOLD 1457#ifdef MOUSE_THRESHOLD
1505 /* deal with a `jumpy' mouse */ 1458 /* deal with a `jumpy' mouse */
1506 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1507#endif 1460#endif
1508 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1509 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1462 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1510#ifdef SELECTION_SCROLLING 1463#ifdef SELECTION_SCROLLING
1511 if (ev->xbutton.y<R->TermWin.int_bwidth || 1464 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1512 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1513 int dist; 1466 int dist;
… …
1562 &unused_root_x, &unused_root_y, 1515 &unused_root_x, &unused_root_y,
1563 &(ev->xbutton.x), &(ev->xbutton.y), 1516 &(ev->xbutton.x), &(ev->xbutton.y),
1564 &unused_mask); 1517 &unused_mask);
1565 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1566 scrollbar_size()); 1519 scrollbar_size());
1567 rxvt_scr_refresh(aR_ R->refresh_type); 1520 R->scr_refresh (R->refresh_type);
1568 R->refresh_limit = 0; 1521 R->refresh_limit = 0;
1569 rxvt_scrollbar_show(aR_ 1); 1522 rxvt_scrollbar_show(aR_ 1);
1570 } 1523 }
1571 break; 1524 break;
1572 } 1525 }
… …
1574 1527
1575/* INTPROTO */ 1528/* INTPROTO */
1576void 1529void
1577rxvt_button_press(pR_ XButtonEvent *ev) 1530rxvt_button_press(pR_ XButtonEvent *ev)
1578{ 1531{
1579 int reportmode = 0, clickintime; 1532 int reportmode = 0, clickintime;
1580 1533
1581 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1582 if (!R->bypass_keystate) 1535 if (!R->bypass_keystate)
1583 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1584/* 1537/*
… …
1586 */ 1539 */
1587 if (ev->window == R->TermWin.vt) 1540 if (ev->window == R->TermWin.vt)
1588 { 1541 {
1589#if RXVT_GRAPHICS 1542#if RXVT_GRAPHICS
1590 if (ev->subwindow != None) 1543 if (ev->subwindow != None)
1591 rxvt_Gr_ButtonPress(ev->x, ev->y); 1544 rxvt_Gr_ButtonPress (ev->x, ev->y);
1592 else 1545 else
1593#endif 1546#endif
1594 { 1547 {
1595 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1596 if (reportmode) 1549 if (reportmode)
… …
1631 if (ev->button != R->MEvent.button) 1584 if (ev->button != R->MEvent.button)
1632 R->MEvent.clicks = 0; 1585 R->MEvent.clicks = 0;
1633 switch (ev->button) 1586 switch (ev->button)
1634 { 1587 {
1635 case Button1: 1588 case Button1:
1589 /* allow shift+left click to extend selection */
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1591 {
1636 if (R->MEvent.button == Button1 && clickintime) 1592 if (R->MEvent.button == Button1 && clickintime)
1593 R->selection_rotate (ev->x, ev->y);
1637 R->MEvent.clicks++; 1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 }
1638 else 1597 else
1598 {
1599 if (R->MEvent.button == Button1 && clickintime)
1600 R->MEvent.clicks++;
1601 else
1639 R->MEvent.clicks = 1; 1602 R->MEvent.clicks = 1;
1603
1640 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 }
1606
1641 R->MEvent.button = Button1; 1607 R->MEvent.button = Button1;
1642 break; 1608 break;
1643 1609
1644 case Button3: 1610 case Button3:
1645 if (R->MEvent.button == Button3 && clickintime) 1611 if (R->MEvent.button == Button3 && clickintime)
1646 rxvt_selection_rotate(aR_ ev->x, ev->y); 1612 R->selection_rotate (ev->x, ev->y);
1647 else 1613 else
1648 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1614 R->selection_extend (ev->x, ev->y, 1);
1649 R->MEvent.button = Button3; 1615 R->MEvent.button = Button3;
1650 break; 1616 break;
1651 } 1617 }
1652 } 1618 }
1653 R->MEvent.time = ev->time; 1619 R->MEvent.time = ev->time;
… …
1658/* 1624/*
1659 * Scrollbar window processing of button press 1625 * Scrollbar window processing of button press
1660 */ 1626 */
1661 if (isScrollbarWindow(ev->window)) 1627 if (isScrollbarWindow(ev->window))
1662 { 1628 {
1663 scrollbar_setIdle(); 1629 R->scrollBar.setIdle ();
1664 /* 1630 /*
1665 * Rxvt-style scrollbar: 1631 * Rxvt-style scrollbar:
1666 * move up if mouse is above slider 1632 * move up if mouse is above slider
1667 * move dn if mouse is below slider 1633 * move dn if mouse is below slider
1668 * 1634 *
… …
1721#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1722 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1723#endif 1689#endif
1724 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1725 if (upordown < 0) 1691 if (upordown < 0)
1726 scrollbar_setUp(); 1692 R->scrollBar.setUp ();
1727 else 1693 else
1728 scrollbar_setDn(); 1694 R->scrollBar.setDn ();
1729 } 1695 }
1730 } else 1696 } else
1731 switch (ev->button) { 1697 switch (ev->button) {
1732 case Button2: 1698 case Button2:
1733 switch (R->scrollbar_align) { 1699 switch (R->scrollbar_align) {
… …
1745 || scrollbar_above_slider(ev->y) 1711 || scrollbar_above_slider(ev->y)
1746 || scrollbar_below_slider(ev->y)) 1712 || scrollbar_below_slider(ev->y))
1747 rxvt_scr_move_to(aR_ 1713 rxvt_scr_move_to(aR_
1748 scrollbar_position(ev->y) - R->csrO, 1714 scrollbar_position(ev->y) - R->csrO,
1749 scrollbar_size()); 1715 scrollbar_size());
1750 scrollbar_setMotion(); 1716 R->scrollBar.setMotion ();
1751 break; 1717 break;
1752 1718
1753 case Button1: 1719 case Button1:
1754 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1755 R->csrO = ev->y - R->scrollBar.top; 1721 R->csrO = ev->y - R->scrollBar.top;
… …
1768 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1769# else 1735# else
1770 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1771# endif 1737# endif
1772 else 1738 else
1773 scrollbar_setMotion(); 1739 R->scrollBar.setMotion ();
1774 } else { 1740 } else {
1775 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1776 (R->TermWin.nrow 1742 (R->TermWin.nrow
1777 * scrollbar_position(ev->y) 1743 * scrollbar_position(ev->y)
1778 / scrollbar_size())); 1744 / scrollbar_size()));
… …
1800 R->csrO = 0; /* reset csr Offset */ 1766 R->csrO = 0; /* reset csr Offset */
1801 if (!R->bypass_keystate) 1767 if (!R->bypass_keystate)
1802 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1803 1769
1804 if (scrollbar_isUpDn()) { 1770 if (scrollbar_isUpDn()) {
1805 scrollbar_setIdle(); 1771 R->scrollBar.setIdle ();
1806 rxvt_scrollbar_show(aR_ 0); 1772 rxvt_scrollbar_show(aR_ 0);
1807#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1808 R->refresh_type &= ~SMOOTH_REFRESH; 1774 R->refresh_type &= ~SMOOTH_REFRESH;
1809#endif 1775#endif
1810 } 1776 }
… …
1847 * when overriding mouse reporting 1813 * when overriding mouse reporting
1848 */ 1814 */
1849 if (R->PrivateModes & PrivMode_mouse_report 1815 if (R->PrivateModes & PrivMode_mouse_report
1850 && R->bypass_keystate 1816 && R->bypass_keystate
1851 && ev->button == Button1 && R->MEvent.clicks <= 1) 1817 && ev->button == Button1 && R->MEvent.clicks <= 1)
1852 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1818 R->selection_extend (ev->x, ev->y, 0);
1853 1819
1854 switch (ev->button) { 1820 switch (ev->button) {
1855 case Button1: 1821 case Button1:
1856 case Button3: 1822 case Button3:
1857 rxvt_selection_make(aR_ ev->time); 1823 rxvt_selection_make(aR_ ev->time);
… …
1861 break; 1827 break;
1862#ifdef MOUSE_WHEEL 1828#ifdef MOUSE_WHEEL
1863 case Button4: 1829 case Button4:
1864 case Button5: 1830 case Button5:
1865 { 1831 {
1866 int i, v; 1832 int i;
1833 page_dirn v;
1867 1834
1868 v = (ev->button == Button4) ? UP : DN; 1835 v = (ev->button == Button4) ? UP : DN;
1869 if (ev->state & ShiftMask) 1836 if (ev->state & ShiftMask)
1870 i = 1; 1837 i = 1;
1871 else if ((R->Options & Opt_mouseWheelScrollPage)) 1838 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1879 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1880 } 1847 }
1881# endif 1848# endif
1882# ifdef JUMP_MOUSE_WHEEL 1849# ifdef JUMP_MOUSE_WHEEL
1883 rxvt_scr_page(aR_ v, i); 1850 rxvt_scr_page(aR_ v, i);
1884 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1851 R->scr_refresh (SMOOTH_REFRESH);
1885 rxvt_scrollbar_show(aR_ 1); 1852 rxvt_scrollbar_show(aR_ 1);
1886# else 1853# else
1887 for (; i--;) 1854 while (i--)
1888 { 1855 {
1889 rxvt_scr_page(aR_ v, 1); 1856 rxvt_scr_page(aR_ v, 1);
1890 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1857 R->scr_refresh (SMOOTH_REFRESH);
1891 rxvt_scrollbar_show(aR_ 1); 1858 rxvt_scrollbar_show(aR_ 1);
1892 } 1859 }
1893# endif 1860# endif
1894 } 1861 }
1895 break; 1862 break;
… …
2046 n = 0; 2013 n = 0;
2047 if (pchanged) { 2014 if (pchanged) {
2048 for (; n < (unsigned int)i; n++) { 2015 for (; n < (unsigned int)i; n++) {
2049 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2050 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2051 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2052 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2053 break; 2020 break;
2054 } 2021 }
2055 } 2022 }
2056 } 2023 }
… …
2249 break; 2216 break;
2250 case 'I': /* cursor up and scroll down if needed */ 2217 case 'I': /* cursor up and scroll down if needed */
2251 rxvt_scr_index(aR_ DN); 2218 rxvt_scr_index(aR_ DN);
2252 break; 2219 break;
2253 case 'J': /* erase to end of screen */ 2220 case 'J': /* erase to end of screen */
2254 rxvt_scr_erase_screen(aR_ 0); 2221 R->scr_erase_screen (0);
2255 break; 2222 break;
2256 case 'K': /* erase to end of line */ 2223 case 'K': /* erase to end of line */
2257 rxvt_scr_erase_line(aR_ 0); 2224 rxvt_scr_erase_line(aR_ 0);
2258 break; 2225 break;
2259 case 'Y': /* move to specified row and col */ 2226 case 'Y': /* move to specified row and col */
… …
2594 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2595 rxvt_scr_tab(aR_ arg[0]); 2562 rxvt_scr_tab(aR_ arg[0]);
2596 break; 2563 break;
2597 2564
2598 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2599 rxvt_scr_erase_screen(aR_ arg[0]); 2566 R->scr_erase_screen (arg[0]);
2600 break; 2567 break;
2601 2568
2602 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2603 rxvt_scr_erase_line(aR_ arg[0]); 2570 rxvt_scr_erase_line(aR_ arg[0]);
2604 break; 2571 break;
… …
2625 2592
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2594 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2595 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2631 break; 2598 break;
2632 2599
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 R->tt_write((const unsigned char *)VT100_ANS, 2601 R->tt_write((const unsigned char *)VT100_ANS,
2635 (unsigned int)(sizeof(VT100_ANS) - 1)); 2602 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2774 break; 2741 break;
2775 case 6: /* lower window */ 2742 case 6: /* lower window */
2776 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2777 break; 2744 break;
2778 case 7: /* refresh window */ 2745 case 7: /* refresh window */
2779 rxvt_scr_touch(aR_ True); 2746 R->scr_touch (true);
2780 break; 2747 break;
2781 case 8: /* set size (chars) */ 2748 case 8: /* set size (chars) */
2782 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2783 (unsigned int)(args[1] * R->TermWin.fheight)); 2750 (unsigned int)(args[1] * R->TermWin.fheight));
2784 break; 2751 break;
… …
2995 if (*str != ';') { 2962 if (*str != ';') {
2996#if XPM_BACKGROUND 2963#if XPM_BACKGROUND
2997 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2998 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2999#endif 2966#endif
3000 rxvt_scr_touch(aR_ True); 2967 R->scr_touch (true);
3001 } 2968 }
3002 while ((str = STRCHR(str, ';')) != NULL) { 2969 while ((str = STRCHR(str, ';')) != NULL) {
3003 str++; 2970 str++;
3004#if XPM_BACKGROUND 2971#if XPM_BACKGROUND
3005 changed += rxvt_scale_pixmap(aR_ str); 2972 changed += rxvt_scale_pixmap(aR_ str);
… …
3007 } 2974 }
3008 if (changed) { 2975 if (changed) {
3009#ifdef XPM_BACKGROUND 2976#ifdef XPM_BACKGROUND
3010 rxvt_resize_pixmap(aR); 2977 rxvt_resize_pixmap(aR);
3011#endif 2978#endif
3012 rxvt_scr_touch(aR_ True); 2979 R->scr_touch (true);
3013 } 2980 }
3014 break; 2981 break;
3015 2982
3016 case XTerm_restoreFG: 2983 case XTerm_restoreFG:
3017 rxvt_set_window_color(aR_ Color_fg, str); 2984 rxvt_set_window_color(aR_ Color_fg, str);
… …
3183 break; 3150 break;
3184#endif 3151#endif
3185#ifdef scrollBar_esc 3152#ifdef scrollBar_esc
3186 case scrollBar_esc: 3153 case scrollBar_esc:
3187 if (rxvt_scrollbar_mapping(aR_ state)) { 3154 if (rxvt_scrollbar_mapping(aR_ state)) {
3188 rxvt_resize_all_windows(aR_ 0, 0, 0); 3155 R->resize_all_windows (0, 0, 0);
3189 rxvt_scr_touch(aR_ True); 3156 R->scr_touch (true);
3190 } 3157 }
3191 break; 3158 break;
3192#endif 3159#endif
3193 case 25: /* visible/invisible cursor */ 3160 case 25: /* visible/invisible cursor */
3194 rxvt_scr_cursor_visible(aR_ state); 3161 rxvt_scr_cursor_visible(aR_ state);
… …
3220 else 3187 else
3221 R->Options &= ~Opt_scrollTtyKeypress; 3188 R->Options &= ~Opt_scrollTtyKeypress;
3222 break; 3189 break;
3223 case 1047: /* secondary screen w/ clearing */ 3190 case 1047: /* secondary screen w/ clearing */
3224 if (R->current_screen != PRIMARY) 3191 if (R->current_screen != PRIMARY)
3225 rxvt_scr_erase_screen(aR_ 2); 3192 R->scr_erase_screen (2);
3226 rxvt_scr_change_screen(aR_ state); 3193 rxvt_scr_change_screen(aR_ state);
3227 /* FALLTHROUGH */ 3194 /* FALLTHROUGH */
3228 default: 3195 default:
3229 break; 3196 break;
3230 } 3197 }
… …
3404 } 3371 }
3405 3372
3406 if ((cmd == 'T') && (nargs >= 5)) { 3373 if ((cmd == 'T') && (nargs >= 5)) {
3407 int i, len = args[4]; 3374 int i, len = args[4];
3408 3375
3409 text = rxvt_malloc((len + 1) * sizeof(char)); 3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3410 3377
3411 if (text != NULL) { 3378 if (text != NULL) {
3412 for (i = 0; i < len; i++) 3379 for (i = 0; i < len; i++)
3413 text[i] = rxvt_cmd_getc(aR); 3380 text[i] = rxvt_cmd_getc(aR);
3414 text[len] = '\0'; 3381 text[len] = '\0';

Diff Legend

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