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.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.285 by root, Wed Jan 25 21:03:04 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
… …
155 } 158 }
156 159
157 x--; 160 x--;
158 } 161 }
159} 162}
160#endif
161 163
162void 164void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 166{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
… …
189 190
190 char attr[80]; // plenty 191 char attr[80]; // plenty
191 192
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 194 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 195 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 196 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 197 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 198 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 199 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 200 r & RS_Uline ? " uline" : "",
… …
238 239
239# if ENABLE_COMBINING 240# if ENABLE_COMBINING
240 if (alloc) 241 if (alloc)
241 delete [] alloc; 242 delete [] alloc;
242# endif 243# endif
243#endif
244} 244}
245#endif
245 246
246void 247void
247rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
248{ 249{
249 wchar_t ch[2]; 250 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 265 mb[0] = ch[0];
265 len = 1; 266 len = 1;
266 } 267 }
267 268
268 if (len > 0) 269 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
270 else 271 else
271 scr_bell (); 272 scr_bell ();
272 } 273 }
273 274
274 iso14755buf = 0; 275 iso14755buf = 0;
… …
298rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
299{ 300{
300 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
301 unsigned int newlen; 302 unsigned int newlen;
302 KeySym keysym; 303 KeySym keysym;
303#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */
305#endif
306 int valid_keysym; 304 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
308 306
309 /* 307 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 309 * escape sequence to toggle the Keypad.
312 * 310 *
… …
330 Status status_return; 328 Status status_return;
331 329
332#if 0 330#if 0
333#ifdef X_HAVE_UTF8_STRING 331#ifdef X_HAVE_UTF8_STRING
334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 333 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 334 KBUFSZ, &keysym, &status_return);
337 else 335 else
338#endif 336#endif
339#endif 337#endif
340 { 338 {
… …
377 || status_return == XLookupBoth; 375 || status_return == XLookupBoth;
378 } 376 }
379 else 377 else
380#endif 378#endif
381 { 379 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 380 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 381 valid_keysym = keysym != NoSymbol;
384 } 382 }
385 383
386 if (valid_keysym) 384 if (valid_keysym)
387 { 385 {
… …
439 scr_move_to (0, 1); 437 scr_move_to (0, 1);
440 return; 438 return;
441 } 439 }
442 else if (keysym == XK_End) 440 else if (keysym == XK_End)
443 { 441 {
444 scr_move_to (1, 0); 442 scr_move_to (1, 1);
445 return; 443 return;
446 } 444 }
447 } 445 }
448#endif 446#endif
449 } 447 }
… …
460 { 458 {
461 switch (keysym) 459 switch (keysym)
462 { 460 {
463 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
464 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
465 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
466 return; 464 return;
467#if TODO 465#if TODO
468 /* rxvt extras */ 466 /* rxvt extras */
469 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
470 change_font (FONT_UP); 468 change_font (FONT_UP);
… …
851 { 849 {
852#ifdef META8_OPTION 850#ifdef META8_OPTION
853 /* set 8-bit on */ 851 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 852 if (meta && (meta_char == 0x80))
855 { 853 {
856 unsigned char *ch; 854 char *ch;
857 855
858 for (ch = kbuf; ch < kbuf + len; ch++) 856 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 857 *ch |= 0x80;
860 858
861 meta = 0; 859 meta = 0;
… …
863#endif 861#endif
864 /* nil */ ; 862 /* nil */ ;
865 } 863 }
866 } 864 }
867 865
866 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
867 return;
868
868 if (len <= 0) 869 if (len <= 0)
869 return; /* not mapped */ 870 return; /* not mapped */
870 871
871 if (options & Opt_scrollTtyKeypress) 872 if (OPTION (Opt_scrollTtyKeypress))
872 if (view_start) 873 if (view_start)
873 { 874 {
874 view_start = 0; 875 view_start = 0;
875 want_refresh = 1; 876 want_refresh = 1;
876 } 877 }
… …
894#ifdef META8_OPTION 895#ifdef META8_OPTION
895 && meta_char == C0_ESC 896 && meta_char == C0_ESC
896#endif 897#endif
897 ) 898 )
898 { 899 {
899 const unsigned char ch = C0_ESC; 900 const char ch = C0_ESC;
900 tt_write (&ch, 1); 901 tt_write (&ch, 1);
901 } 902 }
902 903
903#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */
905 unsigned char *p;
906 int i;
907
908 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
909 for (i = 0, p = kbuf; i < len; i++, p++)
910 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
911 fprintf (stderr, "'\n");
912#endif /* DEBUG_CMD */
913 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
914} 905}
915/*}}} */ 906/*}}} */
916 907
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */
920unsigned int 909unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 911{
923 unsigned int n, s; 912 unsigned int n, s;
924 913
925 n = cmdbuf_ptr - cmdbuf_base; 914 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 915 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 952 }
964#endif 953#endif
965 954
966 if (want_refresh) 955 if (want_refresh)
967 { 956 {
957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
958 {
959 int row = view_start;
960 int end_row = row + nrow;
961
962 while (row > top_row && ROW (row - 1).is_longer ())
963 --row;
964
965 do
966 {
967 int start_row = row;
968 line_t *l;
969
970 do
971 {
972 l = &ROW (row++);
973
974 if (!(l->f & LINE_FILTERED))
975 {
976 // line not filtered, mark it as filtered
977 l->f |= LINE_FILTERED;
978 while (l->is_longer ())
979 {
980 l = &ROW (row++);
981 l->f |= LINE_FILTERED;
982 }
983
984 // and filter it
985 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
986
987 break;
988 }
989 }
990 while (l->is_longer () && row < end_row);
991 }
992 while (row < end_row);
993 }
994
968 scr_refresh (refresh_type); 995 scr_refresh ();
969 scrollbar_show (1); 996 scrollbar_show (1);
970#ifdef USE_XIM 997#ifdef USE_XIM
971 IMSendSpot (); 998 IMSendSpot ();
972#endif 999#endif
973 } 1000 }
… …
976} 1003}
977 1004
978void 1005void
979rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
980{ 1007{
981 SET_R (this); 1008 make_current ();
982 SET_LOCALE (locale);
983 1009
984 display->flush (); 1010 display->flush ();
985 1011
986 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1014}
989 1015
990void 1016void
991rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
992{ 1018{
993 SET_R (this); 1019 make_current ();
994 SET_LOCALE (locale);
995 1020
996 refresh_limit = 1; 1021 refresh_limit = 1;
997 refresh_count = 0; 1022 refresh_count = 0;
998 flush (); 1023 flush ();
999} 1024}
… …
1003rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1004{ 1029{
1005 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1006 want_refresh = 1; 1031 want_refresh = 1;
1007 1032
1008 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1009} 1034}
1010#endif 1035#endif
1011 1036
1012#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1013void 1038void
… …
1027rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1028{ 1053{
1029 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1030 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1031 { 1056 {
1032 refresh_type |= SMOOTH_REFRESH;
1033 want_refresh = 1; 1057 want_refresh = 1;
1034 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1035 } 1059 }
1036} 1060}
1037#endif 1061#endif
… …
1041rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1042{ 1066{
1043 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1044 { 1068 {
1045 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1046 refresh_type |= SMOOTH_REFRESH;
1047 want_refresh = 1; 1070 want_refresh = 1;
1048 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1049 } 1072 }
1050} 1073}
1051#endif 1074#endif
… …
1056{ 1079{
1057 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1059 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1060 { 1083 {
1061 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1062 view_start == 0)
1063 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1064 1086
1065 refresh_type |= SMOOTH_REFRESH;
1066 want_refresh = 1; 1087 want_refresh = 1;
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1089 }
1069} 1090}
1070#endif 1091#endif
1071 1092
1093#if HAVE_SCHED_YIELD
1094static struct event_handler
1095{
1096 check_watcher cw_yield;
1097
1098 void yield (check_watcher &w)
1099 {
1100 sched_yield ();
1101 w.stop ();
1102 }
1103
1104 event_handler ()
1105 : cw_yield (this, &event_handler::yield)
1106 {
1107 }
1108} event_handler;
1109#endif
1110
1072bool 1111bool
1073rxvt_term::pty_fill () 1112rxvt_term::pty_fill ()
1074{ 1113{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1114 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1115
1077 if (CBUFSIZ == n) 1116 if (CBUFSIZ == n)
1078 { 1117 {
1079 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1118 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1080 n = 0; 1119 n = 0;
1081 } 1120 }
1082 1121
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1086 1125
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1088 1127
1089 if (n > 0) 1128 if (r > 0)
1090 { 1129 {
1091 cmdbuf_endp += n; 1130 cmdbuf_endp += r;
1092 return true; 1131 return true;
1093 } 1132 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 {
1135#if HAVE_SCHED_YIELD
1136 if (display->is_local)
1137 event_handler.cw_yield.start ();
1138#endif
1139 }
1140 else
1095 { 1141 {
1096 pty_ev.stop (); 1142 pty_ev.stop ();
1097 1143
1098 if (!(options & Opt_hold)) 1144 if (!OPTION (Opt_hold))
1099 destroy (); 1145 destroy ();
1100 } 1146 }
1101 1147
1102 return false; 1148 return false;
1103} 1149}
1104 1150
1105void 1151void
1106rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1107{ 1153{
1108 SET_R (this); 1154 make_current ();
1109 SET_LOCALE (locale);
1110 1155
1111 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1112 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1113 while (pty_fill ()) 1158 while (pty_fill ())
1114 if (cmd_parse ()) 1159 if (cmd_parse ())
… …
1125 recolour_cursor (); 1170 recolour_cursor ();
1126 1171
1127#ifdef POINTER_BLANK 1172#ifdef POINTER_BLANK
1128 hidden_pointer = 0; 1173 hidden_pointer = 0;
1129 1174
1130 if (options & Opt_pointerBlank) 1175 if (OPTION (Opt_pointerBlank))
1131 pointer_ev.start (NOW + pointerBlankDelay); 1176 pointer_ev.start (NOW + pointerBlankDelay);
1132#endif 1177#endif
1133} 1178}
1134 1179
1135#ifdef POINTER_BLANK 1180#ifdef POINTER_BLANK
1136void 1181void
1137rxvt_term::pointer_blank () 1182rxvt_term::pointer_blank ()
1138{ 1183{
1139 if (! (options & Opt_pointerBlank)) 1184 if (!OPTION (Opt_pointerBlank))
1140 return; 1185 return;
1141 1186
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1187 XDefineCursor (display->display, vt, display->blank_cursor);
1143 XFlush (display->display); 1188 XFlush (display->display);
1144 1189
… …
1146} 1191}
1147 1192
1148void 1193void
1149rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1150{ 1195{
1151 SET_R (this); 1196 make_current ();
1152 SET_LOCALE (locale);
1153 1197
1154 pointer_blank (); 1198 pointer_blank ();
1155} 1199}
1156#endif 1200#endif
1157 1201
… …
1222 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1223 (32 + x + 1), 1267 (32 + x + 1),
1224 (32 + y + 1)); 1268 (32 + y + 1));
1225} 1269}
1226 1270
1227#ifdef USING_W11LIB
1228void
1229rxvt_W11_process_x_event (XEvent *ev)
1230{
1231 rxvt_t *r = rxvt_get_r ();
1232
1233 x_cb (*ev);
1234}
1235#endif
1236
1237/*{{{ process an X event */ 1271/*{{{ process an X event */
1238void 1272void
1239rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1240{ 1274{
1241 dDisp; 1275 make_current ();
1242 1276
1243 SET_R (this); 1277 dLocal (Display *, xdisp);
1244 SET_LOCALE (locale);
1245 1278
1246#if defined(CURSOR_BLINK) 1279 if (ev.xany.window == vt
1247 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
1248 { 1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1249 if (hidden_cursor) 1282 return;
1250 {
1251 hidden_cursor = 0;
1252 want_refresh = 1;
1253 }
1254 1283
1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 // for XQueryPointer
1256 }
1257#endif
1258
1259#if defined(POINTER_BLANK)
1260 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1261 {
1262 if (ev.type == MotionNotify
1263 || ev.type == ButtonPress
1264 || ev.type == ButtonRelease)
1265 if (hidden_pointer)
1266 pointer_unblank ();
1267
1268 if (ev.type == KeyPress && hidden_pointer == 0)
1269 pointer_blank ();
1270 }
1271#endif
1272
1273 Window unused_root, unused_child; 1285 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1286 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1287 unsigned int unused_mask;
1276 1288
1277 switch (ev.type) 1289 switch (ev.type)
… …
1284 1296
1285 break; 1297 break;
1286 1298
1287 case KeyRelease: 1299 case KeyRelease:
1288 { 1300 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1290 KeySym ks; 1302 KeySym keysym;
1291 1303
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif 1305#endif
1294 1306
1295#if ENABLE_FRILLS || ISO_14755 1307#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support 1308 // ISO 14755 support
1297 if (iso14755buf) 1309 if (iso14755buf)
… …
1302# endif 1314# endif
1303# if ISO_14755 1315# if ISO_14755
1304 // iso14755 part 5.2 handling: release time 1316 // iso14755 part 5.2 handling: release time
1305 // first: controls 1317 // first: controls
1306 if ((ev.xkey.state & ControlMask) 1318 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f) 1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1309 { 1321 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1311 commit_iso14755 (); 1323 commit_iso14755 ();
1312 return; // case-break; 1324 goto skip_switch;
1313 } 1325 }
1314 1326
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1328 if (i[0] == keysym)
1317 { 1329 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1330 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1331 commit_iso14755 ();
1320 return; // case-break; 1332 goto skip_switch;
1321 } 1333 }
1322 1334
1323 scr_bell (); 1335 scr_bell ();
1324# endif 1336# endif
1325 iso14755buf = 0; 1337 iso14755buf = 0;
… …
1344 else 1356 else
1345 iso14755buf = 0; 1357 iso14755buf = 0;
1346 } 1358 }
1347#endif 1359#endif
1348 1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1366 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1367 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0; 1369 mouse_slip_wheel_speed = 0;
1354#endif 1370#endif
1355 break; 1371 break;
1356 } 1372 }
1357 1373
… …
1363 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1364 break; 1380 break;
1365 1381
1366 case ClientMessage: 1382 case ClientMessage:
1367 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1369 { 1385 {
1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1389 {
1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1371 destroy (); 1393 destroy ();
1394 }
1372#if ENABLE_EWMH 1395#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev); 1399 &ev);
1400#endif
1401 }
1402 }
1403#if ENABLE_XEMBED
1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1405 {
1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1377#endif 1411#endif
1378 } 1412 }
1379#if ENABLE_XEMBED
1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1381 {
1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1383 focus_in ();
1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1385 focus_out ();
1386 }
1387#endif
1388#ifdef OFFIX_DND
1389 /* OffiX Dnd (drag 'n' drop) protocol */
1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1391 && (ev.xclient.data.l[0] == DndFile
1392 || ev.xclient.data.l[0] == DndDir
1393 || ev.xclient.data.l[0] == DndLink))
1394 {
1395 /* Get Dnd data */
1396 Atom ActualType;
1397 int ActualFormat;
1398 unsigned char *data;
1399 unsigned long Size, RemainingBytes;
1400
1401 XGetWindowProperty (disp, display->root,
1402 xa[XA_DNDSELECTION],
1403 0L, 1000000L,
1404 False, AnyPropertyType,
1405 &ActualType, &ActualFormat,
1406 &Size, &RemainingBytes,
1407 &data);
1408 set_string_property (XA_CUT_BUFFER0, data);
1409 XFree (data);
1410 selection_paste (display->root, XA_CUT_BUFFER0, true);
1411 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1412 }
1413#endif /* OFFIX_DND */
1414 break; 1413 break;
1415 1414
1416 case MappingNotify: 1415 case MappingNotify:
1417 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1418 break; 1417 break;
… …
1451 break; 1450 break;
1452 1451
1453 case ConfigureNotify: 1452 case ConfigureNotify:
1454 if (ev.xconfigure.window == parent[0]) 1453 if (ev.xconfigure.window == parent[0])
1455 { 1454 {
1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ; 1456 ;
1458 1457
1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1460 { 1459 {
1461 seen_resize = 1; 1460 seen_resize = 1;
1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1463 } 1462 }
1464 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1466 if (options & Opt_transparent) 1467 if (OPTION (Opt_transparent))
1467 check_our_parents (); 1468 check_our_parents ();
1468#endif 1469#endif
1469 } 1470 }
1470 break; 1471 break;
1471 1472
1472 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1473 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1474 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1475 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1476 1478
1477 break; 1479 break;
1478 1480
1479 case SelectionClear: 1481 case SelectionClear:
1480 selection_clear (); 1482 selection_clear ();
… …
1485 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1486 break; 1488 break;
1487 1489
1488 case SelectionRequest: 1490 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1492 break;
1493
1494 case MapNotify:
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 break; 1500 break;
1491 1501
1492 case UnmapNotify: 1502 case UnmapNotify:
1493 mapped = 0; 1503 mapped = 0;
1494#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1496#endif 1506#endif
1497 break; 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498
1499 case MapNotify:
1500 mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break; 1508 break;
1505 1509
1506#ifdef TRANSPARENT 1510#ifdef TRANSPARENT
1507 case ReparentNotify: 1511 case ReparentNotify:
1508 rootwin_cb (ev); 1512 rootwin_cb (ev);
… …
1514 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1515 { 1519 {
1516 do 1520 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1520 1524
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1526
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1526 1530
1527 scr_refresh (refresh_type); 1531 want_refresh = 1;
1528 } 1532 }
1529 else 1533 else
1530 { 1534 {
1531 XEvent unused_event; 1535 XEvent unused_event;
1532 1536
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1534 ; 1538 ;
1535 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1540 ;
1537 1541
1538 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1539 { 1543 {
1540 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1541 scrollbar_show (0); 1545 scrollbar_show (0);
1542 } 1546 }
1543#ifdef MENUBAR
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose ();
1546#endif
1547 1547
1548#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1551#endif 1551#endif
1552 } 1552 }
1553 break; 1553 break;
1554 1554
1555 case MotionNotify: 1555 case MotionNotify:
1556#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1557 if (hidden_pointer)
1558 pointer_unblank (); 1558 pointer_unblank ();
1559#endif 1559#endif
1560#if MENUBAR
1561 if (isMenuBarWindow (ev.xany.window))
1562 {
1563 menubar_control (ev.xbutton);
1564 break;
1565 }
1566#endif
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1561 break;
1569 1562
1570 if (ev.xany.window == vt) 1563 if (ev.xany.window == vt)
1571 { 1564 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1569 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1575 ; 1571 ;
1576 1572
1577 XQueryPointer (disp, vt, 1573 XQueryPointer (xdisp, vt,
1578 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1580 &ev.xbutton.x, &ev.xbutton.y, 1576 &ev.xbutton.x, &ev.xbutton.y,
1581 &ev.xbutton.state); 1577 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
… …
1646#endif 1642#endif
1647 } 1643 }
1648 } 1644 }
1649 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1650 { 1646 {
1651 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1652 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1653 ; 1649 ;
1654 1650
1655 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1656 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1657 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1655 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1657 scrollbar_size ());
1662 scr_refresh (refresh_type); 1658 want_refresh = 1;
1663 refresh_limit = 0; 1659 refresh_limit = 0;
1664 scrollbar_show (1); 1660 scrollbar_show (1);
1665 } 1661 }
1666 break; 1662 break;
1667 } 1663 }
1664
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 }
1678#endif
1679
1680#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 {
1683 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease)
1686 if (hidden_pointer)
1687 pointer_unblank ();
1688
1689 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank ();
1691 }
1692#endif
1668} 1693}
1669 1694
1670void 1695void
1671rxvt_term::focus_in () 1696rxvt_term::focus_in ()
1672{ 1697{
1673 if (!focus) 1698 if (!focus)
1674 { 1699 {
1675 focus = 1; 1700 focus = 1;
1676 want_refresh = 1; 1701 want_refresh = 1;
1702
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1704
1677#if USE_XIM 1705#if USE_XIM
1678 if (Input_Context != NULL) 1706 if (Input_Context != NULL)
1679 { 1707 {
1680 IMSetStatusPosition (); 1708 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1709 XSetICFocus (Input_Context);
1682 } 1710 }
1683#endif 1711#endif
1684#if CURSOR_BLINK 1712#if CURSOR_BLINK
1685 if (options & Opt_cursorBlink) 1713 if (OPTION (Opt_cursorBlink))
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687#endif 1715#endif
1688#if OFF_FOCUS_FADING 1716#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1717 if (rs[Rs_fade])
1690 { 1718 {
1691 pix_colors = pix_colors_focused; 1719 pix_colors = pix_colors_focused;
… …
1701 if (focus) 1729 if (focus)
1702 { 1730 {
1703 focus = 0; 1731 focus = 0;
1704 want_refresh = 1; 1732 want_refresh = 1;
1705 1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1735
1706#if ENABLE_FRILLS || ISO_14755 1736#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf)
1738 {
1707 iso14755buf = 0; 1739 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1740# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1741 scr_overlay_off ();
1742# endif
1743 }
1711#endif 1744#endif
1712#if USE_XIM 1745#if USE_XIM
1713 if (Input_Context != NULL) 1746 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1747 XUnsetICFocus (Input_Context);
1715#endif 1748#endif
1716#if CURSOR_BLINK 1749#if CURSOR_BLINK
1717 if (options & Opt_cursorBlink) 1750 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.stop (); 1751 cursor_blink_ev.stop ();
1719 hidden_cursor = 0; 1752 hidden_cursor = 0;
1720#endif 1753#endif
1721#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
… …
1730 1763
1731#if TRANSPARENT 1764#if TRANSPARENT
1732void 1765void
1733rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1734{ 1767{
1735 SET_R (this); 1768 make_current ();
1736 SET_LOCALE (locale);
1737 1769
1738 switch (ev.type) 1770 switch (ev.type)
1739 { 1771 {
1740 case PropertyNotify: 1772 case PropertyNotify:
1741 /* 1773 /*
… …
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1747 return; 1779 return;
1748 1780
1749 /* FALLTHROUGH */ 1781 /* FALLTHROUGH */
1750 case ReparentNotify: 1782 case ReparentNotify:
1751 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1752 want_refresh = want_full_refresh = 1; 1784 want_refresh = want_full_refresh = 1;
1753 break; 1785 break;
1754 } 1786 }
1755} 1787}
1756#endif 1788#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1791rxvt_term::button_press (XButtonEvent &ev)
1760{ 1792{
1761 int reportmode = 0, clickintime; 1793 int reportmode = 0, clickintime;
1762 1794
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1795 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1796
1764 if (!bypass_keystate) 1797 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1798 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1799
1767 /* 1800 /*
1768 * VT window processing of button press 1801 * VT window processing of button press
1769 */ 1802 */
1770 if (ev.window == vt) 1803 if (ev.window == vt)
1771 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1772#if ISO_14755 1808#if ISO_14755
1773 // 5.4 1809 // 5.4
1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1775 { 1811 {
1776 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1824#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1825 if (ev.button == MEvent.button && clickintime)
1790 { 1826 {
1791 /* same button, within alloted time */ 1827 /* same button, within alloted time */
1792 MEvent.clicks++; 1828 MEvent.clicks++;
1829
1793 if (MEvent.clicks > 1) 1830 if (MEvent.clicks > 1)
1794 { 1831 {
1795 /* only report double clicks */ 1832 /* only report double clicks */
1796 MEvent.clicks = 2; 1833 MEvent.clicks = 2;
1797 mouse_report (ev); 1834 mouse_report (ev);
… …
1829#else 1866#else
1830 selection.rect = false; 1867 selection.rect = false;
1831#endif 1868#endif
1832 1869
1833 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1835 { 1872 {
1836 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1838 else 1875 else
1839 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
… …
2004 } 2041 }
2005 2042
2006 break; 2043 break;
2007 } 2044 }
2008 } 2045 }
2046
2009 return; 2047 return;
2010 } 2048 }
2011#if MENUBAR
2012 /*
2013 * Menubar window processing of button press
2014 */
2015 if (isMenuBarWindow (ev.window))
2016 menubar_control (ev);
2017#endif
2018} 2049}
2019 2050
2020void 2051void
2021rxvt_term::button_release (XButtonEvent &ev) 2052rxvt_term::button_release (XButtonEvent &ev)
2022{ 2053{
… …
2028 2059
2029 if (scrollbar_isUpDn ()) 2060 if (scrollbar_isUpDn ())
2030 { 2061 {
2031 scrollBar.setIdle (); 2062 scrollBar.setIdle ();
2032 scrollbar_show (0); 2063 scrollbar_show (0);
2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2034 refresh_type &= ~SMOOTH_REFRESH;
2035#endif
2036 } 2064 }
2037 2065
2038#ifdef SELECTION_SCROLLING 2066#ifdef SELECTION_SCROLLING
2039 if (sel_scroll_ev.active) 2067 if (sel_scroll_ev.active)
2040 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2041#endif 2069#endif
2042 2070
2043 if (ev.window == vt) 2071 if (ev.window == vt)
2044 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2045#if ISO_14755 2076#if ISO_14755
2046 // 5.4 2077 // 5.4
2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2048 return; 2079 return;
2049#endif 2080#endif
2081
2050 if (reportmode) 2082 if (reportmode)
2051 { 2083 {
2052 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2053 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2054 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2084 { 2116 {
2085 case Button1: 2117 case Button1:
2086 case Button3: 2118 case Button3:
2087 selection_make (ev.time); 2119 selection_make (ev.time);
2088 break; 2120 break;
2121
2089 case Button2: 2122 case Button2:
2090 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2091 break; 2125 break;
2126
2092#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2093 case Button4: 2128 case Button4:
2094 case Button5: 2129 case Button5:
2095 { 2130 {
2096 int i; 2131 int i;
… …
2098 2133
2099 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2100 2135
2101 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2102 i = 1; 2137 i = 1;
2103 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2104 i = nrow - 1; 2139 i = nrow - 1;
2105 else 2140 else
2106 i = 5; 2141 i = 5;
2107 2142
2108# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
… …
2118 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
2119 } 2154 }
2120 else 2155 else
2121 { 2156 {
2122# endif 2157# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2158 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2159 scrollbar_show (1);
2127# else
2128 while (i--)
2129 {
2130 scr_page (v, 1);
2131 scr_refresh (SMOOTH_REFRESH);
2132 scrollbar_show (1);
2133 }
2134# endif
2135# ifdef MOUSE_SLIP_WHEELING 2160# ifdef MOUSE_SLIP_WHEELING
2136 } 2161 }
2137#endif 2162# endif
2138 } 2163 }
2139 break; 2164 break;
2140#endif 2165#endif
2141 } 2166 }
2142 } 2167 }
2143#ifdef MENUBAR
2144 else if (isMenuBarWindow (ev.window))
2145 menubar_control (ev);
2146#endif
2147} 2168}
2148 2169
2149#ifdef TRANSPARENT 2170#ifdef TRANSPARENT
2150#if TINTING 2171#if TINTING
2151/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
2152 2173
2153typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
2154 2175
2155void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2156{ 2177{
2157 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
2158 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
2159 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2160 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2161 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2162 int i; 2183 int i;
2163 2184
2164 Visual *visual = display->visual; 2185 Visual *visual = term->visual;
2165 2186
2166 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2167 2188
2168 /* for convenience */ 2189 /* for convenience */
2169 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
… …
2390 Atom atype; 2411 Atom atype;
2391 unsigned char *prop = NULL; 2412 unsigned char *prop = NULL;
2392 Window root, oldp, *list; 2413 Window root, oldp, *list;
2393 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2394 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2395 dDisp;
2396 2416
2397 pchanged = 0; 2417 pchanged = 0;
2398 2418
2399 if (!(options & Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2400 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2401 2421
2402 XGetWindowAttributes (disp, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2403 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2404 2424
2405 XGetWindowAttributes (disp, parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2406 2426
2407 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2408 { 2428 {
2409 if (am_transparent) 2429 if (am_transparent)
2410 { 2430 {
2411 pchanged = 1; 2431 pchanged = 1;
2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2413 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2414 } 2434 }
2415 2435
2416 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2417 } 2437 }
2418 2438
2419 /* Get all X ops out of the queue so that our information is up-to-date. */ 2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2420 XSync (disp, False); 2440 XSync (xdisp, False);
2421 2441
2422 /* 2442 /*
2423 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2424 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2425 * windows for each client, so we have to take care about that. 2445 * windows for each client, so we have to take care about that.
2426 */ 2446 */
2427 i = (xa[XA_XROOTPMAP_ID] 2447 i = (xa[XA_XROOTPMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2431 2451
2432 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2433 i = (xa[XA_ESETROOT_PMAP_ID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2434 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2435 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2436 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2437 2457
2438 if (!i || prop == NULL 2458 if (!i || prop == NULL
2439#if TINTING 2459#if TINTING
… …
2458 Window cr; 2478 Window cr;
2459 XImage *image; 2479 XImage *image;
2460 GC gc; 2480 GC gc;
2461 XGCValues gcvalue; 2481 XGCValues gcvalue;
2462 2482
2463 XTranslateCoordinates (disp, parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2464 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2465 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2466 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2467 nx = ny = 0; 2487 nx = ny = 0;
2468 2488
… …
2481 } 2501 }
2482 2502
2483 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2484 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2485 2505
2486 XSync (disp, False); 2506 XSync (xdisp, False);
2487 allowedxerror = -1; 2507 allowedxerror = -1;
2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2489 2509
2490 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2491 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2492 allowedxerror = 0; 2512 allowedxerror = 0;
2493 2513
… …
2496 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2497 { 2517 {
2498 pchanged = 1; 2518 pchanged = 1;
2499 if (pixmap != None) 2519 if (pixmap != None)
2500 { 2520 {
2501 XFreePixmap (disp, pixmap); 2521 XFreePixmap (xdisp, pixmap);
2502 pixmap = None; 2522 pixmap = None;
2503 } 2523 }
2504 } 2524 }
2505 2525
2506 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2507 } 2527 }
2508 else 2528 else
2509 { 2529 {
2510 if (pixmap != None) 2530 if (pixmap != None)
2511 XFreePixmap (disp, pixmap); 2531 XFreePixmap (xdisp, pixmap);
2512 2532
2513#if TINTING 2533#if TINTING
2514 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2515 { 2535 {
2516 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2517 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2518 2538
2519 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2520 2540
2521 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2522 } 2542 }
2523#endif 2543#endif
2524 2544
2525 pixmap = XCreatePixmap (disp, vt, 2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2526 szHint.width, szHint.height, image->depth);
2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2528 XPutImage (disp, pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2529 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2530 XFreeGC (disp, gc); 2549 XFreeGC (xdisp, gc);
2531 XDestroyImage (image); 2550 XDestroyImage (image);
2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2533 XClearWindow (disp, parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2534 2553
2535 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2536 pchanged = 1; 2555 pchanged = 1;
2537 2556
2538 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2539 } 2558 }
2540 } 2559 }
2541 2560
2542 if (am_pixmap_trans) 2561 if (am_pixmap_trans)
2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2544 else 2563 else
2545 { 2564 {
2546 unsigned int n; 2565 unsigned int n;
2547 /* 2566 /*
2548 * InheritPixmap transparency 2567 * InheritPixmap transparency
2549 */ 2568 */
2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2551 { 2570 {
2552 oldp = parent[i]; 2571 oldp = parent[i];
2553 XQueryTree (disp, parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2554 &parent[i], &list, &n); 2573 &parent[i], &list, &n);
2555 XFree (list); 2574 XFree (list);
2556 2575
2557 if (parent[i] == display->root) 2576 if (parent[i] == display->root)
2558 { 2577 {
… …
2570 2589
2571 if (pchanged) 2590 if (pchanged)
2572 { 2591 {
2573 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2574 { 2593 {
2575 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2577 { 2596 {
2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2579 break; 2598 break;
2580 } 2599 }
2581 } 2600 }
2582 } 2601 }
2583 2602
2584 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2585 { 2604 {
2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2588 am_transparent = 0; 2607 am_transparent = 0;
2589 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2590 } 2609 }
2591 else 2610 else
2592 { 2611 {
2593#if WAIT_FOR_WM
2594 /* wait (an arbitrary period) for the WM to do its thing
2595 * needed for fvwm2.2.2 (and before?) */
2596 sleep (1);
2597#endif
2598 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2599 { 2613 {
2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2601 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2602 } 2616 }
2603 2617
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2605 am_transparent = 1; 2619 am_transparent = 1;
2606 } 2620 }
2607 2621
2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 parent[i] = None; 2623 parent[i] = None;
2610 } 2624 }
2611 2625
2612 if (scrollBar.win) 2626 if (scrollBar.win)
2613 { 2627 {
2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2615 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2616 scrollbar_show (0); 2630 scrollbar_show (0);
2617 } 2631 }
2618 2632
2619 if (am_transparent) 2633 if (am_transparent)
… …
2631 2645
2632bool 2646bool
2633rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2634{ 2648{
2635 bool flag = false; 2649 bool flag = false;
2636 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2638 2652
2639 for (;;) 2653 for (;;)
2640 { 2654 {
2641 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2642 { 2656 {
2643 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2658 ch = next_char ();
2645 }
2646 2659
2647 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2648 break; 2661 break;
2662 }
2649 2663
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2665 {
2652 if (!seen_input) 2666 if (!seen_input)
2653 { 2667 {
… …
2662 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2664 } 2678 }
2665 2679
2666 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2682 bool refreshnow = false;
2669 int nlines = 0; 2683 int nlines = 0;
2670 unicode_t *str = buf; 2684 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2686
2673 for (;;) 2687 for (;;)
2674 { 2688 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2690 break;
… …
2682 if (ch == C0_LF) 2696 if (ch == C0_LF)
2683 nlines++; 2697 nlines++;
2684 2698
2685 refresh_count++; 2699 refresh_count++;
2686 2700
2687 if (!(options & Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2703 {
2690 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2691 ch = NOCHAR; 2706 ch = NOCHAR;
2692 break; 2707 break;
2693 } 2708 }
2694 2709
2695 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2697 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2698 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2699 nlines = 0; 2717 nlines = 0;
2700 str = buf; 2718 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2702 } 2720 }
2703 2721
… …
2716 2734
2717 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2736 ch = next_char ();
2719 } 2737 }
2720 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2721 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2722 2742
2723 /* 2743 /*
2724 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2725 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2726 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2727 * is incremented here because we must be doing flat-out scrolling. 2747 * is incremented here because we must be doing flat-out scrolling.
2728 */ 2748 */
2729 if (refreshnow) 2749 if (refreshnow)
2730 { 2750 {
2731 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2732 refresh_limit++; 2752 refresh_limit++;
2733 else 2753 else
2734 { 2754 {
2735 flag = true; 2755 flag = true;
2736 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2737 } 2758 }
2738 } 2759 }
2739 2760
2740 } 2761 }
2741 else 2762 else
… …
2756 } 2777 }
2757 2778
2758 return flag; 2779 return flag;
2759} 2780}
2760 2781
2761// read the next octet
2762unicode_t
2763rxvt_term::next_octet ()
2764{
2765 return cmdbuf_ptr < cmdbuf_endp
2766 ? *cmdbuf_ptr++
2767 : NOCHAR;
2768}
2769
2770// read the next character 2782// read the next character
2771unicode_t 2783wchar_t
2772rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2773{ 2785{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2787 {
2776 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2779 2791
2780 wchar_t wc; 2792 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2794
2783 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2784 { 2796 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2799 break;
2788 } 2800 }
2789 2801
2790 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2804
2793 // assume wchar == unicode 2805 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2796 } 2808 }
2797 2809
2798 return NOCHAR; 2810 return NOCHAR;
2799} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2800 2823
2801/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2802/* 2825/*
2803 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2804 * to the command. 2827 * to the command.
2805 */ 2828 */
2806unicode_t 2829wchar_t
2807rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2808{ 2831{
2809 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2810 2833
2811 if (c == NOCHAR) 2834 if (c == NOCHAR)
2812 throw out_of_input; 2835 throw out_of_input;
2813 2836
2814 return c; 2837 return c;
2815} 2838}
2816 2839
2817unicode_t 2840uint32_t
2818rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2819{ 2842{
2820 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2821 2844
2822 if (c == NOCHAR) 2845 if (c == NOCHAR)
2823 throw out_of_input; 2846 throw out_of_input;
2824 2847
2825 return c; 2848 return c;
… …
2925 case C0_ESC: 2948 case C0_ESC:
2926 process_escape_seq (); 2949 process_escape_seq ();
2927 break; 2950 break;
2928 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 2954 else
2933 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 2956 break;
2936 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2937 scr_bell (); 2958 scr_bell ();
2938 break; 2959 break;
2939 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3094 break; 3115 break;
3095 3116
3096 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3098 { 3119 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3122 }
3102 break; 3123 break;
3103 3124
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3148 process_dcs_seq ();
3128 break; 3149 break;
3129 3150
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3135 3155
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3158 process_csi_seq ();
… …
3247 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3248 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3249 if (arg[p] == -1) 3269 if (arg[p] == -1)
3250 arg[p] = ndef; 3270 arg[p] = ndef;
3251 3271
3252#ifdef DEBUG_CMD
3253 fprintf (stderr, "CSI ");
3254 for (p = 0; p < nargs; p++)
3255 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3256 fprintf (stderr, "%c\n", ch);
3257#endif
3258
3259 /* 3272 /*
3260 * private mode handling 3273 * private mode handling
3261 */ 3274 */
3262 if (priv) 3275 if (priv)
3263 { 3276 {
3264 switch (priv) 3277 switch (priv)
3265 { 3278 {
3266 case '>': 3279 case '>':
3267 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3268 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3290 }
3269 break; 3291 break;
3270 case '?': 3292 case '?':
3271 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3272 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3273 break; 3295 break;
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3406 break;
3385 3407
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3410 break;
3390 3411
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3393 break; 3414 break;
… …
3400 break; 3421 break;
3401 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
3402 scr_report_position (); 3423 scr_report_position ();
3403 break; 3424 break;
3404 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3405 if (options & Opt_insecure) 3426 if (OPTION (Opt_insecure))
3406 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3407 break; 3428 break;
3408 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3410 break; 3431 break;
… …
3502rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3503{ 3524{
3504 int x, y; 3525 int x, y;
3505 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3506 Window wdummy; 3527 Window wdummy;
3507 dDisp; 3528
3529 dLocal (Display *, xdisp);
3508 3530
3509 if (nargs == 0) 3531 if (nargs == 0)
3510 return; 3532 return;
3511 3533
3512 switch (args[0]) 3534 switch (args[0])
3513 { 3535 {
3514 /* 3536 /*
3515 * commands 3537 * commands
3516 */ 3538 */
3517 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3518 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3519 break; 3541 break;
3520 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3521 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3522 break; 3544 break;
3523 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3524 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3525 break; 3547 break;
3526 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3528 break; 3550 break;
3529 case 5: /* raise window */ 3551 case 5: /* raise window */
3530 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3531 break; 3553 break;
3532 case 6: /* lower window */ 3554 case 6: /* lower window */
3533 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3534 break; 3556 break;
3535 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3536 scr_touch (true); 3558 scr_touch (true);
3537 break; 3559 break;
3538 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3550 3572
3551 /* 3573 /*
3552 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3553 */ 3575 */
3554 case 11: /* report window state */ 3576 case 11: /* report window state */
3555 XGetWindowAttributes (disp, parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3557 break; 3579 break;
3558 case 13: /* report window position */ 3580 case 13: /* report window position */
3559 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3560 XTranslateCoordinates (disp, parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3561 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3562 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3563 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3564 break; 3586 break;
3565 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3566 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3568 break; 3590 break;
3569 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3570 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3571 break; 3593 break;
… …
3573 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3574 break; 3596 break;
3575 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3576 { 3598 {
3577 char *s; 3599 char *s;
3578 XGetIconName (disp, parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s); 3602 XFree (s);
3581 } 3603 }
3582 break; 3604 break;
3583 case 21: /* report window title */ 3605 case 21: /* report window title */
3584 { 3606 {
3585 char *s; 3607 char *s;
3586 XFetchName (disp, parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s); 3610 XFree (s);
3589 } 3611 }
3590 break; 3612 break;
3591 } 3613 }
3592} 3614}
… …
3595/*----------------------------------------------------------------------*/ 3617/*----------------------------------------------------------------------*/
3596/* 3618/*
3597 * get input up until STRING TERMINATOR (or BEL) 3619 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3620 * ends_how is terminator used. returned input must be free()'d
3599 */ 3621 */
3600unsigned char * 3622char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3623rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3624{
3603 unicode_t ch; 3625 unicode_t ch;
3604 bool seen_esc = false; 3626 bool seen_esc = false;
3605 unsigned int n = 0; 3627 unsigned int n = 0;
… …
3638 3660
3639 string[n++] = '\0'; 3661 string[n++] = '\0';
3640 3662
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3663 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3664
3643 return (unsigned char *)rxvt_wcstombs (string); 3665 return rxvt_wcstombs (string);
3644} 3666}
3645 3667
3646/*----------------------------------------------------------------------*/ 3668/*----------------------------------------------------------------------*/
3647/* 3669/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3670 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3671 */
3650void 3672void
3651rxvt_term::process_dcs_seq () 3673rxvt_term::process_dcs_seq ()
3652{ 3674{
3653 unsigned char *s; 3675 char *s;
3654 unicode_t eh; 3676 unicode_t eh;
3655 3677
3656 /* 3678 /*
3657 * Not handled yet 3679 * Not handled yet
3658 */ 3680 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3699 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3700 arg = arg * 10 + (ch - '0');
3679 3701
3680 if (ch == ';') 3702 if (ch == ';')
3681 { 3703 {
3682 unsigned char *s = get_to_st (eh); 3704 char *s = get_to_st (eh);
3683 3705
3684 if (s) 3706 if (s)
3685 { 3707 {
3686 process_xterm_seq (arg, (char *)s, eh); 3708 process_xterm_seq (arg, s, eh);
3687 free (s); 3709 free (s);
3688 } 3710 }
3689 } 3711 }
3690} 3712}
3691 3713
3692void 3714void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3716{
3695 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3696 { 3718 {
3697 unsigned short r, g, b; 3719 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3699 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3700 } 3722 }
3701 else 3723 else
3702 set_window_color (color, str); 3724 set_window_color (color, str);
3703} 3725}
3704 3726
3705/* 3727/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3728 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3729 */
3708void 3730void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3731rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3732{
3711 int changed = 0;
3712 int color; 3733 int color;
3713 char *buf, *name; 3734 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3715 int saveop = op; 3736 int saveop = op;
3716 dDisp; 3737
3738 dLocal (Display *, xdisp);
3717 3739
3718 assert (str != NULL); 3740 assert (str != NULL);
3719 switch (op) 3741 switch (op)
3720 { 3742 {
3721 case XTerm_name: 3743 case XTerm_name:
… …
3737 unsigned long bytes_after; 3759 unsigned long bytes_after;
3738 unsigned char *value = 0; 3760 unsigned char *value = 0;
3739 const char *str = ""; 3761 const char *str = "";
3740 3762
3741 if (prop 3763 if (prop
3742 && XGetWindowProperty (disp, parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3743 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3744 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3745 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3746 && actual_type != None 3768 && actual_type != None
3747 && actual_format == 8) 3769 && actual_format == 8)
… …
3759 { 3781 {
3760 *eq = 0; 3782 *eq = 0;
3761 set_utf8_property (display->atom (str), eq + 1); 3783 set_utf8_property (display->atom (str), eq + 1);
3762 } 3784 }
3763 else 3785 else
3764 XDeleteProperty (disp, parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3765 display->atom (str)); 3787 display->atom (str));
3766 } 3788 }
3767 break; 3789 break;
3768 3790
3769 case XTerm_Color: 3791 case XTerm_Color:
… …
3771 { 3793 {
3772 if ((name = strchr (buf, ';')) == NULL) 3794 if ((name = strchr (buf, ';')) == NULL)
3773 break; 3795 break;
3774 3796
3775 *name++ = '\0'; 3797 *name++ = '\0';
3776 color = atoi (buf); 3798 color = atoi (buf) + minCOLOR;
3777 3799
3778 if (color < 0 || color >= TOTAL_COLORS) 3800 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3779 break; 3801 break;
3780 3802
3781 if ((buf = strchr (name, ';')) != NULL) 3803 if ((buf = strchr (name, ';')) != NULL)
3782 *buf++ = '\0'; 3804 *buf++ = '\0';
3783 3805
3784 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3785 { 3807 {
3786 unsigned short r, g, b; 3808 unsigned short r, g, b;
3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3789 } 3811 }
3790 else 3812 else
3791 set_window_color (color + minCOLOR, name); 3813 set_window_color (color, name);
3792 } 3814 }
3793 break; 3815 break;
3794 case XTerm_Color00: 3816 case XTerm_Color00:
3795 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3796 break; 3818 break;
3797 case XTerm_Color01: 3819 case XTerm_Color01:
3798 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3820 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3799 break; 3821 break;
3800#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3801 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3803 break; 3825 break;
… …
3807 break; 3829 break;
3808 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3809 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3810 break; 3832 break;
3811#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#ifndef NO_BOLD_UNDERLINE_REVERSE
3812 case XTerm_Color_BD:
3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3814 break;
3815 case XTerm_Color_UL:
3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3817 break;
3818 case XTerm_Color_RV: 3834 case XTerm_Color_RV:
3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3836 break;
3837 case Rxvt_Color_BD:
3838 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp);
3840 break;
3841 case Rxvt_Color_UL:
3842 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp);
3820 break; 3844 break;
3821 case URxvt_Color_IT: 3845 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break; 3847 break;
3824#endif 3848#endif
… …
3829 if (am_transparent) 3853 if (am_transparent)
3830 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3831 break; 3855 break;
3832#endif 3856#endif
3833 3857
3834 case XTerm_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3835 if (*str != ';') 3860 if (*str != ';')
3836 { 3861 {
3837#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3838 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3839 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3840#endif
3841 scr_touch (true); 3865 scr_touch (true);
3866#endif
3842 } 3867 }
3868
3869 int changed = 0;
3870
3843 while ((str = strchr (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3844 { 3872 {
3845 str++; 3873 str++;
3846#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3847 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3848#endif 3876#endif
3849 } 3877 }
3850 3878
3851 if (changed) 3879 if (changed)
3852 { 3880 {
3853#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3854 resize_pixmap (); 3882 resize_pixmap ();
3855#endif
3856 scr_touch (true); 3883 scr_touch (true);
3884#endif
3857 } 3885 }
3886 }
3858 break; 3887 break;
3859 3888
3860 case XTerm_restoreFG: 3889 case Rxvt_restoreFG:
3861 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3862 break; 3891 break;
3863 case XTerm_restoreBG: 3892 case Rxvt_restoreBG:
3864 set_window_color (Color_bg, str); 3893 set_window_color (Color_bg, str);
3865 break; 3894 break;
3866 3895
3867 case XTerm_logfile: 3896 case XTerm_logfile:
3868 // TODO, when secure mode? 3897 // TODO, when secure mode?
3869 break; 3898 break;
3870 3899
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (options & Opt_insecure)
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0 3900#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3901 case Rxvt_dumpscreen: /* no error notices */
3879 { 3902 {
3880 int fd; 3903 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3904 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 { 3905 {
3883 scr_dump (fd); 3906 scr_dump (fd);
… …
3894 case URxvt_italicFont: 3917 case URxvt_italicFont:
3895 case URxvt_boldItalicFont: 3918 case URxvt_boldItalicFont:
3896#endif 3919#endif
3897 if (query) 3920 if (query)
3898 tt_printf ("\33]%d;%-.250s%c", saveop, 3921 tt_printf ("\33]%d;%-.250s%c", saveop,
3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3900 ? fontset[op - URxvt_font]->fontdesc : "", 3923 ? fontset[op - URxvt_font]->fontdesc : "",
3901 resp); 3924 resp);
3902 else 3925 else
3903 { 3926 {
3904 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3927 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3910 break; 3933 break;
3911 3934
3912#if ENABLE_FRILLS 3935#if ENABLE_FRILLS
3913 case URxvt_locale: 3936 case URxvt_locale:
3914 if (query) 3937 if (query)
3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3916 else 3939 else
3917 { 3940 {
3918 set_locale (str); 3941 set_locale (str);
3919 pty.set_utf8_mode (enc_utf8); 3942 pty->set_utf8_mode (enc_utf8);
3920 init_xlocale (); 3943 init_xlocale ();
3921 } 3944 }
3922 break; 3945 break;
3923 3946
3924 case URxvt_view_up: 3947 case URxvt_view_up:
3925 case URxvt_view_down: 3948 case URxvt_view_down:
3949 {
3926 int lines = atoi (str); 3950 int lines = atoi (str);
3927 3951
3928 if (lines) 3952 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 3953 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 3954 else
3931 {
3932 scr_erase_savelines (); 3955 scr_erase_savelines ();
3933 } 3956 }
3934 3957
3958 break;
3959#endif
3960
3961#if ENABLE_PERL
3962 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3964 ; // no responses yet
3935 break; 3965 break;
3936#endif 3966#endif
3937 } 3967 }
3938} 3968}
3939/*----------------------------------------------------------------------*/ 3969/*----------------------------------------------------------------------*/
… …
3970 return state; 4000 return state;
3971} 4001}
3972 4002
3973/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
3974void 4004void
3975rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3976{ 4006{
3977 unsigned int i, j; 4007 unsigned int i, j;
3978 int state; 4008 int state;
3979 4009
3980 static const struct 4010 static const struct
… …
3991 { 5, PrivMode_rVideo }, 4021 { 5, PrivMode_rVideo },
3992 { 6, PrivMode_relOrigin }, 4022 { 6, PrivMode_relOrigin },
3993 { 7, PrivMode_Autowrap }, 4023 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode 4024 // 8, bi-directional support mode
3995 { 9, PrivMode_MouseX10 }, 4025 { 9, PrivMode_MouseX10 },
3996#ifdef menuBar_esc
3997 { menuBar_esc, PrivMode_menuBar },
3998#endif
3999 // 18, 19 printing-related 4026 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor }, 4027 { 25, PrivMode_VisibleCursor },
4001#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
4002 { scrollBar_esc, PrivMode_scrollBar }, 4029 { scrollBar_esc, PrivMode_scrollBar },
4003#endif 4030#endif
… …
4048 } 4075 }
4049 4076
4050 /* extra handling for values with state unkept */ 4077 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4078 switch (arg[i])
4052 { 4079 {
4080#if ENABLE_STYLES
4081 case 1021:
4082 set_option (Opt_intensityStyles, mode);
4083
4084 scr_touch (true);
4085 break;
4086#endif
4053 case 1048: /* alternative cursor save */ 4087 case 1048: /* alternative cursor save */
4054 case 1049: 4088 case 1049:
4055 if (options & Opt_secondaryScreen) 4089 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4090 if (mode == 0)
4057 scr_cursor (RESTORE); 4091 scr_cursor (RESTORE);
4058 else if (mode == 1) 4092 else if (mode == 1)
4059 scr_cursor (SAVE); 4093 scr_cursor (SAVE);
4060 break; 4094 break;
… …
4075 case 3: /* 80/132 */ 4109 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4110 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4111 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4112 break;
4079 case 4: /* smooth scrolling */ 4113 case 4: /* smooth scrolling */
4080 if (state)
4081 options &= ~Opt_jumpScroll;
4082 else
4083 options |= Opt_jumpScroll; 4114 set_option (Opt_jumpScroll, !state);
4084 break; 4115 break;
4085 case 5: /* reverse video */ 4116 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4117 scr_rvideo_mode (state);
4087 break; 4118 break;
4088 case 6: /* relative/absolute origins */ 4119 case 6: /* relative/absolute origins */
… …
4094 /* case 8: - auto repeat, can't do on a per window basis */ 4125 /* case 8: - auto repeat, can't do on a per window basis */
4095 case 9: /* X10 mouse reporting */ 4126 case 9: /* X10 mouse reporting */
4096 if (state) /* orthogonal */ 4127 if (state) /* orthogonal */
4097 priv_modes &= ~PrivMode_MouseX11; 4128 priv_modes &= ~PrivMode_MouseX11;
4098 break; 4129 break;
4099#ifdef menuBar_esc
4100 case menuBar_esc:
4101#ifdef MENUBAR
4102 map_menuBar (state);
4103#endif
4104 break;
4105#endif
4106#ifdef scrollBar_esc 4130#ifdef scrollBar_esc
4107 case scrollBar_esc: 4131 case scrollBar_esc:
4108 if (scrollbar_mapping (state)) 4132 if (scrollbar_mapping (state))
4109 { 4133 {
4110 resize_all_windows (0, 0, 0); 4134 resize_all_windows (0, 0, 0);
… …
4129#if 0 4153#if 0
4130 case 1001: 4154 case 1001:
4131 break; /* X11 mouse highlighting */ 4155 break; /* X11 mouse highlighting */
4132#endif 4156#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4157 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (state)
4135 options &= ~Opt_scrollTtyOutput;
4136 else
4137 options |= Opt_scrollTtyOutput; 4158 set_option (Opt_scrollTtyOutput, !state);
4138 break; 4159 break;
4139 case 1011: /* scroll to bottom on key press */ 4160 case 1011: /* scroll to bottom on key press */
4140 if (state)
4141 options |= Opt_scrollTtyKeypress; 4161 set_option (Opt_scrollTtyKeypress, state);
4142 else
4143 options &= ~Opt_scrollTtyKeypress;
4144 break; 4162 break;
4145 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
4146 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4147 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
4148 scr_erase_screen (2); 4166 scr_erase_screen (2);
4149 scr_change_screen (state); 4167 scr_change_screen (state);
4150 break; 4168 break;
4151 case 1049: /* secondary screen w/ clearing first */ 4169 case 1049: /* secondary screen w/ clearing first */
4152 scr_change_screen (state); 4170 scr_change_screen (state);
4153 if (options & Opt_secondaryScreen) 4171 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4172 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4173 scr_erase_screen (2);
4156 break; 4174 break;
4157 default: 4175 default:
4158 break; 4176 break;
… …
4286 scr_color (Color_bg, Color_bg); 4304 scr_color (Color_bg, Color_bg);
4287 break; 4305 break;
4288 4306
4289 //case 50: // not variable spacing 4307 //case 50: // not variable spacing
4290 4308
4291#ifndef NO_BRIGHTCOLOR 4309#if ENABLE_FRILLS
4292 case 90: 4310 case 90:
4293 case 91: /* set bright fg color */ 4311 case 91: /* set bright fg color */
4294 case 92: 4312 case 92:
4295 case 93: 4313 case 93:
4296 case 94: 4314 case 94:
… …
4308 case 106: 4326 case 106:
4309 case 107: 4327 case 107:
4310 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4311 break; 4329 break;
4312#endif 4330#endif
4313
4314 } 4331 }
4315 } 4332 }
4316} 4333}
4317/*}}} */ 4334/*}}} */
4318 4335
… …
4342 */ 4359 */
4343void 4360void
4344rxvt_term::tt_printf (const char *fmt,...) 4361rxvt_term::tt_printf (const char *fmt,...)
4345{ 4362{
4346 va_list arg_ptr; 4363 va_list arg_ptr;
4347 unsigned char buf[256]; 4364 char buf[256];
4348 4365
4349 va_start (arg_ptr, fmt); 4366 va_start (arg_ptr, fmt);
4350 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4367 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4351 va_end (arg_ptr); 4368 va_end (arg_ptr);
4352 tt_write (buf, strlen (buf)); 4369 tt_write (buf, strlen (buf));
… …
4357 * or generated by us in response to a query ESC sequence. 4374 * or generated by us in response to a query ESC sequence.
4358 */ 4375 */
4359const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4360 4377
4361void 4378void
4362rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
4363{ 4380{
4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4382 return;
4383
4384 if (pty->pty < 0)
4385 return;
4386
4364 if (v_buflen == 0) 4387 if (v_buflen == 0)
4365 { 4388 {
4366 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4367 4390
4368 if ((unsigned int)written == len) 4391 if ((unsigned int)written == len)
4369 return; 4392 return;
4370 4393
4371 data += written; 4394 data += written;
4372 len -= written; 4395 len -= written;
4373 } 4396 }
4374 4397
4375 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4376 4399
4377 memcpy (v_buffer + v_buflen, data, len); 4400 memcpy (v_buffer + v_buflen, data, len);
4378 v_buflen += len; 4401 v_buflen += len;
4379 4402
4380 pty_ev.set (EVENT_READ | EVENT_WRITE); 4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4381} 4404}
4382 4405
4383void rxvt_term::pty_write () 4406void rxvt_term::pty_write ()
4384{ 4407{
4385 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4386 4409
4387 if (written > 0) 4410 if (written > 0)
4388 { 4411 {
4389 v_buflen -= written; 4412 v_buflen -= written;
4390 4413

Diff Legend

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