ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

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

Diff Legend

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