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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 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.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
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 + 1. / 60.); // refresh at max. 60 hz normally 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
1075#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1076static struct event_handler 1180static struct event_handler
1077{ 1181{
1078 check_watcher cw_yield; 1182 check_watcher yield_ev;
1079 1183
1080 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1081 { 1185 {
1082 sched_yield (); 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
1083 w.stop (); 1194 w.stop ();
1084 } 1195 }
1085 1196
1086 event_handler () 1197 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1088 { 1199 {
1089 } 1200 }
1090} event_handler; 1201} event_handler;
1091#endif 1202#endif
1092 1203
… …
1095{ 1206{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1208
1098 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1099 { 1210 {
1100 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");
1101 n = 0; 1212 n = 0;
1102 } 1213 }
1103 1214
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1107 1218
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1220
1110 if (r > 0) 1221 if (r > 0)
1111 { 1222 {
1112 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1113 return true; 1224 return true;
1114 } 1225 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1227 {
1117#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1118 if (display->is_local) 1229 if (display->is_local)
1119 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1120#endif 1231#endif
1121 } 1232 }
1122 else 1233 else
1123 { 1234 {
1124 pty_ev.stop (); 1235 pty_ev.stop ();
1125 1236
1126 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1127 destroy (); 1238 destroy ();
1128 } 1239 }
1129 1240
1130 return false; 1241 return false;
1131} 1242}
1132 1243
1133void 1244void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1246{
1136 SET_R (this); 1247 make_current ();
1137 SET_LOCALE (locale);
1138 1248
1139 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1251 while (pty_fill ())
1142 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1147} 1257}
1148 1258
1149void 1259void
1150rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1151{ 1261{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1263 recolour_cursor ();
1154 1264
1155#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1266 hidden_pointer = 0;
1157 1267
1158 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif 1270#endif
1161} 1271}
1162 1272
1163#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1164void 1274void
1165rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1166{ 1276{
1167 if (! OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1168 return; 1278 return;
1169 1279
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1281 XFlush (dpy);
1172 1282
1173 hidden_pointer = 1; 1283 hidden_pointer = 1;
1174} 1284}
1175 1285
1176void 1286void
1177rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1178{ 1288{
1179 SET_R (this); 1289 make_current ();
1180 SET_LOCALE (locale);
1181 1290
1182 pointer_blank (); 1291 pointer_blank ();
1183} 1292}
1184#endif 1293#endif
1185 1294
… …
1250 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1251 (32 + x + 1), 1360 (32 + x + 1),
1252 (32 + y + 1)); 1361 (32 + y + 1));
1253} 1362}
1254 1363
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1364/*{{{ process an X event */
1266void 1365void
1267rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1268{ 1367{
1269 dDisp; 1368 make_current ();
1270 1369
1271 SET_R (this); 1370 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1371
1274#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1375 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1376
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1380 unsigned int unused_mask;
1304 1381
1305 switch (ev.type) 1382 switch (ev.type)
1306 { 1383 {
1307 case KeyPress: 1384 case KeyPress:
1308#if ISO_14755 1385 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1386 break;
1314 1387
1315 case KeyRelease: 1388 case KeyRelease:
1316 { 1389 key_release (ev.xkey);
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1390 break;
1384 }
1385 1391
1386 case ButtonPress: 1392 case ButtonPress:
1387 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1388 break; 1394 break;
1389 1395
… …
1391 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1392 break; 1398 break;
1393 1399
1394 case ClientMessage: 1400 case ClientMessage:
1395 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 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 {
1398 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)))
1399 destroy (); 1411 destroy ();
1412 }
1400#if ENABLE_EWMH 1413#if ENABLE_EWMH
1401 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])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &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 }
1405#endif 1429#endif
1406 } 1430 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break; 1431 break;
1443 1432
1444 case MappingNotify: 1433 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1435 break;
… …
1469 break; 1458 break;
1470 } 1459 }
1471 break; 1460 break;
1472 1461
1473 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1466 focus_in ();
1475 break; 1467 break;
1476 1468
1477 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1473 focus_out ();
1479 break; 1474 break;
1480 1475
1481 case ConfigureNotify: 1476 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1483 { 1478 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1480 ;
1486 1481
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1483 {
1489 seen_resize = 1; 1484 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1486 }
1492 1487
1493#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
1494 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1495 check_our_parents (); 1492 check_our_parents ();
1496#endif 1493#endif
1497 } 1494 }
1498 break; 1495 break;
1499 1496
1500 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1502
1505 break; 1503 break;
1506 1504
1507 case SelectionClear: 1505 case SelectionClear:
1508 selection_clear (); 1506 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1512 break;
1515 1513
1516 case SelectionRequest: 1514 case SelectionRequest:
1517 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));
1518 break; 1524 break;
1519 1525
1520 case UnmapNotify: 1526 case UnmapNotify:
1521 mapped = 0; 1527 mapped = 0;
1522#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1524#endif 1530#endif
1525 break; 1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1532 break;
1533 1533
1534#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1535 case ReparentNotify: 1535 case ReparentNotify:
1536 rootwin_cb (ev); 1536 rootwin_cb (ev);
… …
1542 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1543 { 1543 {
1544 do 1544 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1548
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1550
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1554 1554
1555 scr_refresh (refresh_type); 1555 want_refresh = 1;
1556 } 1556 }
1557 else 1557 else
1558 { 1558 {
1559 XEvent unused_event; 1559 XEvent unused_event;
1560 1560
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1562 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1564 ;
1565 1565
1566 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1567 { 1567 {
1568 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1569 scrollbar_show (0); 1569 scrollbar_show (0);
1570 } 1570 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1571
1576#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1579#endif 1575#endif
1580 } 1576 }
1581 break; 1577 break;
1582 1578
1583 case MotionNotify: 1579 case MotionNotify:
1584#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1581 if (hidden_pointer)
1586 pointer_unblank (); 1582 pointer_unblank ();
1587#endif 1583#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1585 break;
1597 1586
1598 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1599 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1593 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1595 ;
1604 1596
1605 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1601 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1674#endif 1666#endif
1675 } 1667 }
1676 } 1668 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1670 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1681 ; 1673 ;
1682 1674
1683 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1679 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1681 scrollbar_size ());
1690 scr_refresh (refresh_type); 1682 want_refresh = 1;
1691 refresh_limit = 0; 1683 refresh_limit = 0;
1692 scrollbar_show (1); 1684 scrollbar_show (1);
1693 } 1685 }
1694 break; 1686 break;
1695 } 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
1696} 1715}
1697 1716
1698void 1717void
1699rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1700{ 1719{
1701 if (!focus) 1720 if (!focus)
1702 { 1721 {
1703 focus = 1; 1722 focus = 1;
1704 want_refresh = 1; 1723 want_refresh = 1;
1705 1724
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1726
1708#if USE_XIM 1727#if USE_XIM
1709 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1710 { 1729 {
1711 IMSetStatusPosition (); 1730 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1713 } 1732 }
1714#endif 1733#endif
1715#if CURSOR_BLINK 1734#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1737#endif
1719#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1721 { 1740 {
1722 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1732 if (focus) 1751 if (focus)
1733 { 1752 {
1734 focus = 0; 1753 focus = 0;
1735 want_refresh = 1; 1754 want_refresh = 1;
1736 1755
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1757
1739#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1759 if (iso14755buf)
1741 { 1760 {
1742 iso14755buf = 0; 1761 iso14755buf = 0;
… …
1748#if USE_XIM 1767#if USE_XIM
1749 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1751#endif 1770#endif
1752#if CURSOR_BLINK 1771#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1755 hidden_cursor = 0; 1774 hidden_cursor = 0;
1756#endif 1775#endif
1757#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1762 } 1781 }
1763#endif 1782#endif
1764 } 1783 }
1765} 1784}
1766 1785
1767#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1768void 1800void
1769rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1802{
1771 SET_R (this); 1803 make_current ();
1772 SET_LOCALE (locale);
1773 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1774 switch (ev.type) 1810 switch (ev.type)
1775 { 1811 {
1776 case PropertyNotify: 1812 case PropertyNotify:
1777 /* 1813 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1783 return; 1819 return;
1784 1820
1785 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1786 case ReparentNotify: 1822 case ReparentNotify:
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1788 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1789 break; 1825 break;
1790 } 1826 }
1827# endif
1791} 1828}
1792#endif 1829#endif
1793 1830
1794void 1831void
1795rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1804 /* 1841 /*
1805 * VT window processing of button press 1842 * VT window processing of button press
1806 */ 1843 */
1807 if (ev.window == vt) 1844 if (ev.window == vt)
1808 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1809#if ISO_14755 1849#if ISO_14755
1810 // 5.4 1850 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1852 {
1813 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1865#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1866 if (ev.button == MEvent.button && clickintime)
1827 { 1867 {
1828 /* same button, within alloted time */ 1868 /* same button, within alloted time */
1829 MEvent.clicks++; 1869 MEvent.clicks++;
1870
1830 if (MEvent.clicks > 1) 1871 if (MEvent.clicks > 1)
1831 { 1872 {
1832 /* only report double clicks */ 1873 /* only report double clicks */
1833 MEvent.clicks = 2; 1874 MEvent.clicks = 2;
1834 mouse_report (ev); 1875 mouse_report (ev);
… …
1854 else 1895 else
1855 { 1896 {
1856 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1858 1899
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1900 switch (ev.button)
1861 { 1901 {
1862 case Button1: 1902 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1907#else
1868 selection.rect = false; 1908 selection.rect = false;
1869#endif 1909#endif
1870 1910
1871 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1913 {
1874 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1876 else 1916 else
1877 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1878 } 1918 }
1879 else 1919 else
1880 { 1920 {
1881 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1922 MEvent.clicks++;
1883 else 1923 else
1884 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1885 1925
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1927 }
1888 1928
1889 MEvent.button = Button1; 1929 MEvent.button = Button1;
1890 break; 1930 break;
1891 1931
1892 case Button3: 1932 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1895 else 1935 else
1896 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1897 1937
1898 MEvent.button = Button3; 1938 MEvent.button = Button3;
1899 break; 1939 break;
1900 } 1940 }
1901 } 1941 }
1902 1942
1903 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1904 return; 1944 return;
1905 } 1945 }
1906 1946
… …
2042 } 2082 }
2043 2083
2044 break; 2084 break;
2045 } 2085 }
2046 } 2086 }
2087
2047 return; 2088 return;
2048 } 2089 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2090}
2057 2091
2058void 2092void
2059rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2060{ 2094{
… …
2066 2100
2067 if (scrollbar_isUpDn ()) 2101 if (scrollbar_isUpDn ())
2068 { 2102 {
2069 scrollBar.setIdle (); 2103 scrollBar.setIdle ();
2070 scrollbar_show (0); 2104 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2105 }
2075 2106
2076#ifdef SELECTION_SCROLLING 2107#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2108 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2079#endif 2110#endif
2080 2111
2081 if (ev.window == vt) 2112 if (ev.window == vt)
2082 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2083#if ISO_14755 2117#if ISO_14755
2084 // 5.4 2118 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2120 return;
2087#endif 2121#endif
2122
2088 if (reportmode) 2123 if (reportmode)
2089 { 2124 {
2090 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2122 { 2157 {
2123 case Button1: 2158 case Button1:
2124 case Button3: 2159 case Button3:
2125 selection_make (ev.time); 2160 selection_make (ev.time);
2126 break; 2161 break;
2162
2127 case Button2: 2163 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2166 break;
2167
2130#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2131 case Button4: 2169 case Button4:
2132 case Button5: 2170 case Button5:
2133 { 2171 {
2134 int i; 2172 int i;
… …
2136 2174
2137 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2138 2176
2139 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2140 i = 1; 2178 i = 1;
2141 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1; 2180 i = nrow - 1;
2143 else 2181 else
2144 i = 5; 2182 i = 5;
2145 2183
2146# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2156 slip_wheel_ev.start (); 2194 slip_wheel_ev.start ();
2157 } 2195 }
2158 else 2196 else
2159 { 2197 {
2160# endif 2198# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2199 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2200 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2174 } 2202 }
2175#endif 2203# endif
2176 } 2204 }
2177 break; 2205 break;
2178#endif 2206#endif
2179 } 2207 }
2180 } 2208 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2209}
2186 2210
2187#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2188#if TINTING 2212#if TINTING
2189/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2190 2214
2191typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2192 2216
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{ 2218{
2195 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i; 2224 int i;
2201 2225
2202 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2203 2227
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205 2229
2206 /* for convenience */ 2230 /* for convenience */
2207 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2428 Atom atype; 2452 Atom atype;
2429 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2430 Window root, oldp, *list; 2454 Window root, oldp, *list;
2431 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434 2457
2435 pchanged = 0; 2458 pchanged = 0;
2436 2459
2437 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2438 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2439 2462
2440 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2442 2465
2443 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2444 2467
2445 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2446 { 2469 {
2447 if (am_transparent) 2470 if (am_transparent)
2448 { 2471 {
2449 pchanged = 1; 2472 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2452 } 2475 }
2453 2476
2454 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2455 } 2478 }
2456 2479
2457 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False); 2481 XSync (dpy, False);
2459 2482
2460 /* 2483 /*
2461 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2464 */ 2487 */
2465 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2469 2492
2470 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2475 2498
2476 if (!i || prop == NULL 2499 if (!i || prop == NULL
2477#if TINTING 2500#if TINTING
2478 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2479#endif 2502#endif
2480 ) 2503 )
2481 have_pixmap = 0; 2504 have_pixmap = 0;
2482 else 2505 else
2483 { 2506 {
… …
2496 Window cr; 2519 Window cr;
2497 XImage *image; 2520 XImage *image;
2498 GC gc; 2521 GC gc;
2499 XGCValues gcvalue; 2522 XGCValues gcvalue;
2500 2523
2501 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2505 nx = ny = 0; 2528 nx = ny = 0;
2506 2529
… …
2519 } 2542 }
2520 2543
2521 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523 2546
2524 XSync (disp, False); 2547 XSync (dpy, False);
2525 allowedxerror = -1; 2548 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527 2550
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2530 allowedxerror = 0; 2553 allowedxerror = 0;
2531 2554
… …
2534 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2535 { 2558 {
2536 pchanged = 1; 2559 pchanged = 1;
2537 if (pixmap != None) 2560 if (pixmap != None)
2538 { 2561 {
2539 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2540 pixmap = None; 2563 pixmap = None;
2541 } 2564 }
2542 } 2565 }
2543 2566
2544 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2545 } 2568 }
2546 else 2569 else
2547 { 2570 {
2548 if (pixmap != None) 2571 if (pixmap != None)
2549 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2550 2573
2551#if TINTING 2574#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2553 { 2576 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556 2578
2579 rgba c;
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2558 2581
2559 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2560 } 2583 }
2561#endif 2584#endif
2562 2585
2563 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2569 XDestroyImage (image); 2591 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2572 2594
2573 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1; 2596 pchanged = 1;
2575 2597
2576 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2577 } 2599 }
2578 } 2600 }
2579 2601
2580 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2582 else 2604 else
2583 { 2605 {
2584 unsigned int n; 2606 unsigned int n;
2585 /* 2607 /*
2586 * InheritPixmap transparency 2608 * InheritPixmap transparency
2587 */ 2609 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 { 2611 {
2590 oldp = parent[i]; 2612 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2592 &parent[i], &list, &n);
2593 XFree (list); 2614 XFree (list);
2594 2615
2595 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2596 { 2617 {
2597 if (oldp != None) 2618 if (oldp != None)
… …
2605 } 2626 }
2606 2627
2607 n = 0; 2628 n = 0;
2608 2629
2609 if (pchanged) 2630 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2612 { 2632 {
2613 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 { 2636 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break; 2638 break;
2618 } 2639 }
2619 } 2640 }
2620 }
2621 2641
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2623 { 2643 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0; 2646 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2628 } 2648 }
2629 else 2649 else
2630 { 2650 {
2631#if WAIT_FOR_WM
2632 /* wait (an arbitrary period) for the WM to do its thing
2633 * needed for fvwm2.2.2 (and before?) */
2634 sleep (1);
2635#endif
2636 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2637 { 2652 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2640 } 2655 }
2641 2656
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2643 am_transparent = 1; 2658 am_transparent = 1;
2644 } 2659 }
2645 2660
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None; 2662 parent[i] = None;
2648 } 2663 }
2649 2664
2650 if (scrollBar.win) 2665 if (scrollBar.win)
2651 { 2666 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2654 scrollbar_show (0); 2669 scrollbar_show (0);
2655 } 2670 }
2656 2671
2657 if (am_transparent) 2672 if (am_transparent)
… …
2669 2684
2670bool 2685bool
2671rxvt_term::cmd_parse () 2686rxvt_term::cmd_parse ()
2672{ 2687{
2673 bool flag = false; 2688 bool flag = false;
2674 unicode_t ch = NOCHAR; 2689 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2690 char *seq_begin; // remember start of esc-sequence here
2676 2691
2677 for (;;) 2692 for (;;)
2678 { 2693 {
2679 if (ch == NOCHAR) 2694 if (ch == NOCHAR)
2680 { 2695 {
2681 seq_begin = cmdbuf_ptr; 2696 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2697 ch = next_char ();
2683 }
2684 2698
2685 if (ch == NOCHAR) // TODO: improve 2699 if (ch == NOCHAR)
2686 break; 2700 break;
2701 }
2687 2702
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2703 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2704 {
2690 if (!seen_input) 2705 if (!seen_input)
2691 { 2706 {
… …
2700 if (seen_resize && cmd_pid) 2715 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2716 kill (-cmd_pid, SIGWINCH);
2702 } 2717 }
2703 2718
2704 /* Read a text string from the input buffer */ 2719 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2720 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2721 bool refreshnow = false;
2707 int nlines = 0; 2722 int nlines = 0;
2708 unicode_t *str = buf; 2723 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2724 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2725
2711 for (;;) 2726 for (;;)
2712 { 2727 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2728 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2729 break;
… …
2720 if (ch == C0_LF) 2735 if (ch == C0_LF)
2721 nlines++; 2736 nlines++;
2722 2737
2723 refresh_count++; 2738 refresh_count++;
2724 2739
2725 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2726 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2727 { 2742 {
2728 refreshnow = true; 2743 refreshnow = true;
2729 refresh_count = 0; 2744 refresh_count = 0;
2730 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2732 } 2747 }
2733 2748
2734 // scr_add_lines only works for nlines <= nrow - 1. 2749 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2750 if (nlines >= nrow - 1)
2736 { 2751 {
2752 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2753 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2754 scr_add_lines (buf, str - buf, nlines);
2755
2738 nlines = 0; 2756 nlines = 0;
2739 str = buf; 2757 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2758 eol = str + min (ncol, UBUFSIZ);
2741 } 2759 }
2742 2760
… …
2755 2773
2756 seq_begin = cmdbuf_ptr; 2774 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2775 ch = next_char ();
2758 } 2776 }
2759 2777
2778 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2780 scr_add_lines (buf, str - buf, nlines);
2761 2781
2762 /* 2782 /*
2763 * If there have been a lot of new lines, then update the screen 2783 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2784 * What the heck I'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2766 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2767 */ 2787 */
2768 if (refreshnow) 2788 if (refreshnow)
2769 { 2789 {
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++; 2791 refresh_limit++;
2772 else 2792 else
2773 { 2793 {
2774 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2775 scr_refresh (refresh_type); 2796 scr_refresh ();
2776 flush_ev.stop (); 2797 want_refresh = 1;
2777 } 2798 }
2778 } 2799 }
2779 2800
2780 } 2801 }
2781 else 2802 else
… …
2796 } 2817 }
2797 2818
2798 return flag; 2819 return flag;
2799} 2820}
2800 2821
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2822// read the next character
2811unicode_t 2823wchar_t
2812rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2813{ 2825{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2827 {
2816 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2830 return *cmdbuf_ptr++;
2819 2831
2820 wchar_t wc; 2832 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2833 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2834
2823 if (len == (size_t)-2) 2835 if (len == (size_t)-2)
2824 { 2836 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2837 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2838 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2839 break;
2828 } 2840 }
2829 2841
2830 if (len == (size_t)-1) 2842 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2843 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2844
2833 // assume wchar == unicode 2845 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2846 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2847 return wc & UNICODE_MASK;
2836 } 2848 }
2837 2849
2838 return NOCHAR; 2850 return NOCHAR;
2839} 2851}
2852
2853// read the next octet
2854uint32_t
2855rxvt_term::next_octet () NOTHROW
2856{
2857 return cmdbuf_ptr < cmdbuf_endp
2858 ? (unsigned char)*cmdbuf_ptr++
2859 : NOCHAR;
2860}
2861
2862static class out_of_input out_of_input;
2840 2863
2841/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2842/* 2865/*
2843 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2844 * to the command. 2867 * to the command.
2845 */ 2868 */
2846unicode_t 2869wchar_t
2847rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2871{
2849 unicode_t c = next_char (); 2872 wchar_t c = next_char ();
2850 2873
2851 if (c == NOCHAR) 2874 if (c == NOCHAR)
2852 throw out_of_input; 2875 throw out_of_input;
2853 2876
2854 return c; 2877 return c;
2855} 2878}
2856 2879
2857unicode_t 2880uint32_t
2858rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2882{
2860 unicode_t c = next_octet (); 2883 uint32_t c = next_octet ();
2861 2884
2862 if (c == NOCHAR) 2885 if (c == NOCHAR)
2863 throw out_of_input; 2886 throw out_of_input;
2864 2887
2865 return c; 2888 return c;
… …
2965 case C0_ESC: 2988 case C0_ESC:
2966 process_escape_seq (); 2989 process_escape_seq ();
2967 break; 2990 break;
2968 case C0_ENQ: /* terminal Status */ 2991 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2992 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2993 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2994 else
2973 tt_write ((unsigned char *)VT100_ANS, 2995 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2996 break;
2976 case C0_BEL: /* bell */ 2997 case C0_BEL: /* bell */
2977 scr_bell (); 2998 scr_bell ();
2978 break; 2999 break;
2979 case C0_BS: /* backspace */ 3000 case C0_BS: /* backspace */
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 3125 break;
3105 case '+': 3126 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 3128 break;
3108#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3109 case '6': 3130 case '6':
3110 scr_backindex (); 3131 scr_backindex ();
3111 break; 3132 break;
3112#endif 3133#endif
3113 case '7': 3134 case '7':
3114 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3115 break; 3136 break;
3116 case '8': 3137 case '8':
3117 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3118 break; 3139 break;
3119#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3120 case '9': 3141 case '9':
3121 scr_forwardindex (); 3142 scr_forwardindex ();
3122 break; 3143 break;
3123#endif 3144#endif
3124 case '=': 3145 case '=':
… …
3134 break; 3155 break;
3135 3156
3136 /* 8.3.87: NEXT LINE */ 3157 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3158 case C1_NEL: /* ESC E */
3138 { 3159 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3160 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3161 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3162 }
3142 break; 3163 break;
3143 3164
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3165 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3166 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3188 process_dcs_seq ();
3168 break; 3189 break;
3169 3190
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3191 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3192 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3193 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3194 break; /* steal obsolete ESC [ c */
3175 3195
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3196 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3197 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3198 process_csi_seq ();
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 3309 if (arg[p] == -1)
3290 arg[p] = ndef; 3310 arg[p] = ndef;
3291 3311
3292#ifdef DEBUG_CMD
3293 fprintf (stderr, "CSI ");
3294 for (p = 0; p < nargs; p++)
3295 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3296 fprintf (stderr, "%c\n", ch);
3297#endif
3298
3299 /* 3312 /*
3300 * private mode handling 3313 * private mode handling
3301 */ 3314 */
3302 if (priv) 3315 if (priv)
3303 { 3316 {
3304 switch (priv) 3317 switch (priv)
3305 { 3318 {
3306 case '>': 3319 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3309 break; 3331 break;
3310 case '?': 3332 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 3335 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3444 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3445 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3446 break;
3425 3447
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3448 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3449 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3450 break;
3430 3451
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3452 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3453 process_sgr_mode (nargs, arg);
3433 break; 3454 break;
… …
3440 break; 3461 break;
3441 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3442 scr_report_position (); 3463 scr_report_position ();
3443 break; 3464 break;
3444 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 3468 break;
3448 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 3471 break;
… …
3517 break; 3538 break;
3518 case CSI_75: 3539 case CSI_75:
3519 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3520 break; 3541 break;
3521 3542
3522#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3523 case CSI_74: 3544 case CSI_74:
3524 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3525 break; 3546 break;
3526#endif 3547#endif
3527 3548
… …
3534 break; 3555 break;
3535 } 3556 }
3536} 3557}
3537/*}}} */ 3558/*}}} */
3538 3559
3539#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3561/* ARGSUSED */
3541void 3562void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3564{
3544 int x, y; 3565 int x, y;
3545 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3546 Window wdummy; 3567 Window wdummy;
3547 dDisp; 3568
3569 dLocal (Display *, dpy);
3548 3570
3549 if (nargs == 0) 3571 if (nargs == 0)
3550 return; 3572 return;
3551 3573
3552 switch (args[0]) 3574 switch (args[0])
3553 { 3575 {
3554 /* 3576 /*
3555 * commands 3577 * commands
3556 */ 3578 */
3557 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3559 break; 3581 break;
3560 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3584 break;
3563 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3587 break;
3566 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3590 break;
3569 case 5: /* raise window */ 3591 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3571 break; 3593 break;
3572 case 6: /* lower window */ 3594 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3574 break; 3596 break;
3575 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3576 scr_touch (true); 3598 scr_touch (true);
3577 break; 3599 break;
3578 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3588 break; 3610 break;
3589 3611
3590
3591 /* 3612 /*
3592 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3593 */ 3614 */
3594 case 11: /* report window state */ 3615 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3618 break;
3598 case 13: /* report window position */ 3619 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3625 break;
3605 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3629 break;
3609 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3632 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3635 break;
3615 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3616 { 3637 {
3617 char *s; 3638 char *s;
3618 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3641 XFree (s);
3621 } 3642 }
3622 break; 3643 break;
3623 case 21: /* report window title */ 3644 case 21: /* report window title */
3624 { 3645 {
3625 char *s; 3646 char *s;
3626 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3649 XFree (s);
3629 } 3650 }
3630 break; 3651 break;
3631 } 3652 }
3632} 3653}
… …
3635/*----------------------------------------------------------------------*/ 3656/*----------------------------------------------------------------------*/
3636/* 3657/*
3637 * get input up until STRING TERMINATOR (or BEL) 3658 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3659 * ends_how is terminator used. returned input must be free()'d
3639 */ 3660 */
3640unsigned char * 3661char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3662rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3663{
3643 unicode_t ch; 3664 unicode_t ch;
3644 bool seen_esc = false; 3665 bool seen_esc = false;
3645 unsigned int n = 0; 3666 unsigned int n = 0;
… …
3659 seen_esc = true; 3680 seen_esc = true;
3660 continue; 3681 continue;
3661 } 3682 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3687 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3666 3689
3667 seen_esc = false; 3690 seen_esc = false;
3668 3691
3669 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3693 // stop at some sane length
3671 return NULL; 3694 return NULL;
3672 3695
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3696 string[n++] = ch;
3677 } 3697 }
3678 3698
3679 string[n++] = '\0'; 3699 string[n++] = '\0';
3680 3700
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3702
3683 return (unsigned char *)rxvt_wcstombs (string); 3703 return rxvt_wcstombs (string);
3684} 3704}
3685 3705
3686/*----------------------------------------------------------------------*/ 3706/*----------------------------------------------------------------------*/
3687/* 3707/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3708 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3709 */
3690void 3710void
3691rxvt_term::process_dcs_seq () 3711rxvt_term::process_dcs_seq ()
3692{ 3712{
3693 unsigned char *s; 3713 char *s;
3694 unicode_t eh; 3714 unicode_t eh;
3695 3715
3696 /* 3716 /*
3697 * Not handled yet 3717 * Not handled yet
3698 */ 3718 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3737 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3738 arg = arg * 10 + (ch - '0');
3719 3739
3720 if (ch == ';') 3740 if (ch == ';')
3721 { 3741 {
3722 unsigned char *s = get_to_st (eh); 3742 char *s = get_to_st (eh);
3723 3743
3724 if (s) 3744 if (s)
3725 { 3745 {
3726 process_xterm_seq (arg, (char *)s, eh); 3746 process_xterm_seq (arg, s, eh);
3727 free (s); 3747 free (s);
3728 } 3748 }
3729 } 3749 }
3730} 3750}
3731 3751
3732void 3752void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3754{
3735 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3736 { 3756 {
3737 unsigned short r, g, b; 3757 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3766 }
3741 else 3767 else
3742 set_window_color (color, str); 3768 set_window_color (color, str);
3743} 3769}
3744 3770
3745/* 3771/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3773 */
3748void 3774void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3776{
3751 int changed = 0;
3752 int color; 3777 int color;
3753 char *buf, *name; 3778 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3780 int saveop = op;
3756 dDisp; 3781
3782 dLocal (Display *, dpy);
3757 3783
3758 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3759 switch (op) 3789 switch (op)
3760 { 3790 {
3761 case XTerm_name: 3791 case XTerm_name:
3762 set_title (str); 3792 set_title (str);
3763 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3807 unsigned long bytes_after;
3778 unsigned char *value = 0; 3808 unsigned char *value = 0;
3779 const char *str = ""; 3809 const char *str = "";
3780 3810
3781 if (prop 3811 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3816 && actual_type != None
3787 && actual_format == 8) 3817 && actual_format == 8)
3788 str = (const char *)(value); 3818 str = (const char *)(value);
3789 3819
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3821
3792 XFree (value); 3822 XFree (value);
3793 } 3823 }
3794 else 3824 else
3795 { 3825 {
… …
3799 { 3829 {
3800 *eq = 0; 3830 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3802 } 3832 }
3803 else 3833 else
3804 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3835 display->atom (str));
3806 } 3836 }
3807 break; 3837 break;
3808 3838
3809 case XTerm_Color: 3839 case XTerm_Color:
… …
3811 { 3841 {
3812 if ((name = strchr (buf, ';')) == NULL) 3842 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3843 break;
3814 3844
3815 *name++ = '\0'; 3845 *name++ = '\0';
3816 color = atoi (buf); 3846 color = atoi (buf) + minCOLOR;
3817 3847
3818 if (color < 0 || color >= TOTAL_COLORS) 3848 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3849 break;
3820 3850
3821 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3852 *buf++ = '\0';
3823 3853
3824 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3855 }
3833 break; 3856 break;
3834 case XTerm_Color00: 3857 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3836 break; 3859 break;
3837 case XTerm_Color01: 3860 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3839 break; 3862 break;
3840#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3866 break;
3844#endif 3867#endif
3845 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3870 break;
3848 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3873 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3877 break;
3878 case Rxvt_Color_BD:
3879 case URxvt_Color_BD:
3880 process_color_seq (op, Color_BD, str, resp);
3881 break;
3882 case Rxvt_Color_UL:
3883 case URxvt_Color_UL:
3884 process_color_seq (op, Color_UL, str, resp);
3860 break; 3885 break;
3861 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3863 break; 3888 break;
3864#endif 3889#endif
3865#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3868 check_our_parents (); 3894 check_our_parents ();
3895
3869 if (am_transparent) 3896 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3898
3899 break;
3900#endif
3901
3874 case XTerm_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3875 if (*str != ';') 3904 if (*str != ';')
3876 { 3905 {
3877#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3909 scr_touch (true);
3910#endif
3882 } 3911 }
3912
3913 int changed = 0;
3914
3883 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3884 { 3916 {
3885 str++; 3917 str++;
3886#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3888#endif 3920#endif
3889 } 3921 }
3890 3922
3891 if (changed) 3923 if (changed)
3892 { 3924 {
3893#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3926 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3927 scr_touch (true);
3928#endif
3897 } 3929 }
3930 }
3898 break; 3931 break;
3899 3932
3900 case XTerm_restoreFG: 3933 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3902 break; 3935 break;
3903 case XTerm_restoreBG: 3936 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3937 set_window_color (Color_bg, str);
3905 break; 3938 break;
3906 3939
3907 case XTerm_logfile: 3940 case XTerm_logfile:
3908 // TODO, when secure mode? 3941 // TODO, when secure mode?
3909 break; 3942 break;
3910 3943
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3944#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3945 case Rxvt_dumpscreen: /* no error notices */
3919 { 3946 {
3920 int fd; 3947 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3948 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3949 {
3923 scr_dump (fd); 3950 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3961 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3936#endif 3963#endif
3937 if (query) 3964 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3968 resp);
3942 else 3969 else
3943 { 3970 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3948 set_fonts (); 3975 set_fonts ();
3949 } 3976 }
3950 break; 3977 break;
3951 3978
3952#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3988 case URxvt_locale:
3954 if (query) 3989 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3991 else
3957 { 3992 {
3958 set_locale (str); 3993 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3995 init_xlocale ();
3961 } 3996 }
3962 break; 3997 break;
3963 3998
3964 case URxvt_view_up: 3999 case URxvt_view_up:
3965 case URxvt_view_down: 4000 case URxvt_view_down:
4001 {
3966 int lines = atoi (str); 4002 int lines = atoi (str);
3967 4003
3968 if (lines) 4004 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 4005 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 4006 else
3971 {
3972 scr_erase_savelines (); 4007 scr_erase_savelines ();
3973 } 4008 }
3974 4009
4010 break;
4011#endif
4012
4013#if ENABLE_PERL
4014 case URxvt_perl:
4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4016 ; // no responses yet
3975 break; 4017 break;
3976#endif 4018#endif
3977 } 4019 }
3978} 4020}
3979/*----------------------------------------------------------------------*/ 4021/*----------------------------------------------------------------------*/
… …
4010 return state; 4052 return state;
4011} 4053}
4012 4054
4013/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4014void 4056void
4015rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4016{ 4058{
4017 unsigned int i, j; 4059 unsigned int i, j;
4018 int state; 4060 int state;
4019 4061
4020 static const struct 4062 static const struct
… …
4031 { 5, PrivMode_rVideo }, 4073 { 5, PrivMode_rVideo },
4032 { 6, PrivMode_relOrigin }, 4074 { 6, PrivMode_relOrigin },
4033 { 7, PrivMode_Autowrap }, 4075 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode 4076 // 8, bi-directional support mode
4035 { 9, PrivMode_MouseX10 }, 4077 { 9, PrivMode_MouseX10 },
4036#ifdef menuBar_esc
4037 { menuBar_esc, PrivMode_menuBar },
4038#endif
4039 // 18, 19 printing-related 4078 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor }, 4079 { 25, PrivMode_VisibleCursor },
4041#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
4042 { scrollBar_esc, PrivMode_scrollBar }, 4081 { scrollBar_esc, PrivMode_scrollBar },
4043#endif 4082#endif
… …
4090 /* extra handling for values with state unkept */ 4129 /* extra handling for values with state unkept */
4091 switch (arg[i]) 4130 switch (arg[i])
4092 { 4131 {
4093#if ENABLE_STYLES 4132#if ENABLE_STYLES
4094 case 1021: 4133 case 1021:
4095 if (mode) 4134 set_option (Opt_intensityStyles, mode);
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099 4135
4100 scr_touch (true); 4136 scr_touch (true);
4101 break; 4137 break;
4102#endif 4138#endif
4103 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4104 case 1049: 4140 case 1049:
4105 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4106 if (mode == 0) 4142 if (mode == 0)
4107 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4108 else if (mode == 1) 4144 else if (mode == 1)
4109 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4110 break; 4146 break;
… …
4125 case 3: /* 80/132 */ 4161 case 3: /* 80/132 */
4126 if (priv_modes & PrivMode_132OK) 4162 if (priv_modes & PrivMode_132OK)
4127 set_widthheight (((state ? 132 : 80) * fwidth), height); 4163 set_widthheight (((state ? 132 : 80) * fwidth), height);
4128 break; 4164 break;
4129 case 4: /* smooth scrolling */ 4165 case 4: /* smooth scrolling */
4130 if (!state) 4166 set_option (Opt_jumpScroll, !state);
4131 SET_OPTION (Opt_jumpScroll);
4132 else
4133 CLR_OPTION (Opt_jumpScroll);
4134 break; 4167 break;
4135 case 5: /* reverse video */ 4168 case 5: /* reverse video */
4136 scr_rvideo_mode (state); 4169 scr_rvideo_mode (state);
4137 break; 4170 break;
4138 case 6: /* relative/absolute origins */ 4171 case 6: /* relative/absolute origins */
… …
4144 /* case 8: - auto repeat, can't do on a per window basis */ 4177 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 4178 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 4179 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 4180 priv_modes &= ~PrivMode_MouseX11;
4148 break; 4181 break;
4149#ifdef menuBar_esc
4150 case menuBar_esc:
4151#ifdef MENUBAR
4152 map_menuBar (state);
4153#endif
4154 break;
4155#endif
4156#ifdef scrollBar_esc 4182#ifdef scrollBar_esc
4157 case scrollBar_esc: 4183 case scrollBar_esc:
4158 if (scrollbar_mapping (state)) 4184 if (scrollbar_mapping (state))
4159 { 4185 {
4160 resize_all_windows (0, 0, 0); 4186 resize_all_windows (0, 0, 0);
… …
4179#if 0 4205#if 0
4180 case 1001: 4206 case 1001:
4181 break; /* X11 mouse highlighting */ 4207 break; /* X11 mouse highlighting */
4182#endif 4208#endif
4183 case 1010: /* scroll to bottom on TTY output inhibit */ 4209 case 1010: /* scroll to bottom on TTY output inhibit */
4184 if (!state) 4210 set_option (Opt_scrollTtyOutput, !state);
4185 SET_OPTION (Opt_scrollTtyOutput);
4186 else
4187 CLR_OPTION (Opt_scrollTtyOutput);
4188 break; 4211 break;
4189 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4190 if (state) 4213 set_option (Opt_scrollTtyKeypress, state);
4191 SET_OPTION (Opt_scrollTtyKeypress);
4192 else
4193 CLR_OPTION (Opt_scrollTtyKeypress);
4194 break; 4214 break;
4195 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 4218 scr_erase_screen (2);
4199 scr_change_screen (state); 4219 scr_change_screen (state);
4200 break; 4220 break;
4201 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4202 scr_change_screen (state); 4222 scr_change_screen (state);
4203 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4225 scr_erase_screen (2);
4206 break; 4226 break;
4207 default: 4227 default:
4208 break; 4228 break;
… …
4336 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4337 break; 4357 break;
4338 4358
4339 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4340 4360
4341#ifndef NO_BRIGHTCOLOR 4361#if !ENABLE_MINIMAL
4342 case 90: 4362 case 90:
4343 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4344 case 92: 4364 case 92:
4345 case 93: 4365 case 93:
4346 case 94: 4366 case 94:
… …
4391 */ 4411 */
4392void 4412void
4393rxvt_term::tt_printf (const char *fmt,...) 4413rxvt_term::tt_printf (const char *fmt,...)
4394{ 4414{
4395 va_list arg_ptr; 4415 va_list arg_ptr;
4396 unsigned char buf[256]; 4416 char buf[256];
4397 4417
4398 va_start (arg_ptr, fmt); 4418 va_start (arg_ptr, fmt);
4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4419 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4400 va_end (arg_ptr); 4420 va_end (arg_ptr);
4401 tt_write (buf, strlen (buf)); 4421 tt_write (buf, strlen (buf));
… …
4406 * or generated by us in response to a query ESC sequence. 4426 * or generated by us in response to a query ESC sequence.
4407 */ 4427 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4428const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409 4429
4410void 4430void
4411rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4431rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4432{
4433 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4434 return;
4435
4436 if (pty->pty < 0)
4437 return;
4438
4413 if (v_buflen == 0) 4439 if (v_buflen == 0)
4414 { 4440 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4441 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4416 4442
4417 if ((unsigned int)written == len) 4443 if ((unsigned int)written == len)
4418 return; 4444 return;
4419 4445
4420 data += written; 4446 data += written;
4421 len -= written; 4447 len -= written;
4422 } 4448 }
4423 4449
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4450 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4425 4451
4426 memcpy (v_buffer + v_buflen, data, len); 4452 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len; 4453 v_buflen += len;
4428 4454
4429 pty_ev.set (EVENT_READ | EVENT_WRITE); 4455 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430} 4456}
4431 4457
4432void rxvt_term::pty_write () 4458void rxvt_term::pty_write ()
4433{ 4459{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435 4461
4436 if (written > 0) 4462 if (written > 0)
4437 { 4463 {
4438 v_buflen -= written; 4464 v_buflen -= written;
4439 4465

Diff Legend

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