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.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME 60#if LINUX_YIELD_HACK
60#if HAVE_SCHED_YIELD
61# include <sched.h> 61# include <ctime>
62#endif 62#endif
63 63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
229# if !UNICODE3 226# if !UNICODE3
230 if (ch >= 0x10000) 227 if (ch >= 0x10000)
231 ch = 0xfffd; 228 ch = 0xfffd;
232# endif 229# endif
233 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
235 } 234 }
236 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
237 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
239 243
240 free (fname); 244 free (fname);
241 245
… …
267 mb[0] = ch[0]; 271 mb[0] = ch[0];
268 len = 1; 272 len = 1;
269 } 273 }
270 274
271 if (len > 0) 275 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
273 else 277 else
274 scr_bell (); 278 scr_bell ();
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 309 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
311 316
312 /* 317 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
315 * 320 *
… …
333 Status status_return; 338 Status status_return;
334 339
335#if 0 340#if 0
336#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
340 else 345 else
341#endif 346#endif
342#endif 347#endif
343 { 348 {
… …
380 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
381 } 386 }
382 else 387 else
383#endif 388#endif
384 { 389 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
387 } 392 }
388 393
389 if (valid_keysym) 394 if (valid_keysym)
390 { 395 {
… …
442 scr_move_to (0, 1); 447 scr_move_to (0, 1);
443 return; 448 return;
444 } 449 }
445 else if (keysym == XK_End) 450 else if (keysym == XK_End)
446 { 451 {
447 scr_move_to (1, 0); 452 scr_move_to (1, 1);
448 return; 453 return;
449 } 454 }
450 } 455 }
451#endif 456#endif
452 } 457 }
… …
463 { 468 {
464 switch (keysym) 469 switch (keysym)
465 { 470 {
466 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
469 return; 474 return;
470#if TODO 475#if TODO
471 /* rxvt extras */ 476 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
854 { 859 {
855#ifdef META8_OPTION 860#ifdef META8_OPTION
856 /* set 8-bit on */ 861 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
858 { 863 {
859 unsigned char *ch; 864 char *ch;
860 865
861 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 867 *ch |= 0x80;
863 868
864 meta = 0; 869 meta = 0;
… …
866#endif 871#endif
867 /* nil */ ; 872 /* nil */ ;
868 } 873 }
869 } 874 }
870 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
871 if (len <= 0) 879 if (len <= 0)
872 return; /* not mapped */ 880 return; /* not mapped */
873 881
874 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 883 if (view_start)
876 { 884 {
877 view_start = 0; 885 view_start = 0;
878 want_refresh = 1; 886 want_refresh = 1;
879 } 887 }
… …
897#ifdef META8_OPTION 905#ifdef META8_OPTION
898 && meta_char == C0_ESC 906 && meta_char == C0_ESC
899#endif 907#endif
900 ) 908 )
901 { 909 {
902 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
903 tt_write (&ch, 1); 911 tt_write (&ch, 1);
904 } 912 }
905 913
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
917} 915}
918/*}}} */
919 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 995unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 997{
926 unsigned int n, s; 998 unsigned int n, s;
927 999
928 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 1038 }
967#endif 1039#endif
968 1040
969 if (want_refresh) 1041 if (want_refresh)
970 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
971 scr_refresh (refresh_type); 1081 scr_refresh ();
972 scrollbar_show (1); 1082 scrollbar_show (1);
973#ifdef USE_XIM 1083#ifdef USE_XIM
974 IMSendSpot (); 1084 IMSendSpot ();
975#endif 1085#endif
976 } 1086 }
… …
979} 1089}
980 1090
981void 1091void
982rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
983{ 1093{
984 SET_R (this); 1094 make_current ();
985 SET_LOCALE (locale);
986 1095
987 display->flush (); 1096 display->flush ();
988 1097
989 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1100}
992 1101
993void 1102void
994rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
995{ 1104{
996 SET_R (this); 1105 make_current ();
997 SET_LOCALE (locale);
998 1106
999 refresh_limit = 1; 1107 refresh_limit = 1;
1000 refresh_count = 0; 1108 refresh_count = 0;
1001 flush (); 1109 flush ();
1002} 1110}
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1115{
1008 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1117 want_refresh = 1;
1010 1118
1011 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1120}
1013#endif 1121#endif
1014 1122
1015#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1016void 1124void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1139{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1142 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1143 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1145 }
1039} 1146}
1040#endif 1147#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1152{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1154 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1156 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1158 }
1053} 1159}
1054#endif 1160#endif
… …
1059{ 1165{
1060 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1169 {
1064 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1067 1172
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1173 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1175 }
1072} 1176}
1073#endif 1177#endif
1074 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1075bool 1204bool
1076rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1077{ 1206{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1208
1080 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1081 { 1210 {
1082 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1083 n = 0; 1212 n = 0;
1084 } 1213 }
1085 1214
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1088 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1089 1218
1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1091 1220
1092 if (r > 0) 1221 if (r > 0)
1093 { 1222 {
1094 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1095 return true; 1224 return true;
1096 } 1225 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1227 {
1099#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1100 sched_yield (); 1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1101#endif 1231#endif
1102 } 1232 }
1103 else 1233 else
1104 { 1234 {
1105 pty_ev.stop (); 1235 pty_ev.stop ();
1106 1236
1107 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1108 destroy (); 1238 destroy ();
1109 } 1239 }
1110 1240
1111 return false; 1241 return false;
1112} 1242}
1113 1243
1114void 1244void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1246{
1117 SET_R (this); 1247 make_current ();
1118 SET_LOCALE (locale);
1119 1248
1120 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1251 while (pty_fill ())
1123 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1128} 1257}
1129 1258
1130void 1259void
1131rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1132{ 1261{
1133 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1134 recolour_cursor (); 1263 recolour_cursor ();
1135 1264
1136#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1137 hidden_pointer = 0; 1266 hidden_pointer = 0;
1138 1267
1139 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1140 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1141#endif 1270#endif
1142} 1271}
1143 1272
1144#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1145void 1274void
1146rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1147{ 1276{
1148 if (! OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1149 return; 1278 return;
1150 1279
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1152 XFlush (display->display); 1281 XFlush (dpy);
1153 1282
1154 hidden_pointer = 1; 1283 hidden_pointer = 1;
1155} 1284}
1156 1285
1157void 1286void
1158rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1159{ 1288{
1160 SET_R (this); 1289 make_current ();
1161 SET_LOCALE (locale);
1162 1290
1163 pointer_blank (); 1291 pointer_blank ();
1164} 1292}
1165#endif 1293#endif
1166 1294
… …
1231 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1232 (32 + x + 1), 1360 (32 + x + 1),
1233 (32 + y + 1)); 1361 (32 + y + 1));
1234} 1362}
1235 1363
1236#ifdef USING_W11LIB
1237void
1238rxvt_W11_process_x_event (XEvent *ev)
1239{
1240 rxvt_t *r = rxvt_get_r ();
1241
1242 x_cb (*ev);
1243}
1244#endif
1245
1246/*{{{ process an X event */ 1364/*{{{ process an X event */
1247void 1365void
1248rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1249{ 1367{
1250 dDisp; 1368 make_current ();
1251 1369
1252 SET_R (this); 1370 dLocal (Display *, dpy);
1253 SET_LOCALE (locale);
1254 1371
1255#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1257 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1258 if (hidden_cursor) 1375 return;
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263 1376
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1380 unsigned int unused_mask;
1285 1381
1286 switch (ev.type) 1382 switch (ev.type)
1287 { 1383 {
1288 case KeyPress: 1384 case KeyPress:
1289#if ISO_14755 1385 key_press (ev.xkey);
1290 if (!(iso14755buf & ISO_14755_52))
1291#endif
1292 lookup_key (ev.xkey);
1293
1294 break; 1386 break;
1295 1387
1296 case KeyRelease: 1388 case KeyRelease:
1297 { 1389 key_release (ev.xkey);
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1299 KeySym ks;
1300
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif
1303
1304#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support
1306 if (iso14755buf)
1307 if (iso14755buf & ISO_14755_52)
1308 {
1309# if ENABLE_OVERLAY
1310 scr_overlay_off ();
1311# endif
1312# if ISO_14755
1313 // iso14755 part 5.2 handling: release time
1314 // first: controls
1315 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f)))
1318 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1320 commit_iso14755 ();
1321 return; // case-break;
1322 }
1323
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks)
1326 {
1327 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 ();
1329 return; // case-break;
1330 }
1331
1332 scr_bell ();
1333# endif
1334 iso14755buf = 0;
1335 break;
1336 }
1337 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1338 {
1339# if ENABLE_OVERLAY
1340 scr_overlay_off ();
1341# endif
1342 if (iso14755buf & ISO_14755_51)
1343 commit_iso14755 ();
1344#if ISO_14755
1345 else if (iso14755buf & ISO_14755_STARTED)
1346 {
1347 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1348
1349 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1350 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1351 }
1352# endif
1353 else
1354 iso14755buf = 0;
1355 }
1356#endif
1357
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R)
1362 mouse_slip_wheel_speed = 0;
1363#endif
1364 break; 1390 break;
1365 }
1366 1391
1367 case ButtonPress: 1392 case ButtonPress:
1368 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1369 break; 1394 break;
1370 1395
… …
1372 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1373 break; 1398 break;
1374 1399
1375 case ClientMessage: 1400 case ClientMessage:
1376 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1378 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1380 destroy (); 1411 destroy ();
1412 }
1381#if ENABLE_EWMH 1413#if ENABLE_EWMH
1382 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1383 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1386#endif 1429#endif
1387 } 1430 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1397#ifdef OFFIX_DND
1398 /* OffiX Dnd (drag 'n' drop) protocol */
1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1400 && (ev.xclient.data.l[0] == DndFile
1401 || ev.xclient.data.l[0] == DndDir
1402 || ev.xclient.data.l[0] == DndLink))
1403 {
1404 /* Get Dnd data */
1405 Atom ActualType;
1406 int ActualFormat;
1407 unsigned char *data;
1408 unsigned long Size, RemainingBytes;
1409
1410 XGetWindowProperty (disp, display->root,
1411 xa[XA_DNDSELECTION],
1412 0L, 1000000L,
1413 False, AnyPropertyType,
1414 &ActualType, &ActualFormat,
1415 &Size, &RemainingBytes,
1416 &data);
1417 set_string_property (XA_CUT_BUFFER0, data);
1418 XFree (data);
1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1421 }
1422#endif /* OFFIX_DND */
1423 break; 1431 break;
1424 1432
1425 case MappingNotify: 1433 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1435 break;
… …
1450 break; 1458 break;
1451 } 1459 }
1452 break; 1460 break;
1453 1461
1454 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1466 focus_in ();
1456 break; 1467 break;
1457 1468
1458 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1473 focus_out ();
1460 break; 1474 break;
1461 1475
1462 case ConfigureNotify: 1476 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1464 { 1478 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1480 ;
1467 1481
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1483 {
1470 seen_resize = 1; 1484 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1486 }
1473 1487
1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1475 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1476 check_our_parents (); 1492 check_our_parents ();
1477#endif 1493#endif
1478 } 1494 }
1479 break; 1495 break;
1480 1496
1481 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1483 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1484 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1485 1502
1486 break; 1503 break;
1487 1504
1488 case SelectionClear: 1505 case SelectionClear:
1489 selection_clear (); 1506 selection_clear ();
… …
1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1495 break; 1512 break;
1496 1513
1497 case SelectionRequest: 1514 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1516 break;
1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 break; 1524 break;
1500 1525
1501 case UnmapNotify: 1526 case UnmapNotify:
1502 mapped = 0; 1527 mapped = 0;
1503#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1505#endif 1530#endif
1506 break; 1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507
1508 case MapNotify:
1509 mapped = 1;
1510#ifdef TEXT_BLINK
1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1512#endif
1513 break; 1532 break;
1514 1533
1515#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1516 case ReparentNotify: 1535 case ReparentNotify:
1517 rootwin_cb (ev); 1536 rootwin_cb (ev);
… …
1523 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1524 { 1543 {
1525 do 1544 do
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1548
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1550
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1535 1554
1536 scr_refresh (refresh_type); 1555 want_refresh = 1;
1537 } 1556 }
1538 else 1557 else
1539 { 1558 {
1540 XEvent unused_event; 1559 XEvent unused_event;
1541 1560
1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1543 ; 1562 ;
1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1545 ; 1564 ;
1546 1565
1547 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1548 { 1567 {
1549 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1550 scrollbar_show (0); 1569 scrollbar_show (0);
1551 } 1570 }
1552#ifdef MENUBAR
1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1554 menubar_expose ();
1555#endif
1556 1571
1557#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1560#endif 1575#endif
1561 } 1576 }
1562 break; 1577 break;
1563 1578
1564 case MotionNotify: 1579 case MotionNotify:
1565#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1581 if (hidden_pointer)
1567 pointer_unblank (); 1582 pointer_unblank ();
1568#endif 1583#endif
1569#if MENUBAR
1570 if (isMenuBarWindow (ev.xany.window))
1571 {
1572 menubar_control (ev.xbutton);
1573 break;
1574 }
1575#endif
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1585 break;
1578 1586
1579 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1580 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1593 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1595 ;
1585 1596
1586 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1601 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1655#endif 1666#endif
1656 } 1667 }
1657 } 1668 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659 { 1670 {
1660 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1662 ; 1673 ;
1663 1674
1664 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1679 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1681 scrollbar_size ());
1671 scr_refresh (refresh_type); 1682 want_refresh = 1;
1672 refresh_limit = 0; 1683 refresh_limit = 0;
1673 scrollbar_show (1); 1684 scrollbar_show (1);
1674 } 1685 }
1675 break; 1686 break;
1676 } 1687 }
1688
1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1677} 1715}
1678 1716
1679void 1717void
1680rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1681{ 1719{
1682 if (!focus) 1720 if (!focus)
1683 { 1721 {
1684 focus = 1; 1722 focus = 1;
1685 want_refresh = 1; 1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1686#if USE_XIM 1727#if USE_XIM
1687 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1688 { 1729 {
1689 IMSetStatusPosition (); 1730 IMSetPosition ();
1690 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1691 } 1732 }
1692#endif 1733#endif
1693#if CURSOR_BLINK 1734#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696#endif 1737#endif
1697#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1699 { 1740 {
1700 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1701 scr_recolour (); 1742 scr_recolour ();
1702 } 1743 }
1703#endif 1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1704 } 1758 }
1705} 1759}
1706 1760
1707void 1761void
1708rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1710 if (focus) 1764 if (focus)
1711 { 1765 {
1712 focus = 0; 1766 focus = 0;
1713 want_refresh = 1; 1767 want_refresh = 1;
1714 1768
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1770
1715#if ENABLE_FRILLS || ISO_14755 1771#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf)
1773 {
1716 iso14755buf = 0; 1774 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1775# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1776 scr_overlay_off ();
1777# endif
1778 }
1720#endif 1779#endif
1721#if USE_XIM 1780#if USE_XIM
1722 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1724#endif 1783#endif
1725#if CURSOR_BLINK 1784#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1728 hidden_cursor = 0; 1787 hidden_cursor = 0;
1729#endif 1788#endif
1730#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1731 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1735 } 1794 }
1736#endif 1795#endif
1737 } 1796 }
1738} 1797}
1739 1798
1740#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1741void 1813void
1742rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1815{
1744 SET_R (this); 1816 make_current ();
1745 SET_LOCALE (locale);
1746 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1747 switch (ev.type) 1823 switch (ev.type)
1748 { 1824 {
1749 case PropertyNotify: 1825 case PropertyNotify:
1750 /* 1826 /*
1751 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
… …
1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1756 return; 1832 return;
1757 1833
1758 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1759 case ReparentNotify: 1835 case ReparentNotify:
1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1761 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1762 break; 1838 break;
1763 } 1839 }
1840# endif
1764} 1841}
1765#endif 1842#endif
1766 1843
1767void 1844void
1768rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1769{ 1846{
1770 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1771 1848
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1773 if (!bypass_keystate) 1851 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1853
1776 /* 1854 /*
1777 * VT window processing of button press 1855 * VT window processing of button press
1778 */ 1856 */
1779 if (ev.window == vt) 1857 if (ev.window == vt)
1780 { 1858 {
1859 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 return;
1861
1781#if ISO_14755 1862#if ISO_14755
1782 // 5.4 1863 // 5.4
1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1784 { 1865 {
1785 iso14755_54 (ev.x, ev.y); 1866 iso14755_54 (ev.x, ev.y);
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1799 { 1880 {
1800 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1801 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1802 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1803 { 1885 {
1804 /* only report double clicks */ 1886 /* only report double clicks */
1805 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1806 mouse_report (ev); 1888 mouse_report (ev);
… …
1838#else 1920#else
1839 selection.rect = false; 1921 selection.rect = false;
1840#endif 1922#endif
1841 1923
1842 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1926 {
1845 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1847 else 1929 else
1848 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
2013 } 2095 }
2014 2096
2015 break; 2097 break;
2016 } 2098 }
2017 } 2099 }
2100
2018 return; 2101 return;
2019 } 2102 }
2020#if MENUBAR
2021 /*
2022 * Menubar window processing of button press
2023 */
2024 if (isMenuBarWindow (ev.window))
2025 menubar_control (ev);
2026#endif
2027} 2103}
2028 2104
2029void 2105void
2030rxvt_term::button_release (XButtonEvent &ev) 2106rxvt_term::button_release (XButtonEvent &ev)
2031{ 2107{
… …
2037 2113
2038 if (scrollbar_isUpDn ()) 2114 if (scrollbar_isUpDn ())
2039 { 2115 {
2040 scrollBar.setIdle (); 2116 scrollBar.setIdle ();
2041 scrollbar_show (0); 2117 scrollbar_show (0);
2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 refresh_type &= ~SMOOTH_REFRESH;
2044#endif
2045 } 2118 }
2046 2119
2047#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2048 if (sel_scroll_ev.active) 2121 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop(); 2122 sel_scroll_ev.stop();
2050#endif 2123#endif
2051 2124
2052 if (ev.window == vt) 2125 if (ev.window == vt)
2053 { 2126 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2054#if ISO_14755 2130#if ISO_14755
2055 // 5.4 2131 // 5.4
2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2132 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2057 return; 2133 return;
2058#endif 2134#endif
2135
2059 if (reportmode) 2136 if (reportmode)
2060 { 2137 {
2061 /* mouse report from vt window */ 2138 /* mouse report from vt window */
2062 /* don't report release of wheel "buttons" */ 2139 /* don't report release of wheel "buttons" */
2063 if (ev.button >= 4) 2140 if (ev.button >= 4)
… …
2093 { 2170 {
2094 case Button1: 2171 case Button1:
2095 case Button3: 2172 case Button3:
2096 selection_make (ev.time); 2173 selection_make (ev.time);
2097 break; 2174 break;
2175
2098 case Button2: 2176 case Button2:
2099 selection_request (ev.time, ev.x, ev.y); 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2100 break; 2179 break;
2180
2101#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2102 case Button4: 2182 case Button4:
2103 case Button5: 2183 case Button5:
2104 { 2184 {
2105 int i; 2185 int i;
… …
2107 2187
2108 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2109 2189
2110 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2111 i = 1; 2191 i = 1;
2112 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2113 i = nrow - 1; 2193 i = nrow - 1;
2114 else 2194 else
2115 i = 5; 2195 i = 5;
2116 2196
2117# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2127 slip_wheel_ev.start (); 2207 slip_wheel_ev.start ();
2128 } 2208 }
2129 else 2209 else
2130 { 2210 {
2131# endif 2211# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2212 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2213 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2145 } 2215 }
2146#endif 2216# endif
2147 } 2217 }
2148 break; 2218 break;
2149#endif 2219#endif
2150 } 2220 }
2151 } 2221 }
2152#ifdef MENUBAR
2153 else if (isMenuBarWindow (ev.window))
2154 menubar_control (ev);
2155#endif
2156} 2222}
2157 2223
2158#ifdef TRANSPARENT 2224#ifdef TRANSPARENT
2159#if TINTING 2225#if TINTING
2160/* taken from aterm-0.4.2 */ 2226/* taken from aterm-0.4.2 */
2161 2227
2162typedef uint32_t RUINT32T; 2228typedef uint32_t RUINT32T;
2163 2229
2164void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2165{ 2231{
2166 int sh_r, sh_g, sh_b; 2232 int sh_r, sh_g, sh_b;
2167 RUINT32T mask_r, mask_g, mask_b; 2233 RUINT32T mask_r, mask_g, mask_b;
2168 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2169 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2170 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2171 int i; 2237 int i;
2172 2238
2173 Visual *visual = display->visual; 2239 Visual *visual = term->visual;
2174 2240
2175 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2176 2242
2177 /* for convenience */ 2243 /* for convenience */
2178 mask_r = visual->red_mask; 2244 mask_r = visual->red_mask;
… …
2399 Atom atype; 2465 Atom atype;
2400 unsigned char *prop = NULL; 2466 unsigned char *prop = NULL;
2401 Window root, oldp, *list; 2467 Window root, oldp, *list;
2402 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2403 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2404 dDisp;
2405 2470
2406 pchanged = 0; 2471 pchanged = 0;
2407 2472
2408 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2409 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2410 2475
2411 XGetWindowAttributes (disp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2412 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2413 2478
2414 XGetWindowAttributes (disp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2415 2480
2416 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2417 { 2482 {
2418 if (am_transparent) 2483 if (am_transparent)
2419 { 2484 {
2420 pchanged = 1; 2485 pchanged = 1;
2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2422 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2423 } 2488 }
2424 2489
2425 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2426 } 2491 }
2427 2492
2428 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2429 XSync (disp, False); 2494 XSync (dpy, False);
2430 2495
2431 /* 2496 /*
2432 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2433 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2434 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2435 */ 2500 */
2436 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2439 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2440 2505
2441 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2442 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2443 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2444 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2445 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2446 2511
2447 if (!i || prop == NULL 2512 if (!i || prop == NULL
2448#if TINTING 2513#if TINTING
2449 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2450#endif 2515#endif
2451 ) 2516 )
2452 have_pixmap = 0; 2517 have_pixmap = 0;
2453 else 2518 else
2454 { 2519 {
… …
2467 Window cr; 2532 Window cr;
2468 XImage *image; 2533 XImage *image;
2469 GC gc; 2534 GC gc;
2470 XGCValues gcvalue; 2535 XGCValues gcvalue;
2471 2536
2472 XTranslateCoordinates (disp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2473 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2474 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2475 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2476 nx = ny = 0; 2541 nx = ny = 0;
2477 2542
… …
2490 } 2555 }
2491 2556
2492 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2493 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494 2559
2495 XSync (disp, False); 2560 XSync (dpy, False);
2496 allowedxerror = -1; 2561 allowedxerror = -1;
2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2498 2563
2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2500 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2501 allowedxerror = 0; 2566 allowedxerror = 0;
2502 2567
… …
2505 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2506 { 2571 {
2507 pchanged = 1; 2572 pchanged = 1;
2508 if (pixmap != None) 2573 if (pixmap != None)
2509 { 2574 {
2510 XFreePixmap (disp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2511 pixmap = None; 2576 pixmap = None;
2512 } 2577 }
2513 } 2578 }
2514 2579
2515 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2516 } 2581 }
2517 else 2582 else
2518 { 2583 {
2519 if (pixmap != None) 2584 if (pixmap != None)
2520 XFreePixmap (disp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2521 2586
2522#if TINTING 2587#if TINTING
2523 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2524 { 2589 {
2525 unsigned short rm, gm, bm;
2526 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2527 2591
2592 rgba c;
2528 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2593 pix_colors_focused [Color_tint].get (c);
2529 2594
2530 ShadeXImage (display, image, shade, rm, gm, bm); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2531 } 2596 }
2532#endif 2597#endif
2533 2598
2534 pixmap = XCreatePixmap (disp, vt, 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2535 szHint.width, szHint.height, image->depth);
2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2537 XPutImage (disp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2538 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2539 XFreeGC (disp, gc); 2603 XFreeGC (dpy, gc);
2540 XDestroyImage (image); 2604 XDestroyImage (image);
2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2542 XClearWindow (disp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2543 2607
2544 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2545 pchanged = 1; 2609 pchanged = 1;
2546 2610
2547 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2548 } 2612 }
2549 } 2613 }
2550 2614
2551 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2553 else 2617 else
2554 { 2618 {
2555 unsigned int n; 2619 unsigned int n;
2556 /* 2620 /*
2557 * InheritPixmap transparency 2621 * InheritPixmap transparency
2558 */ 2622 */
2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2560 { 2624 {
2561 oldp = parent[i]; 2625 oldp = parent[i];
2562 XQueryTree (disp, parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2563 &parent[i], &list, &n);
2564 XFree (list); 2627 XFree (list);
2565 2628
2566 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2567 { 2630 {
2568 if (oldp != None) 2631 if (oldp != None)
… …
2576 } 2639 }
2577 2640
2578 n = 0; 2641 n = 0;
2579 2642
2580 if (pchanged) 2643 if (pchanged)
2581 {
2582 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2583 { 2645 {
2584 XGetWindowAttributes (disp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2586 { 2649 {
2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2588 break; 2651 break;
2589 } 2652 }
2590 } 2653 }
2591 }
2592 2654
2593 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2594 { 2656 {
2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2597 am_transparent = 0; 2659 am_transparent = 0;
2598 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2599 } 2661 }
2600 else 2662 else
2601 { 2663 {
2602#if WAIT_FOR_WM
2603 /* wait (an arbitrary period) for the WM to do its thing
2604 * needed for fvwm2.2.2 (and before?) */
2605 sleep (1);
2606#endif
2607 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2608 { 2665 {
2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2610 XClearWindow (disp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2611 } 2668 }
2612 2669
2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2614 am_transparent = 1; 2671 am_transparent = 1;
2615 } 2672 }
2616 2673
2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2618 parent[i] = None; 2675 parent[i] = None;
2619 } 2676 }
2620 2677
2621 if (scrollBar.win) 2678 if (scrollBar.win)
2622 { 2679 {
2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2624 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2625 scrollbar_show (0); 2682 scrollbar_show (0);
2626 } 2683 }
2627 2684
2628 if (am_transparent) 2685 if (am_transparent)
… …
2640 2697
2641bool 2698bool
2642rxvt_term::cmd_parse () 2699rxvt_term::cmd_parse ()
2643{ 2700{
2644 bool flag = false; 2701 bool flag = false;
2645 unicode_t ch = NOCHAR; 2702 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2703 char *seq_begin; // remember start of esc-sequence here
2647 2704
2648 for (;;) 2705 for (;;)
2649 { 2706 {
2650 if (ch == NOCHAR) 2707 if (ch == NOCHAR)
2651 { 2708 {
2652 seq_begin = cmdbuf_ptr; 2709 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2710 ch = next_char ();
2654 }
2655 2711
2656 if (ch == NOCHAR) // TODO: improve 2712 if (ch == NOCHAR)
2657 break; 2713 break;
2714 }
2658 2715
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2717 {
2661 if (!seen_input) 2718 if (!seen_input)
2662 { 2719 {
… …
2671 if (seen_resize && cmd_pid) 2728 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2729 kill (-cmd_pid, SIGWINCH);
2673 } 2730 }
2674 2731
2675 /* Read a text string from the input buffer */ 2732 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2733 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2734 bool refreshnow = false;
2678 int nlines = 0; 2735 int nlines = 0;
2679 unicode_t *str = buf; 2736 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2737 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2738
2682 for (;;) 2739 for (;;)
2683 { 2740 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2742 break;
… …
2691 if (ch == C0_LF) 2748 if (ch == C0_LF)
2692 nlines++; 2749 nlines++;
2693 2750
2694 refresh_count++; 2751 refresh_count++;
2695 2752
2696 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2755 {
2699 refreshnow = true; 2756 refreshnow = true;
2757 refresh_count = 0;
2700 ch = NOCHAR; 2758 ch = NOCHAR;
2701 break; 2759 break;
2702 } 2760 }
2703 2761
2704 // scr_add_lines only works for nlines <= nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2763 if (nlines >= nrow - 1)
2706 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2768
2708 nlines = 0; 2769 nlines = 0;
2709 str = buf; 2770 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2771 eol = str + min (ncol, UBUFSIZ);
2711 } 2772 }
2712 2773
… …
2725 2786
2726 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2788 ch = next_char ();
2728 } 2789 }
2729 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2731 2794
2732 /* 2795 /*
2733 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2734 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
2735 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2736 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2737 */ 2800 */
2738 if (refreshnow) 2801 if (refreshnow)
2739 { 2802 {
2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2741 refresh_limit++; 2804 refresh_limit++;
2742 else 2805 else
2743 { 2806 {
2744 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2745 scr_refresh (refresh_type); 2809 scr_refresh ();
2810 want_refresh = 1;
2746 } 2811 }
2747 } 2812 }
2748 2813
2749 } 2814 }
2750 else 2815 else
… …
2765 } 2830 }
2766 2831
2767 return flag; 2832 return flag;
2768} 2833}
2769 2834
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2835// read the next character
2780unicode_t 2836wchar_t
2781rxvt_term::next_char () 2837rxvt_term::next_char () NOTHROW
2782{ 2838{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2839 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2840 {
2785 // assume 7-bit to be ascii ALWAYS 2841 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2843 return *cmdbuf_ptr++;
2788 2844
2789 wchar_t wc; 2845 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2846 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2847
2792 if (len == (size_t)-2) 2848 if (len == (size_t)-2)
2793 { 2849 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2850 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2851 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2852 break;
2797 } 2853 }
2798 2854
2799 if (len == (size_t)-1) 2855 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2856 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2857
2802 // assume wchar == unicode 2858 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2859 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2860 return wc & UNICODE_MASK;
2805 } 2861 }
2806 2862
2807 return NOCHAR; 2863 return NOCHAR;
2808} 2864}
2865
2866// read the next octet
2867uint32_t
2868rxvt_term::next_octet () NOTHROW
2869{
2870 return cmdbuf_ptr < cmdbuf_endp
2871 ? (unsigned char)*cmdbuf_ptr++
2872 : NOCHAR;
2873}
2874
2875static class out_of_input out_of_input;
2809 2876
2810/* rxvt_cmd_getc () - Return next input character */ 2877/* rxvt_cmd_getc () - Return next input character */
2811/* 2878/*
2812 * Return the next input character after first passing any keyboard input 2879 * Return the next input character after first passing any keyboard input
2813 * to the command. 2880 * to the command.
2814 */ 2881 */
2815unicode_t 2882wchar_t
2816rxvt_term::cmd_getc () 2883rxvt_term::cmd_getc () THROW ((class out_of_input))
2817{ 2884{
2818 unicode_t c = next_char (); 2885 wchar_t c = next_char ();
2819 2886
2820 if (c == NOCHAR) 2887 if (c == NOCHAR)
2821 throw out_of_input; 2888 throw out_of_input;
2822 2889
2823 return c; 2890 return c;
2824} 2891}
2825 2892
2826unicode_t 2893uint32_t
2827rxvt_term::cmd_get8 () 2894rxvt_term::cmd_get8 () THROW ((class out_of_input))
2828{ 2895{
2829 unicode_t c = next_octet (); 2896 uint32_t c = next_octet ();
2830 2897
2831 if (c == NOCHAR) 2898 if (c == NOCHAR)
2832 throw out_of_input; 2899 throw out_of_input;
2833 2900
2834 return c; 2901 return c;
… …
2934 case C0_ESC: 3001 case C0_ESC:
2935 process_escape_seq (); 3002 process_escape_seq ();
2936 break; 3003 break;
2937 case C0_ENQ: /* terminal Status */ 3004 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3005 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3006 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3007 else
2942 tt_write ((unsigned char *)VT100_ANS, 3008 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3009 break;
2945 case C0_BEL: /* bell */ 3010 case C0_BEL: /* bell */
2946 scr_bell (); 3011 scr_bell ();
2947 break; 3012 break;
2948 case C0_BS: /* backspace */ 3013 case C0_BS: /* backspace */
… …
3072 scr_charset_set (2, (unsigned int)cmd_getc ()); 3137 scr_charset_set (2, (unsigned int)cmd_getc ());
3073 break; 3138 break;
3074 case '+': 3139 case '+':
3075 scr_charset_set (3, (unsigned int)cmd_getc ()); 3140 scr_charset_set (3, (unsigned int)cmd_getc ());
3076 break; 3141 break;
3077#if ENABLE_FRILLS 3142#if !ENABLE_MINIMAL
3078 case '6': 3143 case '6':
3079 scr_backindex (); 3144 scr_backindex ();
3080 break; 3145 break;
3081#endif 3146#endif
3082 case '7': 3147 case '7':
3083 scr_cursor (SAVE); 3148 scr_cursor (SAVE);
3084 break; 3149 break;
3085 case '8': 3150 case '8':
3086 scr_cursor (RESTORE); 3151 scr_cursor (RESTORE);
3087 break; 3152 break;
3088#if ENABLE_FRILLS 3153#if !ENABLE_MINIMAL
3089 case '9': 3154 case '9':
3090 scr_forwardindex (); 3155 scr_forwardindex ();
3091 break; 3156 break;
3092#endif 3157#endif
3093 case '=': 3158 case '=':
… …
3103 break; 3168 break;
3104 3169
3105 /* 8.3.87: NEXT LINE */ 3170 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3171 case C1_NEL: /* ESC E */
3107 { 3172 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3173 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3174 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3175 }
3111 break; 3176 break;
3112 3177
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3178 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3179 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3201 process_dcs_seq ();
3137 break; 3202 break;
3138 3203
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3204 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3205 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3206 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3207 break; /* steal obsolete ESC [ c */
3144 3208
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3209 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3210 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3211 process_csi_seq ();
… …
3256 ndef = get_byte_array_bit (csi_defaults, i); 3320 ndef = get_byte_array_bit (csi_defaults, i);
3257 for (p = 0; p < nargs; p++) 3321 for (p = 0; p < nargs; p++)
3258 if (arg[p] == -1) 3322 if (arg[p] == -1)
3259 arg[p] = ndef; 3323 arg[p] = ndef;
3260 3324
3261#ifdef DEBUG_CMD
3262 fprintf (stderr, "CSI ");
3263 for (p = 0; p < nargs; p++)
3264 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3265 fprintf (stderr, "%c\n", ch);
3266#endif
3267
3268 /* 3325 /*
3269 * private mode handling 3326 * private mode handling
3270 */ 3327 */
3271 if (priv) 3328 if (priv)
3272 { 3329 {
3273 switch (priv) 3330 switch (priv)
3274 { 3331 {
3275 case '>': 3332 case '>':
3276 if (ch == CSI_DA) /* secondary device attributes */ 3333 if (ch == CSI_DA) /* secondary device attributes */
3277 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3334 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3340 // that we do not support xterm mouse reporting (should be 95 when we do).
3341 //
3342 tt_printf ("\033[>%d;94;0c", 'U');
3343 }
3278 break; 3344 break;
3279 case '?': 3345 case '?':
3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3281 process_terminal_mode (ch, priv, nargs, arg); 3347 process_terminal_mode (ch, priv, nargs, arg);
3282 break; 3348 break;
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3457 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3458 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3459 break;
3394 3460
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3461 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3462 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3463 break;
3399 3464
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3465 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3466 process_sgr_mode (nargs, arg);
3402 break; 3467 break;
… …
3409 break; 3474 break;
3410 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3411 scr_report_position (); 3476 scr_report_position ();
3412 break; 3477 break;
3413 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3414 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3415 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3416 break; 3481 break;
3417 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3419 break; 3484 break;
… …
3486 break; 3551 break;
3487 case CSI_75: 3552 case CSI_75:
3488 scr_cursor (RESTORE); 3553 scr_cursor (RESTORE);
3489 break; 3554 break;
3490 3555
3491#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3492 case CSI_74: 3557 case CSI_74:
3493 process_window_ops (arg, nargs); 3558 process_window_ops (arg, nargs);
3494 break; 3559 break;
3495#endif 3560#endif
3496 3561
… …
3503 break; 3568 break;
3504 } 3569 }
3505} 3570}
3506/*}}} */ 3571/*}}} */
3507 3572
3508#if ENABLE_FRILLS 3573#if !ENABLE_MINIMAL
3509/* ARGSUSED */ 3574/* ARGSUSED */
3510void 3575void
3511rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3576rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3512{ 3577{
3513 int x, y; 3578 int x, y;
3514 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3515 Window wdummy; 3580 Window wdummy;
3516 dDisp; 3581
3582 dLocal (Display *, dpy);
3517 3583
3518 if (nargs == 0) 3584 if (nargs == 0)
3519 return; 3585 return;
3520 3586
3521 switch (args[0]) 3587 switch (args[0])
3522 { 3588 {
3523 /* 3589 /*
3524 * commands 3590 * commands
3525 */ 3591 */
3526 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3527 XMapWindow (disp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3528 break; 3594 break;
3529 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3530 XIconifyWindow (disp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3531 break; 3597 break;
3532 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3533 XMoveWindow (disp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3534 break; 3600 break;
3535 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3537 break; 3603 break;
3538 case 5: /* raise window */ 3604 case 5: /* raise window */
3539 XRaiseWindow (disp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3540 break; 3606 break;
3541 case 6: /* lower window */ 3607 case 6: /* lower window */
3542 XLowerWindow (disp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3543 break; 3609 break;
3544 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3545 scr_touch (true); 3611 scr_touch (true);
3546 break; 3612 break;
3547 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3554 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3555 set_widthheight ((unsigned int)width, 3621 set_widthheight ((unsigned int)width,
3556 (unsigned int) (args[1] * fheight)); 3622 (unsigned int) (args[1] * fheight));
3557 break; 3623 break;
3558 3624
3559
3560 /* 3625 /*
3561 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3562 */ 3627 */
3563 case 11: /* report window state */ 3628 case 11: /* report window state */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3566 break; 3631 break;
3567 case 13: /* report window position */ 3632 case 13: /* report window position */
3568 XGetWindowAttributes (disp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3569 XTranslateCoordinates (disp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3570 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3571 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3572 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3573 break; 3638 break;
3574 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3575 XGetWindowAttributes (disp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3577 break; 3642 break;
3578 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3579 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3580 break; 3645 break;
… …
3582 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3583 break; 3648 break;
3584 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3585 { 3650 {
3586 char *s; 3651 char *s;
3587 XGetIconName (disp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3589 XFree (s); 3654 XFree (s);
3590 } 3655 }
3591 break; 3656 break;
3592 case 21: /* report window title */ 3657 case 21: /* report window title */
3593 { 3658 {
3594 char *s; 3659 char *s;
3595 XFetchName (disp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3597 XFree (s); 3662 XFree (s);
3598 } 3663 }
3599 break; 3664 break;
3600 } 3665 }
3601} 3666}
… …
3604/*----------------------------------------------------------------------*/ 3669/*----------------------------------------------------------------------*/
3605/* 3670/*
3606 * get input up until STRING TERMINATOR (or BEL) 3671 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3672 * ends_how is terminator used. returned input must be free()'d
3608 */ 3673 */
3609unsigned char * 3674char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3675rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3676{
3612 unicode_t ch; 3677 unicode_t ch;
3613 bool seen_esc = false; 3678 bool seen_esc = false;
3614 unsigned int n = 0; 3679 unsigned int n = 0;
… …
3628 seen_esc = true; 3693 seen_esc = true;
3629 continue; 3694 continue;
3630 } 3695 }
3631 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3632 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3633 else if (ch < 0x20) 3700 else if (ch < 0x20)
3634 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3635 3702
3636 seen_esc = false; 3703 seen_esc = false;
3637 3704
3638 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3639 // stop at some sane length 3706 // stop at some sane length
3640 return NULL; 3707 return NULL;
3641 3708
3642 if (ch == C0_SYN)
3643 string[n++] = cmd_get8 ();
3644 else
3645 string[n++] = ch; 3709 string[n++] = ch;
3646 } 3710 }
3647 3711
3648 string[n++] = '\0'; 3712 string[n++] = '\0';
3649 3713
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3715
3652 return (unsigned char *)rxvt_wcstombs (string); 3716 return rxvt_wcstombs (string);
3653} 3717}
3654 3718
3655/*----------------------------------------------------------------------*/ 3719/*----------------------------------------------------------------------*/
3656/* 3720/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3721 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3722 */
3659void 3723void
3660rxvt_term::process_dcs_seq () 3724rxvt_term::process_dcs_seq ()
3661{ 3725{
3662 unsigned char *s; 3726 char *s;
3663 unicode_t eh; 3727 unicode_t eh;
3664 3728
3665 /* 3729 /*
3666 * Not handled yet 3730 * Not handled yet
3667 */ 3731 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3750 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3751 arg = arg * 10 + (ch - '0');
3688 3752
3689 if (ch == ';') 3753 if (ch == ';')
3690 { 3754 {
3691 unsigned char *s = get_to_st (eh); 3755 char *s = get_to_st (eh);
3692 3756
3693 if (s) 3757 if (s)
3694 { 3758 {
3695 process_xterm_seq (arg, (char *)s, eh); 3759 process_xterm_seq (arg, s, eh);
3696 free (s); 3760 free (s);
3697 } 3761 }
3698 } 3762 }
3699} 3763}
3700 3764
3701void 3765void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3767{
3704 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3705 { 3769 {
3706 unsigned short r, g, b; 3770 rgba c;
3707 pix_colors_focused[color].get (display, r, g, b); 3771 pix_colors_focused[color].get (c);
3772
3773#if XFT
3774 if (c.a != rgba::MAX_CC)
3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3776 else
3777#endif
3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3709 } 3779 }
3710 else 3780 else
3711 set_window_color (color, str); 3781 set_window_color (color, str);
3712} 3782}
3713 3783
3714/* 3784/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3786 */
3717void 3787void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3789{
3720 int changed = 0;
3721 int color; 3790 int color;
3722 char *buf, *name; 3791 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3724 int saveop = op; 3793 int saveop = op;
3725 dDisp; 3794
3795 dLocal (Display *, dpy);
3726 3796
3727 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3728 switch (op) 3802 switch (op)
3729 { 3803 {
3730 case XTerm_name: 3804 case XTerm_name:
3731 set_title (str); 3805 set_title (str);
3732 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3820 unsigned long bytes_after;
3747 unsigned char *value = 0; 3821 unsigned char *value = 0;
3748 const char *str = ""; 3822 const char *str = "";
3749 3823
3750 if (prop 3824 if (prop
3751 && XGetWindowProperty (disp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3829 && actual_type != None
3756 && actual_format == 8) 3830 && actual_format == 8)
3757 str = (const char *)(value); 3831 str = (const char *)(value);
3758 3832
3759 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3833 tt_printf ("\033]%d;%s%c", op, str, resp);
3760 3834
3761 XFree (value); 3835 XFree (value);
3762 } 3836 }
3763 else 3837 else
3764 { 3838 {
… …
3768 { 3842 {
3769 *eq = 0; 3843 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3771 } 3845 }
3772 else 3846 else
3773 XDeleteProperty (disp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3848 display->atom (str));
3775 } 3849 }
3776 break; 3850 break;
3777 3851
3778 case XTerm_Color: 3852 case XTerm_Color:
… …
3780 { 3854 {
3781 if ((name = strchr (buf, ';')) == NULL) 3855 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3856 break;
3783 3857
3784 *name++ = '\0'; 3858 *name++ = '\0';
3785 color = atoi (buf); 3859 color = atoi (buf) + minCOLOR;
3786 3860
3787 if (color < 0 || color >= TOTAL_COLORS) 3861 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3862 break;
3789 3863
3790 if ((buf = strchr (name, ';')) != NULL) 3864 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3865 *buf++ = '\0';
3792 3866
3793 if (name[0] == '?' && !name[1]) 3867 process_color_seq (op, color, name, resp);
3794 {
3795 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 }
3799 else
3800 set_window_color (color + minCOLOR, name);
3801 } 3868 }
3802 break; 3869 break;
3803 case XTerm_Color00: 3870 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3871 process_color_seq (op, Color_fg, str, resp);
3805 break; 3872 break;
3806 case XTerm_Color01: 3873 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3874 process_color_seq (op, Color_bg, str, resp);
3808 break; 3875 break;
3809#ifndef NO_CURSORCOLOR 3876#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3877 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3878 process_color_seq (op, Color_cursor, str, resp);
3812 break; 3879 break;
3813#endif 3880#endif
3814 case XTerm_Color_pointer_fg: 3881 case XTerm_Color_pointer_fg:
3815 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3882 process_color_seq (op, Color_pointer_fg, str, resp);
3816 break; 3883 break;
3817 case XTerm_Color_pointer_bg: 3884 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3885 process_color_seq (op, Color_pointer_bg, str, resp);
3819 break; 3886 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3887#ifndef NO_BOLD_UNDERLINE_REVERSE
3821 case XTerm_Color_BD:
3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3823 break;
3824 case XTerm_Color_UL:
3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3826 break;
3827 case XTerm_Color_RV: 3888 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3889 process_color_seq (op, Color_RV, str, resp);
3890 break;
3891 case Rxvt_Color_BD:
3892 case URxvt_Color_BD:
3893 process_color_seq (op, Color_BD, str, resp);
3894 break;
3895 case Rxvt_Color_UL:
3896 case URxvt_Color_UL:
3897 process_color_seq (op, Color_UL, str, resp);
3829 break; 3898 break;
3830 case URxvt_Color_IT: 3899 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3900 process_color_seq (op, Color_IT, str, resp);
3832 break; 3901 break;
3833#endif 3902#endif
3834#if TRANSPARENT && TINTING 3903#if TRANSPARENT && TINTING
3835 case URxvt_Color_tint: 3904 case URxvt_Color_tint:
3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3905 process_color_seq (op, Color_tint, str, resp);
3906
3837 check_our_parents (); 3907 check_our_parents ();
3908
3838 if (am_transparent) 3909 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3910 want_full_refresh = want_refresh = 1;
3840 break;
3841#endif
3842 3911
3912 break;
3913#endif
3914
3843 case XTerm_Pixmap: 3915 case Rxvt_Pixmap:
3916 {
3844 if (*str != ';') 3917 if (*str != ';')
3845 { 3918 {
3846#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3920 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3921 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3922 scr_touch (true);
3923#endif
3851 } 3924 }
3925
3926 int changed = 0;
3927
3852 while ((str = strchr (str, ';')) != NULL) 3928 while ((str = strchr (str, ';')) != NULL)
3853 { 3929 {
3854 str++; 3930 str++;
3855#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3932 changed += scale_pixmap (str);
3857#endif 3933#endif
3858 } 3934 }
3859 3935
3860 if (changed) 3936 if (changed)
3861 { 3937 {
3862#ifdef XPM_BACKGROUND 3938#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3939 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3940 scr_touch (true);
3941#endif
3866 } 3942 }
3943 }
3867 break; 3944 break;
3868 3945
3869 case XTerm_restoreFG: 3946 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3947 set_window_color (Color_fg, str);
3871 break; 3948 break;
3872 case XTerm_restoreBG: 3949 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3950 set_window_color (Color_bg, str);
3874 break; 3951 break;
3875 3952
3876 case XTerm_logfile: 3953 case XTerm_logfile:
3877 // TODO, when secure mode? 3954 // TODO, when secure mode?
3878 break; 3955 break;
3879 3956
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0 3957#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3958 case Rxvt_dumpscreen: /* no error notices */
3888 { 3959 {
3889 int fd; 3960 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3961 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3962 {
3892 scr_dump (fd); 3963 scr_dump (fd);
… …
3903 case URxvt_italicFont: 3974 case URxvt_italicFont:
3904 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3905#endif 3976#endif
3906 if (query) 3977 if (query)
3907 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3909 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3910 resp); 3981 resp);
3911 else 3982 else
3912 { 3983 {
3913 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3916 allocated.push_back ((void *)res); 3987 allocated.push_back ((void *)res);
3917 set_fonts (); 3988 set_fonts ();
3918 } 3989 }
3919 break; 3990 break;
3920 3991
3921#if ENABLE_FRILLS 3992 case URxvt_version:
3993 if (query)
3994 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3995 op,
3996 rs[Rs_name], VERSION[0], VERSION[2],
3997 resp);
3998 break;
3999
4000#if !ENABLE_MINIMAL
3922 case URxvt_locale: 4001 case URxvt_locale:
3923 if (query) 4002 if (query)
3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3925 else 4004 else
3926 { 4005 {
3927 set_locale (str); 4006 set_locale (str);
3928 pty.set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3929 init_xlocale (); 4008 init_xlocale ();
3930 } 4009 }
3931 break; 4010 break;
3932 4011
3933 case URxvt_view_up: 4012 case URxvt_view_up:
3934 case URxvt_view_down: 4013 case URxvt_view_down:
4014 {
3935 int lines = atoi (str); 4015 int lines = atoi (str);
3936 4016
3937 if (lines) 4017 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4019 else
3940 {
3941 scr_erase_savelines (); 4020 scr_erase_savelines ();
3942 } 4021 }
3943 4022
4023 break;
4024#endif
4025
4026#if ENABLE_PERL
4027 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4029 ; // no responses yet
3944 break; 4030 break;
3945#endif 4031#endif
3946 } 4032 }
3947} 4033}
3948/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
3979 return state; 4065 return state;
3980} 4066}
3981 4067
3982/* we're not using priv _yet_ */ 4068/* we're not using priv _yet_ */
3983void 4069void
3984rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4070rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3985{ 4071{
3986 unsigned int i, j; 4072 unsigned int i, j;
3987 int state; 4073 int state;
3988 4074
3989 static const struct 4075 static const struct
… …
4000 { 5, PrivMode_rVideo }, 4086 { 5, PrivMode_rVideo },
4001 { 6, PrivMode_relOrigin }, 4087 { 6, PrivMode_relOrigin },
4002 { 7, PrivMode_Autowrap }, 4088 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode 4089 // 8, bi-directional support mode
4004 { 9, PrivMode_MouseX10 }, 4090 { 9, PrivMode_MouseX10 },
4005#ifdef menuBar_esc
4006 { menuBar_esc, PrivMode_menuBar },
4007#endif
4008 // 18, 19 printing-related 4091 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor }, 4092 { 25, PrivMode_VisibleCursor },
4010#ifdef scrollBar_esc 4093#ifdef scrollBar_esc
4011 { scrollBar_esc, PrivMode_scrollBar }, 4094 { scrollBar_esc, PrivMode_scrollBar },
4012#endif 4095#endif
… …
4059 /* extra handling for values with state unkept */ 4142 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4143 switch (arg[i])
4061 { 4144 {
4062#if ENABLE_STYLES 4145#if ENABLE_STYLES
4063 case 1021: 4146 case 1021:
4064 if (mode) 4147 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4148
4069 want_refresh = 1; 4149 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4150 break;
4072#endif 4151#endif
4073 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4074 case 1049: 4153 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4076 if (mode == 0) 4155 if (mode == 0)
4077 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4078 else if (mode == 1) 4157 else if (mode == 1)
4079 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4080 break; 4159 break;
… …
4095 case 3: /* 80/132 */ 4174 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4175 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4176 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4177 break;
4099 case 4: /* smooth scrolling */ 4178 case 4: /* smooth scrolling */
4100 if (!state) 4179 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4180 break;
4105 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4107 break; 4183 break;
4108 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
4114 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
4115 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
4118 break; 4194 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 4195#ifdef scrollBar_esc
4127 case scrollBar_esc: 4196 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 4197 if (scrollbar_mapping (state))
4129 { 4198 {
4130 resize_all_windows (0, 0, 0); 4199 resize_all_windows (0, 0, 0);
… …
4149#if 0 4218#if 0
4150 case 1001: 4219 case 1001:
4151 break; /* X11 mouse highlighting */ 4220 break; /* X11 mouse highlighting */
4152#endif 4221#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4222 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4223 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4224 break;
4159 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4160 if (state) 4226 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4227 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4231 scr_erase_screen (2);
4169 scr_change_screen (state); 4232 scr_change_screen (state);
4170 break; 4233 break;
4171 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4172 scr_change_screen (state); 4235 scr_change_screen (state);
4173 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 4238 scr_erase_screen (2);
4176 break; 4239 break;
4177 default: 4240 default:
4178 break; 4241 break;
… …
4306 scr_color (Color_bg, Color_bg); 4369 scr_color (Color_bg, Color_bg);
4307 break; 4370 break;
4308 4371
4309 //case 50: // not variable spacing 4372 //case 50: // not variable spacing
4310 4373
4311#ifndef NO_BRIGHTCOLOR 4374#if !ENABLE_MINIMAL
4312 case 90: 4375 case 90:
4313 case 91: /* set bright fg color */ 4376 case 91: /* set bright fg color */
4314 case 92: 4377 case 92:
4315 case 93: 4378 case 93:
4316 case 94: 4379 case 94:
… …
4361 */ 4424 */
4362void 4425void
4363rxvt_term::tt_printf (const char *fmt,...) 4426rxvt_term::tt_printf (const char *fmt,...)
4364{ 4427{
4365 va_list arg_ptr; 4428 va_list arg_ptr;
4366 unsigned char buf[256]; 4429 char buf[256];
4367 4430
4368 va_start (arg_ptr, fmt); 4431 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4432 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4433 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4434 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4439 * or generated by us in response to a query ESC sequence.
4377 */ 4440 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4441const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4442
4380void 4443void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4444rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4445{
4446 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4447 return;
4448
4449 if (pty->pty < 0)
4450 return;
4451
4383 if (v_buflen == 0) 4452 if (v_buflen == 0)
4384 { 4453 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4454 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4386 4455
4387 if ((unsigned int)written == len) 4456 if ((unsigned int)written == len)
4388 return; 4457 return;
4389 4458
4390 data += written; 4459 data += written;
4391 len -= written; 4460 len -= written;
4392 } 4461 }
4393 4462
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4464
4396 memcpy (v_buffer + v_buflen, data, len); 4465 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4466 v_buflen += len;
4398 4467
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4468 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400} 4469}
4401 4470
4402void rxvt_term::pty_write () 4471void rxvt_term::pty_write ()
4403{ 4472{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405 4474
4406 if (written > 0) 4475 if (written > 0)
4407 { 4476 {
4408 v_buflen -= written; 4477 v_buflen -= written;
4409 4478

Diff Legend

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