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.13 by pcg, Fri Dec 5 04:27:20 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.13 2003/12/05 04:27:20 pcg Exp $ 4 * $Id: command.C,v 1.33 2004/01/30 18:12:17 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
61 unsigned int newlen; 63 unsigned int newlen;
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66#ifdef USE_XIM
67 int valid_keysym; 68 int valid_keysym;
68#endif 69 unsigned char kbuf[KBUFSZ];
69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) { 81 if (R->numlock_state || (ev->state & R->ModNumLockMask))
82 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 83 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 84 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 85 }
86
87 kbuf[0] = 0;
88
84#ifdef USE_XIM 89#ifdef USE_XIM
85 if (R->Input_Context != NULL) { 90 if (R->Input_Context)
91 {
86 Status status_return; 92 Status status_return;
87 93
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0)
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
92#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
95#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
96 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
127 }
98 } else { 128 else
129#endif
130 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->compose);
101 valid_keysym = 1; 132 valid_keysym = !len;
102 } 133 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 134
120#ifdef USE_XIM
121 if (valid_keysym) 135 if (valid_keysym)
122#endif
123 { 136 {
124/* for some backwards compatibility */ 137/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
127 if (ctrl) { 140 if (ctrl)
128# else 141# else
129 if (meta) { 142 if (meta)
130# endif 143# endif
144 {
131 if (keysym == R->ks_bigfont) { 145 if (keysym == R->ks_bigfont)
146 {
132 rxvt_change_font(aR_ 0, FONT_UP); 147 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 148 return;
149 }
134 } else if (keysym == R->ks_smallfont) { 150 else if (keysym == R->ks_smallfont)
151 {
135 rxvt_change_font(aR_ 0, FONT_DN); 152 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 153 return;
137 } 154 }
138 } 155 }
139#endif 156#endif
140 157
141 if (R->TermWin.saveLines) { 158 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta) {
… …
237 /* escape prefix */ 254 /* escape prefix */
238 if (meta) 255 if (meta)
239# ifdef META8_OPTION 256# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 257 if (R->meta_char == C0_ESC)
241# endif 258# endif
242 R->tt_write(&ch, 1); 259 R->tt_write (&ch, 1);
243 R->tt_write(kbuf0, l); 260 R->tt_write (kbuf0, l);
244 return; 261 return;
245 } else 262 } else
246#endif 263#endif
247 { 264 {
248 newlen = 1; 265 newlen = 1;
… …
572 if (R->greek_mode) 589 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 590 len = greek_xlat(kbuf, len);
574#endif 591#endif
575 /* nil */ ; 592 /* nil */ ;
576 } 593 }
577 } 594 }
578 595
579 if (len <= 0) 596 if (len <= 0)
580 return; /* not mapped */ 597 return; /* not mapped */
581 598
582 if (R->Options & Opt_scrollTtyKeypress) 599 if (R->Options & Opt_scrollTtyKeypress)
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
621 } 638 }
622#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
623 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
624} 641}
625/*}}} */ 642/*}}} */
626 643
627#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
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
… …
702 XEvent xev; 716 XEvent xev;
703 717
704 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
705 719
706#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
707 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
708 && xev.type == KeyPress)
709 { 722 {
710 if (hidden_cursor) 723 if (hidden_cursor)
711 { 724 {
712 hidden_cursor = 0; 725 hidden_cursor = 0;
713 want_refresh = 1; 726 want_refresh = 1;
714 } 727 }
715 728
716 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
717 } 730 }
718#endif 731#endif
719 732
720#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
721 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
722 && (pointerBlankDelay > 0))
723 { 735 {
724 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
725 || xev.type == ButtonPress 737 || xev.type == ButtonPress
726 || xev.type == ButtonRelease) 738 || xev.type == ButtonRelease)
727 if (hidden_pointer) 739 if (hidden_pointer)
… …
738 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
739 } 751 }
740 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
741} 753}
742 754
755#ifdef CURSOR_BLINK
743void 756void
744rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
745{ 758{
746 SET_R (this);
747
748 w.at += BLINK_INTERVAL;
749 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
750 want_refresh = 1; 760 want_refresh = 1;
761
762 w.start (w.at + BLINK_INTERVAL);
751} 763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_term::text_blink_cb (time_watcher &w)
769{
770 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 {
772 hidden_text = !hidden_text;
773 want_refresh = 1;
774 w.start (w.at + TEXT_BLINK_INTERVAL);
775 }
776}
777#endif
752 778
753void 779void
754rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
755{ 781{
756 SET_R (this); 782 SET_R (this);
783 SET_LOCALE (locale);
757 784
758 process_x_events (); 785 process_x_events ();
759} 786}
760 787
761bool 788bool
… …
782 809
783void 810void
784rxvt_term::pty_cb (io_watcher &w, short revents) 811rxvt_term::pty_cb (io_watcher &w, short revents)
785{ 812{
786 SET_R (this); 813 SET_R (this);
814 SET_LOCALE (locale);
787 815
788 if (revents & EVENT_WRITE) 816 if (revents & EVENT_WRITE)
789 tt_write (0, 0); 817 tt_write (0, 0);
790 else if (revents & EVENT_READ) 818 else if (revents & EVENT_READ)
791 { 819 {
… …
869 if (refreshnow) 897 if (refreshnow)
870 { 898 {
871 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
872 refresh_limit++; 900 refresh_limit++;
873 901
874 rxvt_scr_refresh (this, refresh_type); 902 scr_refresh (refresh_type);
875 } 903 }
876 904
877 } 905 }
878 else 906 else
879 { 907 {
… …
899// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
900// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
901uint32_t 929uint32_t
902rxvt_term::next_char () 930rxvt_term::next_char ()
903{ 931{
904 struct mbstate &s = mbstate;
905
906 while (cmdbuf_ptr < cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
907 { 933 {
908 uint8_t ch = *cmdbuf_ptr; 934 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++; 935 return *cmdbuf_ptr++;
934 936
935 /* first byte */ 937 wchar_t wc;
936 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
937 s.reg = ch; 939
938 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
939 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
940 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
941 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
942 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
943 } 945
944 else 946 // assume wchar == unicode
945 { 947 cmdbuf_ptr += len;
946 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
947 return ch; 948 return wc;
948 }
949 } 949 }
950 950
951 return NOCHAR; 951 return NOCHAR;
952} 952}
953 953
… …
1005 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
1006 quick_timeout = 1; 1006 quick_timeout = 1;
1007 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
1008 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1009 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
1010 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
1011 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1; 1014 R->want_refresh = 1;
1015 } 1015 }
… …
1031 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1032#endif 1032#endif
1033#endif 1033#endif
1034} 1034}
1035 1035
1036#ifdef POINTER_BLANK
1036void 1037void
1037rxvt_term::pointer_unblank () 1038rxvt_term::pointer_unblank ()
1038{ 1039{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1040 rxvt_recolour_cursor (this); 1041 recolour_cursor ();
1041 1042
1042#ifdef POINTER_BLANK
1043 hidden_pointer = 0; 1043 hidden_pointer = 0;
1044 1044
1045 if (Options & Opt_pointerBlank) 1045 if (Options & Opt_pointerBlank)
1046 pointer_ev.start (NOW + pointerBlankDelay); 1046 pointer_ev.start (NOW + pointerBlankDelay);
1047#endif
1048} 1047}
1049 1048
1050#ifdef POINTER_BLANK
1051void 1049void
1052rxvt_term::pointer_blank () 1050rxvt_term::pointer_blank ()
1053{ 1051{
1054 pointer_ev.stop ();
1055
1056 if (!(Options & Opt_pointerBlank)) 1052 if (!(Options & Opt_pointerBlank))
1057 return; 1053 return;
1058 1054
1059 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1060 XFlush (Xdisplay); 1056 XFlush (Xdisplay);
… …
1064 1060
1065void 1061void
1066rxvt_term::pointer_cb (time_watcher &w) 1062rxvt_term::pointer_cb (time_watcher &w)
1067{ 1063{
1068 SET_R (this); 1064 SET_R (this);
1065 SET_LOCALE (locale);
1069 1066
1070 pointer_blank (); 1067 pointer_blank ();
1071} 1068}
1072#endif 1069#endif
1073 1070
… …
1078 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1079 int x, y; 1076 int x, y;
1080 1077
1081 x = ev->x; 1078 x = ev->x;
1082 y = ev->y; 1079 y = ev->y;
1083 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1084 1081
1085 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1086 button_number = 3; 1083 button_number = 3;
1087 } else { 1084 } else {
1088 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1155{ 1152{
1156 int i, want_timeout; 1153 int i, want_timeout;
1157 Window unused_root, unused_child; 1154 Window unused_root, unused_child;
1158 int unused_root_x, unused_root_y; 1155 int unused_root_x, unused_root_y;
1159 unsigned int unused_mask; 1156 unsigned int unused_mask;
1160 struct timeval tp;
1161 1157
1162#ifdef DEBUG_X 1158#ifdef DEBUG_X
1163 const char *const eventnames[] = 1159 const char *const eventnames[] =
1164 { /* mason - this matches my system */ 1160 { /* mason - this matches my system */
1165 "", 1161 "",
… …
1196 "SelectionNotify", 1192 "SelectionNotify",
1197 "ColormapNotify", 1193 "ColormapNotify",
1198 "ClientMessage", 1194 "ClientMessage",
1199 "MappingNotify" 1195 "MappingNotify"
1200 }; 1196 };
1197#endif
1198
1199#ifdef DEBUG_X
1200 struct timeval tp;
1201 struct tm *ltt; 1201 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); 1202 (void)gettimeofday(&tp, NULL);
1218
1219#ifdef DEBUG_X
1220 ltt = localtime(&(tp.tv_sec)); 1203 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)); 1204 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1222#endif 1205#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 1206
1244 switch (ev->type) { 1207 switch (ev->type) {
1245 case KeyPress: 1208 case KeyPress:
1246 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1247 break; 1210 break;
… …
1340 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1341 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1342#endif 1305#endif
1343#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1344 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1345 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1346#endif 1309#endif
1347 } 1310 }
1348 break; 1311 break;
1349 1312
1350 case FocusOut: 1313 case FocusOut:
… …
1355 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1356 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1357#endif 1320#endif
1358#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1359 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1360 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1361 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1362#endif 1325#endif
1363 } 1326 }
1364 break; 1327 break;
1365 1328
… …
1373 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1374 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1375 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1376 if (R->szHint.width != width || R->szHint.height != height) { 1339 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)); 1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1378 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1379 (unsigned int)height, 1);
1380 } 1342 }
1381#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1382 else { 1344 else {
1383 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1384 } 1346 }
… …
1407 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1408 break; 1370 break;
1409 1371
1410 case UnmapNotify: 1372 case UnmapNotify:
1411 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1412 break; 1377 break;
1413 1378
1414 case MapNotify: 1379 case MapNotify:
1415 R->TermWin.mapped = 1; 1380 R->TermWin.mapped = 1;
1381#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif
1416 break; 1384 break;
1417 1385
1418 case PropertyNotify: 1386 case PropertyNotify:
1419 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1420 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1443 1411
1444 case GraphicsExpose: 1412 case GraphicsExpose:
1445 case Expose: 1413 case Expose:
1446 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1447#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1448 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1449 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1450#else 1418#else
1451 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1452 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1453 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1454 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1455 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1456#endif 1424#endif
1457 R->want_refresh = 1; 1425 R->want_refresh = 1;
1458 } else { 1426 } else {
… …
1463 &unused_xevent)) ; 1431 &unused_xevent)) ;
1464 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1465 GraphicsExpose, 1433 GraphicsExpose,
1466 &unused_xevent)) ; 1434 &unused_xevent)) ;
1467 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1468 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1469 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1470 } 1438 }
1471#ifdef MENUBAR 1439#ifdef MENUBAR
1472 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1473 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
… …
1503 &unused_mask); 1471 &unused_mask);
1504#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1505 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1506 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1507#endif 1475#endif
1508 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1509 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1510#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1511 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y < R->TermWin.int_bwidth
1512 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 || Pixel2Row(ev->xbutton.y) > (R->TermWin.nrow-1)) {
1513 int dist; 1481 int dist;
1514 1482
1515 R->pending_scroll_selection=1; 1483 R->pending_scroll_selection=1;
1516 1484
1517 /* don't clobber the current delay if we are 1485 /* don't clobber the current delay if we are
… …
1562 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1563 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1564 &unused_mask); 1532 &unused_mask);
1565 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1566 scrollbar_size()); 1534 scrollbar_size());
1567 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1568 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1569 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1570 } 1538 }
1571 break; 1539 break;
1572 } 1540 }
… …
1574 1542
1575/* INTPROTO */ 1543/* INTPROTO */
1576void 1544void
1577rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1578{ 1546{
1579 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1580 1548
1581 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1582 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1583 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1584/* 1552/*
… …
1586 */ 1554 */
1587 if (ev->window == R->TermWin.vt) 1555 if (ev->window == R->TermWin.vt)
1588 { 1556 {
1589#if RXVT_GRAPHICS 1557#if RXVT_GRAPHICS
1590 if (ev->subwindow != None) 1558 if (ev->subwindow != None)
1591 rxvt_Gr_ButtonPress(ev->x, ev->y); 1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1592 else 1560 else
1593#endif 1561#endif
1594 { 1562 {
1595 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1596 if (reportmode) 1564 if (reportmode)
… …
1631 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1632 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1633 switch (ev->button) 1601 switch (ev->button)
1634 { 1602 {
1635 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1636 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1637 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1638 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1639 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1640 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1641 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1642 break; 1623 break;
1643 1624
1644 case Button3: 1625 case Button3:
1645 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1646 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1647 else 1628 else
1648 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1649 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1650 break; 1631 break;
1651 } 1632 }
1652 } 1633 }
1653 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1658/* 1639/*
1659 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1660 */ 1641 */
1661 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1662 { 1643 {
1663 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1664 /* 1645 /*
1665 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1666 * move up if mouse is above slider 1647 * move up if mouse is above slider
1667 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1668 * 1649 *
… …
1721#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1722 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1723#endif 1704#endif
1724 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1725 if (upordown < 0) 1706 if (upordown < 0)
1726 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1727 else 1708 else
1728 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1729 } 1710 }
1730 } else 1711 } else
1731 switch (ev->button) { 1712 switch (ev->button) {
1732 case Button2: 1713 case Button2:
1733 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
… …
1745 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1746 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1747 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1748 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1749 scrollbar_size()); 1730 scrollbar_size());
1750 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1751 break; 1732 break;
1752 1733
1753 case Button1: 1734 case Button1:
1754 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1755 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
… …
1768 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1769# else 1750# else
1770 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1771# endif 1752# endif
1772 else 1753 else
1773 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1774 } else { 1755 } else {
1775 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1776 (R->TermWin.nrow 1757 (R->TermWin.nrow
1777 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1778 / scrollbar_size())); 1759 / scrollbar_size()));
… …
1800 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1801 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1802 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1803 1784
1804 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1805 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1806 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1807#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1808 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1809#endif 1790#endif
1810 } 1791 }
… …
1847 * when overriding mouse reporting 1828 * when overriding mouse reporting
1848 */ 1829 */
1849 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1850 && R->bypass_keystate 1831 && R->bypass_keystate
1851 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1852 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1853 1834
1854 switch (ev->button) { 1835 switch (ev->button) {
1855 case Button1: 1836 case Button1:
1856 case Button3: 1837 case Button3:
1857 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1861 break; 1842 break;
1862#ifdef MOUSE_WHEEL 1843#ifdef MOUSE_WHEEL
1863 case Button4: 1844 case Button4:
1864 case Button5: 1845 case Button5:
1865 { 1846 {
1866 int i, v; 1847 int i;
1848 page_dirn v;
1867 1849
1868 v = (ev->button == Button4) ? UP : DN; 1850 v = (ev->button == Button4) ? UP : DN;
1869 if (ev->state & ShiftMask) 1851 if (ev->state & ShiftMask)
1870 i = 1; 1852 i = 1;
1871 else if ((R->Options & Opt_mouseWheelScrollPage)) 1853 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1879 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1880 } 1862 }
1881# endif 1863# endif
1882# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1883 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1884 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1885 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1886# else 1868# else
1887 for (; i--;) 1869 while (i--)
1888 { 1870 {
1889 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1890 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1891 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1892 } 1874 }
1893# endif 1875# endif
1894 } 1876 }
1895 break; 1877 break;
… …
2046 n = 0; 2028 n = 0;
2047 if (pchanged) { 2029 if (pchanged) {
2048 for (; n < (unsigned int)i; n++) { 2030 for (; n < (unsigned int)i; n++) {
2049 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2031 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")); 2032 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) { 2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2052 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2053 break; 2035 break;
2054 } 2036 }
2055 } 2037 }
2056 } 2038 }
… …
2249 break; 2231 break;
2250 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2251 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2252 break; 2234 break;
2253 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2254 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2255 break; 2237 break;
2256 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2257 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2258 break; 2240 break;
2259 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2594 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2595 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2596 break; 2578 break;
2597 2579
2598 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2599 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2600 break; 2582 break;
2601 2583
2602 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2603 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2604 break; 2586 break;
… …
2625 2607
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2631 break; 2613 break;
2632 2614
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 R->tt_write((const unsigned char *)VT100_ANS, 2616 R->tt_write((const unsigned char *)VT100_ANS,
2635 (unsigned int)(sizeof(VT100_ANS) - 1)); 2617 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2726 break; 2708 break;
2727#endif 2709#endif
2728 2710
2729 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2730 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2731 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2732 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2733 2715
2734 default: 2716 default:
2735 break; 2717 break;
2736 } 2718 }
… …
2774 break; 2756 break;
2775 case 6: /* lower window */ 2757 case 6: /* lower window */
2776 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2777 break; 2759 break;
2778 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2779 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2780 break; 2762 break;
2781 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2782 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2783 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2784 break; 2766 break;
… …
2995 if (*str != ';') { 2977 if (*str != ';') {
2996#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2997 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2998 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2999#endif 2981#endif
3000 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
3001 } 2983 }
3002 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
3003 str++; 2985 str++;
3004#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
3005 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
3007 } 2989 }
3008 if (changed) { 2990 if (changed) {
3009#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
3010 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
3011#endif 2993#endif
3012 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
3013 } 2995 }
3014 break; 2996 break;
3015 2997
3016 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
3017 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3103#endif 3085#endif
3104 { 1000, PrivMode_MouseX11 }, 3086 { 1000, PrivMode_MouseX11 },
3105 { 1010, PrivMode_TtyOutputInh }, 3087 { 1010, PrivMode_TtyOutputInh },
3106 { 1011, PrivMode_Keypress }, 3088 { 1011, PrivMode_Keypress },
3107 { 1047, PrivMode_Screen }, 3089 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3108 }; 3091 };
3109 3092
3110 if (nargs == 0) 3093 if (nargs == 0)
3111 return; 3094 return;
3112 3095
… …
3183 break; 3166 break;
3184#endif 3167#endif
3185#ifdef scrollBar_esc 3168#ifdef scrollBar_esc
3186 case scrollBar_esc: 3169 case scrollBar_esc:
3187 if (rxvt_scrollbar_mapping(aR_ state)) { 3170 if (rxvt_scrollbar_mapping(aR_ state)) {
3188 rxvt_resize_all_windows(aR_ 0, 0, 0); 3171 R->resize_all_windows (0, 0, 0);
3189 rxvt_scr_touch(aR_ True); 3172 R->scr_touch (true);
3190 } 3173 }
3191 break; 3174 break;
3192#endif 3175#endif
3193 case 25: /* visible/invisible cursor */ 3176 case 25: /* visible/invisible cursor */
3194 rxvt_scr_cursor_visible(aR_ state); 3177 rxvt_scr_cursor_visible(aR_ state);
… …
3219 R->Options |= Opt_scrollTtyKeypress; 3202 R->Options |= Opt_scrollTtyKeypress;
3220 else 3203 else
3221 R->Options &= ~Opt_scrollTtyKeypress; 3204 R->Options &= ~Opt_scrollTtyKeypress;
3222 break; 3205 break;
3223 case 1047: /* secondary screen w/ clearing */ 3206 case 1047: /* secondary screen w/ clearing */
3207 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3224 if (R->current_screen != PRIMARY) 3208 if (R->current_screen != PRIMARY)
3225 rxvt_scr_erase_screen(aR_ 2); 3209 R->scr_erase_screen (2);
3226 rxvt_scr_change_screen(aR_ state); 3210 rxvt_scr_change_screen(aR_ state);
3227 /* FALLTHROUGH */ 3211 /* FALLTHROUGH */
3228 default: 3212 default:
3229 break; 3213 break;
3230 } 3214 }
… …
3404 } 3388 }
3405 3389
3406 if ((cmd == 'T') && (nargs >= 5)) { 3390 if ((cmd == 'T') && (nargs >= 5)) {
3407 int i, len = args[4]; 3391 int i, len = args[4];
3408 3392
3409 text = rxvt_malloc((len + 1) * sizeof(char)); 3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3410 3394
3411 if (text != NULL) { 3395 if (text != NULL) {
3412 for (i = 0; i < len; i++) 3396 for (i = 0; i < len; i++)
3413 text[i] = rxvt_cmd_getc(aR); 3397 text[i] = rxvt_cmd_getc(aR);
3414 text[len] = '\0'; 3398 text[len] = '\0';

Diff Legend

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