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.232 by root, Wed Jan 4 01:10:08 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.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 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// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
268 mb[0] = ch[0]; 271 mb[0] = ch[0];
269 len = 1; 272 len = 1;
270 } 273 }
271 274
272 if (len > 0) 275 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
274 else 277 else
275 scr_bell (); 278 scr_bell ();
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
334 Status status_return; 338 Status status_return;
335 339
336#if 0 340#if 0
337#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
338 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
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
341 else 345 else
342#endif 346#endif
343#endif 347#endif
344 { 348 {
… …
381 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
382 } 386 }
383 else 387 else
384#endif 388#endif
385 { 389 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
388 } 392 }
389 393
390 if (valid_keysym) 394 if (valid_keysym)
391 { 395 {
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 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);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
855 { 867 {
856#ifdef META8_OPTION 868#ifdef META8_OPTION
857 /* set 8-bit on */ 869 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
859 { 871 {
860 unsigned char *ch; 872 char *ch;
861 873
862 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 875 *ch |= 0x80;
864 876
865 meta = 0; 877 meta = 0;
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 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
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
898#ifdef META8_OPTION 913#ifdef META8_OPTION
899 && meta_char == C0_ESC 914 && meta_char == C0_ESC
900#endif 915#endif
901 ) 916 )
902 { 917 {
903 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */
920 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
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 1003unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 1005{
927 unsigned int n, s; 1006 unsigned int n, s;
928 1007
929 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
967 } 1046 }
968#endif 1047#endif
969 1048
970 if (want_refresh) 1049 if (want_refresh)
971 { 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
972 scr_refresh (refresh_type); 1089 scr_refresh ();
973 scrollbar_show (1); 1090 scrollbar_show (1);
974#ifdef USE_XIM 1091#ifdef USE_XIM
975 IMSendSpot (); 1092 IMSendSpot ();
976#endif 1093#endif
977 } 1094 }
… …
980} 1097}
981 1098
982void 1099void
983rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
984{ 1101{
985 SET_R (this); 1102 make_current ();
986 SET_LOCALE (locale);
987 1103
988 display->flush (); 1104 display->flush ();
989 1105
990 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1108}
993 1109
994void 1110void
995rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
996{ 1112{
997 SET_R (this); 1113 make_current ();
998 SET_LOCALE (locale);
999 1114
1000 refresh_limit = 1; 1115 refresh_limit = 1;
1001 refresh_count = 0; 1116 refresh_count = 0;
1002 flush (); 1117 flush ();
1003} 1118}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1123{
1009 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1125 want_refresh = 1;
1011 1126
1012 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1128}
1014#endif 1129#endif
1015 1130
1016#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1017void 1132void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1147{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1150 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1151 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1153 }
1040} 1154}
1041#endif 1155#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1160{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1162 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1164 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1166 }
1054} 1167}
1055#endif 1168#endif
… …
1060{ 1173{
1061 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1062 || 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)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1177 {
1065 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1068 1180
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1181 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1183 }
1073} 1184}
1074#endif 1185#endif
1075 1186
1076#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1077static struct event_handler 1188static struct event_handler
1078{ 1189{
1079 check_watcher cw_yield; 1190 check_watcher yield_ev;
1080 1191
1081 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1082 { 1193 {
1083 sched_yield (); 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
1084 w.stop (); 1202 w.stop ();
1085 } 1203 }
1086 1204
1087 event_handler () 1205 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1089 { 1207 {
1090 } 1208 }
1091} event_handler; 1209} event_handler;
1092#endif 1210#endif
1093 1211
… …
1096{ 1214{
1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1098 1216
1099 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1100 { 1218 {
1101 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");
1102 n = 0; 1220 n = 0;
1103 } 1221 }
1104 1222
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1108 1226
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1228
1111 if (r > 0) 1229 if (r > 0)
1112 { 1230 {
1113 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1114 return true; 1232 return true;
1115 } 1233 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1235 {
1118#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1119 if (display->is_local) 1237 if (display->is_local)
1120 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1121#endif 1239#endif
1122 } 1240 }
1123 else 1241 else
1124 { 1242 {
1125 pty_ev.stop (); 1243 pty_ev.stop ();
1126 1244
1127 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1128 destroy (); 1246 destroy ();
1129 } 1247 }
1130 1248
1131 return false; 1249 return false;
1132} 1250}
1133 1251
1134void 1252void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1254{
1137 SET_R (this); 1255 make_current ();
1138 SET_LOCALE (locale);
1139 1256
1140 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1259 while (pty_fill ())
1143 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1148} 1265}
1149 1266
1150void 1267void
1151rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1152{ 1269{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1271 recolour_cursor ();
1155 1272
1156#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1274 hidden_pointer = 0;
1158 1275
1159 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1278#endif
1162} 1279}
1163 1280
1164#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1165void 1282void
1166rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1167{ 1284{
1168 if (! OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1169 return; 1286 return;
1170 1287
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1289 XFlush (dpy);
1173 1290
1174 hidden_pointer = 1; 1291 hidden_pointer = 1;
1175} 1292}
1176 1293
1177void 1294void
1178rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1179{ 1296{
1180 SET_R (this); 1297 make_current ();
1181 SET_LOCALE (locale);
1182 1298
1183 pointer_blank (); 1299 pointer_blank ();
1184} 1300}
1185#endif 1301#endif
1186 1302
… …
1251 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1252 (32 + x + 1), 1368 (32 + x + 1),
1253 (32 + y + 1)); 1369 (32 + y + 1));
1254} 1370}
1255 1371
1256#ifdef USING_W11LIB
1257void
1258rxvt_W11_process_x_event (XEvent *ev)
1259{
1260 rxvt_t *r = rxvt_get_r ();
1261
1262 x_cb (*ev);
1263}
1264#endif
1265
1266/*{{{ process an X event */ 1372/*{{{ process an X event */
1267void 1373void
1268rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1269{ 1375{
1270 dDisp; 1376 make_current ();
1271 1377
1272 SET_R (this); 1378 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1379
1275#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1383 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1384
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1388 unsigned int unused_mask;
1305 1389
1306 switch (ev.type) 1390 switch (ev.type)
1307 { 1391 {
1308 case KeyPress: 1392 case KeyPress:
1309#if ISO_14755 1393 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1394 break;
1315 1395
1316 case KeyRelease: 1396 case KeyRelease:
1317 { 1397 key_release (ev.xkey);
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1319 KeySym ks;
1320
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif
1323
1324#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support
1326 if (iso14755buf)
1327 if (iso14755buf & ISO_14755_52)
1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1333 // iso14755 part 5.2 handling: release time
1334 // first: controls
1335 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f)))
1338 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1340 commit_iso14755 ();
1341 return; // case-break;
1342 }
1343
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks)
1346 {
1347 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 ();
1349 return; // case-break;
1350 }
1351
1352 scr_bell ();
1353# endif
1354 iso14755buf = 0;
1355 break;
1356 }
1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1362 if (iso14755buf & ISO_14755_51)
1363 commit_iso14755 ();
1364#if ISO_14755
1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1367 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1368
1369 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1370 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1371 }
1372# endif
1373 else
1374 iso14755buf = 0;
1375 }
1376#endif
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1398 break;
1385 }
1386 1399
1387 case ButtonPress: 1400 case ButtonPress:
1388 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1389 break; 1402 break;
1390 1403
… …
1392 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1393 break; 1406 break;
1394 1407
1395 case ClientMessage: 1408 case ClientMessage:
1396 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 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 {
1399 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)))
1400 destroy (); 1419 destroy ();
1420 }
1401#if ENABLE_EWMH 1421#if ENABLE_EWMH
1402 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])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &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 }
1406#endif 1437#endif
1407 } 1438 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break; 1439 break;
1444 1440
1445 case MappingNotify: 1441 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1443 break;
… …
1470 break; 1466 break;
1471 } 1467 }
1472 break; 1468 break;
1473 1469
1474 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1474 focus_in ();
1476 break; 1475 break;
1477 1476
1478 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1481 focus_out ();
1480 break; 1482 break;
1481 1483
1482 case ConfigureNotify: 1484 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1484 { 1486 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1488 ;
1487 1489
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1491 {
1490 seen_resize = 1; 1492 seen_resize = 1;
1491 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
1492 } 1501 }
1493 1502
1494#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
1495 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1496 check_our_parents (); 1507 check_our_parents ();
1497#endif 1508#endif
1498 } 1509 }
1499 break; 1510 break;
1500 1511
1501 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1517
1506 break; 1518 break;
1507 1519
1508 case SelectionClear: 1520 case SelectionClear:
1509 selection_clear (); 1521 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1527 break;
1516 1528
1517 case SelectionRequest: 1529 case SelectionRequest:
1518 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));
1519 break; 1539 break;
1520 1540
1521 case UnmapNotify: 1541 case UnmapNotify:
1522 mapped = 0; 1542 mapped = 0;
1523#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1525#endif 1545#endif
1526 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1547 break;
1534 1548
1535#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1536 case ReparentNotify: 1550 case ReparentNotify:
1537 rootwin_cb (ev); 1551 rootwin_cb (ev);
… …
1543 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1544 { 1558 {
1545 do 1559 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1563
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1565
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1555 1569
1556 scr_refresh (refresh_type); 1570 want_refresh = 1;
1557 } 1571 }
1558 else 1572 else
1559 { 1573 {
1560 XEvent unused_event; 1574 XEvent unused_event;
1561 1575
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1577 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1579 ;
1566 1580
1567 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1568 { 1582 {
1569 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1570 scrollbar_show (0); 1584 scrollbar_show (0);
1571 } 1585 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1586
1577#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1580#endif 1590#endif
1581 } 1591 }
1582 break; 1592 break;
1583 1593
1584 case MotionNotify: 1594 case MotionNotify:
1585#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1596 if (hidden_pointer)
1587 pointer_unblank (); 1597 pointer_unblank ();
1588#endif 1598#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1600 break;
1598 1601
1599 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1600 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1608 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1610 ;
1605 1611
1606 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1616 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1675#endif 1681#endif
1676 } 1682 }
1677 } 1683 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1685 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1682 ; 1688 ;
1683 1689
1684 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1694 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1696 scrollbar_size ());
1691 scr_refresh (refresh_type); 1697 want_refresh = 1;
1692 refresh_limit = 0; 1698 refresh_limit = 0;
1693 scrollbar_show (1); 1699 scrollbar_show (1);
1694 } 1700 }
1695 break; 1701 break;
1696 } 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
1697} 1730}
1698 1731
1699void 1732void
1700rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1701{ 1734{
1702 if (!focus) 1735 if (!focus)
1703 { 1736 {
1704 focus = 1; 1737 focus = 1;
1705 want_refresh = 1; 1738 want_refresh = 1;
1706 1739
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1741
1709#if USE_XIM 1742#if USE_XIM
1710 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1711 { 1744 {
1712 IMSetStatusPosition (); 1745 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1714 } 1747 }
1715#endif 1748#endif
1716#if CURSOR_BLINK 1749#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1752#endif
1720#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1722 { 1755 {
1723 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1757 scr_recolour ();
1725 } 1758 }
1726#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
1727 } 1773 }
1728} 1774}
1729 1775
1730void 1776void
1731rxvt_term::focus_out () 1777rxvt_term::focus_out ()
… …
1733 if (focus) 1779 if (focus)
1734 { 1780 {
1735 focus = 0; 1781 focus = 0;
1736 want_refresh = 1; 1782 want_refresh = 1;
1737 1783
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1785
1740#if ENABLE_FRILLS || ISO_14755 1786#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1787 if (iso14755buf)
1742 { 1788 {
1743 iso14755buf = 0; 1789 iso14755buf = 0;
… …
1749#if USE_XIM 1795#if USE_XIM
1750 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1752#endif 1798#endif
1753#if CURSOR_BLINK 1799#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1756 hidden_cursor = 0; 1802 hidden_cursor = 0;
1757#endif 1803#endif
1758#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1763 } 1809 }
1764#endif 1810#endif
1765 } 1811 }
1766} 1812}
1767 1813
1768#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
1769void 1828void
1770rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1830{
1772 SET_R (this); 1831 make_current ();
1773 SET_LOCALE (locale);
1774 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
1775 switch (ev.type) 1838 switch (ev.type)
1776 { 1839 {
1777 case PropertyNotify: 1840 case PropertyNotify:
1778 /* 1841 /*
1779 * 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,
… …
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1784 return; 1847 return;
1785 1848
1786 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1787 case ReparentNotify: 1850 case ReparentNotify:
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1789 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1790 break; 1853 break;
1791 } 1854 }
1855# endif
1792} 1856}
1793#endif 1857#endif
1794 1858
1795void 1859void
1796rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1869 /*
1806 * VT window processing of button press 1870 * VT window processing of button press
1807 */ 1871 */
1808 if (ev.window == vt) 1872 if (ev.window == vt)
1809 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1810#if ISO_14755 1877#if ISO_14755
1811 // 5.4 1878 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1880 {
1814 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1828 { 1895 {
1829 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1830 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1831 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1832 { 1900 {
1833 /* only report double clicks */ 1901 /* only report double clicks */
1834 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1835 mouse_report (ev); 1903 mouse_report (ev);
… …
1855 else 1923 else
1856 { 1924 {
1857 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1859 1927
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1928 switch (ev.button)
1862 { 1929 {
1863 case Button1: 1930 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1935#else
1869 selection.rect = false; 1936 selection.rect = false;
1870#endif 1937#endif
1871 1938
1872 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1941 {
1875 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1877 else 1944 else
1878 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1879 } 1946 }
1880 else 1947 else
1881 { 1948 {
1882 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1950 MEvent.clicks++;
1884 else 1951 else
1885 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1886 1953
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1955 }
1889 1956
1890 MEvent.button = Button1; 1957 MEvent.button = Button1;
1891 break; 1958 break;
1892 1959
1893 case Button3: 1960 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1896 else 1963 else
1897 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1898 1965
1899 MEvent.button = Button3; 1966 MEvent.button = Button3;
1900 break; 1967 break;
1901 } 1968 }
1902 } 1969 }
1903 1970
1904 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1905 return; 1972 return;
1906 } 1973 }
1907 1974
… …
2043 } 2110 }
2044 2111
2045 break; 2112 break;
2046 } 2113 }
2047 } 2114 }
2115
2048 return; 2116 return;
2049 } 2117 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2118}
2058 2119
2059void 2120void
2060rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
2061{ 2122{
… …
2067 2128
2068 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
2069 { 2130 {
2070 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
2071 scrollbar_show (0); 2132 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2133 }
2076 2134
2077#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2080#endif 2138#endif
2081 2139
2082 if (ev.window == vt) 2140 if (ev.window == vt)
2083 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2084#if ISO_14755 2145#if ISO_14755
2085 // 5.4 2146 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2148 return;
2088#endif 2149#endif
2150
2089 if (reportmode) 2151 if (reportmode)
2090 { 2152 {
2091 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2123 { 2185 {
2124 case Button1: 2186 case Button1:
2125 case Button3: 2187 case Button3:
2126 selection_make (ev.time); 2188 selection_make (ev.time);
2127 break; 2189 break;
2190
2128 case Button2: 2191 case Button2:
2129 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);
2130 break; 2194 break;
2195
2131#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2132 case Button4: 2197 case Button4:
2133 case Button5: 2198 case Button5:
2134 { 2199 {
2135 int i; 2200 int i;
… …
2137 2202
2138 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2139 2204
2140 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2141 i = 1; 2206 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2208 i = nrow - 1;
2144 else 2209 else
2145 i = 5; 2210 i = 5;
2146 2211
2147# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2157 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2158 } 2223 }
2159 else 2224 else
2160 { 2225 {
2161# endif 2226# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2227 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2228 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2175 } 2230 }
2176#endif 2231# endif
2177 } 2232 }
2178 break; 2233 break;
2179#endif 2234#endif
2180 } 2235 }
2181 } 2236 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2237}
2187 2238
2188#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2189#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2190/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2191 2242
2192typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2193 2244
2194void 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)
2195{ 2246{
2196 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i; 2252 int i;
2202 2253
2203 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2204 2255
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206 2257
2207 /* for convenience */ 2258 /* for convenience */
2208 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2422 * Do transparency updates if required 2473 * Do transparency updates if required
2423 */ 2474 */
2424int 2475int
2425rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2426{ 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{
2427 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2428 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2429 Atom atype; 2488 Atom atype;
2430 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2431 Window root, oldp, *list; 2490 Window root, oldp, *list;
2432 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2434 dDisp; 2493 int sx, sy;
2494 Window cr;
2435 2495
2436 pchanged = 0; 2496 pchanged = 0;
2437 2497
2438 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2439 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2440 2500
2441 XGetWindowAttributes (disp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2443 2503
2444 XGetWindowAttributes (disp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2445 2505
2446 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2447 { 2507 {
2448 if (am_transparent) 2508 if (am_transparent)
2449 { 2509 {
2450 pchanged = 1; 2510 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2453 } 2513 }
2454 2514
2455 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2456 } 2516 }
2457 2517
2458 /* 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. */
2459 XSync (disp, False); 2519 XSync (dpy, False);
2460 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 */ ;
2461 /* 2528 /*
2462 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2464 * 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.
2465 */ 2532 */
2466 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2470 2537
2471 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2476 2543
2477 if (!i || prop == NULL 2544 if (!i || prop == NULL
2478#if TINTING 2545#if TINTING
2479 || !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 )
2480#endif 2551#endif
2481 ) 2552 )
2482 have_pixmap = 0; 2553 have_pixmap = 0;
2483 else 2554 else
2484 { 2555 {
… …
2487 XFree (prop); 2558 XFree (prop);
2488 } 2559 }
2489 2560
2490 if (have_pixmap) 2561 if (have_pixmap)
2491 { 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 {
2492 /* 2685 /*
2493 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2494 */ 2687 */
2495 int sx, sy, nx, ny; 2688 int nx, ny;
2496 unsigned int nw, nh; 2689 unsigned int nw, nh;
2497 Window cr;
2498 XImage *image; 2690 XImage *image;
2499 GC gc;
2500 XGCValues gcvalue;
2501 2691
2502 XTranslateCoordinates (disp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2506 nx = ny = 0; 2694 nx = ny = 0;
2507 2695
2508 if (sx < 0) 2696 if (sx < 0)
2509 { 2697 {
2510 nw += sx; 2698 nw += sx;
2511 nx = -sx; 2699 nx = -sx;
2512 sx = 0; 2700 sx = 0;
2513 } 2701 }
2514 2702
2515 if (sy < 0) 2703 if (sy < 0)
2516 { 2704 {
2517 nh += sy; 2705 nh += sy;
2518 ny = -sy; 2706 ny = -sy;
2519 sy = 0; 2707 sy = 0;
2520 } 2708 }
2521 2709
2522 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524 2712
2525 XSync (disp, False); 2713 XSync (dpy, False);
2526 allowedxerror = -1; 2714 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528 2716
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2531 allowedxerror = 0; 2719 allowedxerror = 0;
2532
2533 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)
2534 { 2749 {
2535 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2536 { 2751 {
2537 pchanged = 1; 2752 pchanged = 1;
2538 if (pixmap != None) 2753 if (pixmap != None)
2539 { 2754 {
2540 XFreePixmap (disp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2541 pixmap = None; 2756 pixmap = None;
2542 } 2757 }
2543 } 2758 }
2544 2759
2545 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2546 } 2761 }
2547 else 2762 else
2548 { 2763 {
2549 if (pixmap != None)
2550 XFreePixmap (disp, pixmap);
2551
2552#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint))
2554 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2559
2560 ShadeXImage (display, image, shade, rm, gm, bm);
2561 }
2562#endif
2563
2564 pixmap = XCreatePixmap (disp, vt,
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc);
2570 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2573 2766
2574 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1; 2768 pchanged = 1;
2576 2769
2577 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2578 } 2771 }
2579 } 2772 }
2580 2773
2581 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2583 else 2776 else
2584 { 2777 {
2585 unsigned int n; 2778 unsigned int n;
2586 /* 2779 /*
2587 * InheritPixmap transparency 2780 * InheritPixmap transparency
2588 */ 2781 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 { 2783 {
2591 oldp = parent[i]; 2784 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2593 &parent[i], &list, &n);
2594 XFree (list); 2786 XFree (list);
2595 2787
2596 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2597 { 2789 {
2598 if (oldp != None) 2790 if (oldp != None)
… …
2606 } 2798 }
2607 2799
2608 n = 0; 2800 n = 0;
2609 2801
2610 if (pchanged) 2802 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2613 { 2804 {
2614 XGetWindowAttributes (disp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 { 2808 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break; 2810 break;
2619 } 2811 }
2620 } 2812 }
2621 }
2622 2813
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2624 { 2815 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0; 2818 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2629 } 2820 }
2630 else 2821 else
2631 { 2822 {
2632#if WAIT_FOR_WM
2633 /* wait (an arbitrary period) for the WM to do its thing
2634 * needed for fvwm2.2.2 (and before?) */
2635 sleep (1);
2636#endif
2637 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2638 { 2824 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2641 } 2827 }
2642 2828
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2644 am_transparent = 1; 2830 am_transparent = 1;
2645 } 2831 }
2646 2832
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2834 parent[i] = None;
2649 } 2835 }
2650 2836
2651 if (scrollBar.win) 2837 if (scrollBar.win)
2652 { 2838 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2655 scrollbar_show (0); 2841 scrollbar_show (0);
2656 } 2842 }
2657 2843
2658 if (am_transparent) 2844 if (am_transparent)
… …
2660 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2662 flush (); 2848 flush ();
2663 } 2849 }
2664 2850
2665 return pchanged; 2851// return pchanged;
2666} 2852}
2667#endif 2853#endif
2668 2854
2669/*}}} */ 2855/*}}} */
2670 2856
2671bool 2857bool
2672rxvt_term::cmd_parse () 2858rxvt_term::cmd_parse ()
2673{ 2859{
2674 bool flag = false; 2860 bool flag = false;
2675 unicode_t ch = NOCHAR; 2861 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2862 char *seq_begin; // remember start of esc-sequence here
2677 2863
2678 for (;;) 2864 for (;;)
2679 { 2865 {
2680 if (ch == NOCHAR) 2866 if (ch == NOCHAR)
2681 { 2867 {
2682 seq_begin = cmdbuf_ptr; 2868 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2869 ch = next_char ();
2684 }
2685 2870
2686 if (ch == NOCHAR) // TODO: improve 2871 if (ch == NOCHAR)
2687 break; 2872 break;
2873 }
2688 2874
2689 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)
2690 { 2876 {
2691 if (!seen_input) 2877 if (!seen_input)
2692 { 2878 {
… …
2701 if (seen_resize && cmd_pid) 2887 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2888 kill (-cmd_pid, SIGWINCH);
2703 } 2889 }
2704 2890
2705 /* Read a text string from the input buffer */ 2891 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2892 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2893 bool refreshnow = false;
2708 int nlines = 0; 2894 int nlines = 0;
2709 unicode_t *str = buf; 2895 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2896 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2897
2712 for (;;) 2898 for (;;)
2713 { 2899 {
2714 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))
2715 break; 2901 break;
… …
2721 if (ch == C0_LF) 2907 if (ch == C0_LF)
2722 nlines++; 2908 nlines++;
2723 2909
2724 refresh_count++; 2910 refresh_count++;
2725 2911
2726 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2727 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2914 {
2729 refreshnow = true; 2915 refreshnow = true;
2730 refresh_count = 0; 2916 refresh_count = 0;
2731 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2733 } 2919 }
2734 2920
2735 // scr_add_lines only works for nlines <= nrow - 1. 2921 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2922 if (nlines >= nrow - 1)
2737 { 2923 {
2924 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2925 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2926 scr_add_lines (buf, str - buf, nlines);
2927
2739 nlines = 0; 2928 nlines = 0;
2740 str = buf; 2929 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2930 eol = str + min (ncol, UBUFSIZ);
2742 } 2931 }
2743 2932
… …
2756 2945
2757 seq_begin = cmdbuf_ptr; 2946 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2947 ch = next_char ();
2759 } 2948 }
2760 2949
2950 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2952 scr_add_lines (buf, str - buf, nlines);
2762 2953
2763 /* 2954 /*
2764 * 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
2765 * 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.
2766 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2767 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2768 */ 2959 */
2769 if (refreshnow) 2960 if (refreshnow)
2770 { 2961 {
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++; 2963 refresh_limit++;
2773 else 2964 else
2774 { 2965 {
2775 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2776 scr_refresh (refresh_type); 2968 scr_refresh ();
2777 flush_ev.stop (); 2969 want_refresh = 1;
2778 } 2970 }
2779 } 2971 }
2780 2972
2781 } 2973 }
2782 else 2974 else
… …
2797 } 2989 }
2798 2990
2799 return flag; 2991 return flag;
2800} 2992}
2801 2993
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2994// read the next character
2812unicode_t 2995wchar_t
2813rxvt_term::next_char () 2996rxvt_term::next_char () NOTHROW
2814{ 2997{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2998 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2999 {
2817 // assume 7-bit to be ascii ALWAYS 3000 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 3002 return *cmdbuf_ptr++;
2820 3003
2821 wchar_t wc; 3004 wchar_t wc;
2822 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);
2823 3006
2824 if (len == (size_t)-2) 3007 if (len == (size_t)-2)
2825 { 3008 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 3009 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 3010 cmdbuf_ptr = cmdbuf_endp;
2828 break; 3011 break;
2829 } 3012 }
2830 3013
2831 if (len == (size_t)-1) 3014 if (len == (size_t)-1)
2832 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
2833 3016
2834 // assume wchar == unicode 3017 // assume wchar == unicode
2835 cmdbuf_ptr += len; 3018 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 3019 return wc & UNICODE_MASK;
2837 } 3020 }
2838 3021
2839 return NOCHAR; 3022 return NOCHAR;
2840} 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;
2841 3035
2842/* rxvt_cmd_getc () - Return next input character */ 3036/* rxvt_cmd_getc () - Return next input character */
2843/* 3037/*
2844 * Return the next input character after first passing any keyboard input 3038 * Return the next input character after first passing any keyboard input
2845 * to the command. 3039 * to the command.
2846 */ 3040 */
2847unicode_t 3041wchar_t
2848rxvt_term::cmd_getc () 3042rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 3043{
2850 unicode_t c = next_char (); 3044 wchar_t c = next_char ();
2851 3045
2852 if (c == NOCHAR) 3046 if (c == NOCHAR)
2853 throw out_of_input; 3047 throw out_of_input;
2854 3048
2855 return c; 3049 return c;
2856} 3050}
2857 3051
2858unicode_t 3052uint32_t
2859rxvt_term::cmd_get8 () 3053rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 3054{
2861 unicode_t c = next_octet (); 3055 uint32_t c = next_octet ();
2862 3056
2863 if (c == NOCHAR) 3057 if (c == NOCHAR)
2864 throw out_of_input; 3058 throw out_of_input;
2865 3059
2866 return c; 3060 return c;
… …
2966 case C0_ESC: 3160 case C0_ESC:
2967 process_escape_seq (); 3161 process_escape_seq ();
2968 break; 3162 break;
2969 case C0_ENQ: /* terminal Status */ 3163 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 3164 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3165 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 3166 else
2974 tt_write ((unsigned char *)VT100_ANS, 3167 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 3168 break;
2977 case C0_BEL: /* bell */ 3169 case C0_BEL: /* bell */
2978 scr_bell (); 3170 scr_bell ();
2979 break; 3171 break;
2980 case C0_BS: /* backspace */ 3172 case C0_BS: /* backspace */
… …
3104 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
3105 break; 3297 break;
3106 case '+': 3298 case '+':
3107 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
3108 break; 3300 break;
3109#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
3110 case '6': 3302 case '6':
3111 scr_backindex (); 3303 scr_backindex ();
3112 break; 3304 break;
3113#endif 3305#endif
3114 case '7': 3306 case '7':
3115 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
3116 break; 3308 break;
3117 case '8': 3309 case '8':
3118 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
3119 break; 3311 break;
3120#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
3121 case '9': 3313 case '9':
3122 scr_forwardindex (); 3314 scr_forwardindex ();
3123 break; 3315 break;
3124#endif 3316#endif
3125 case '=': 3317 case '=':
… …
3135 break; 3327 break;
3136 3328
3137 /* 8.3.87: NEXT LINE */ 3329 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3330 case C1_NEL: /* ESC E */
3139 { 3331 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3332 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3333 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3334 }
3143 break; 3335 break;
3144 3336
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3337 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3338 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3360 process_dcs_seq ();
3169 break; 3361 break;
3170 3362
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3363 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3364 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3365 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3366 break; /* steal obsolete ESC [ c */
3176 3367
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3369 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3370 process_csi_seq ();
… …
3288 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
3289 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
3290 if (arg[p] == -1) 3481 if (arg[p] == -1)
3291 arg[p] = ndef; 3482 arg[p] = ndef;
3292 3483
3293#ifdef DEBUG_CMD
3294 fprintf (stderr, "CSI ");
3295 for (p = 0; p < nargs; p++)
3296 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3297 fprintf (stderr, "%c\n", ch);
3298#endif
3299
3300 /* 3484 /*
3301 * private mode handling 3485 * private mode handling
3302 */ 3486 */
3303 if (priv) 3487 if (priv)
3304 { 3488 {
3305 switch (priv) 3489 switch (priv)
3306 { 3490 {
3307 case '>': 3491 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3309 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 }
3310 break; 3503 break;
3311 case '?': 3504 case '?':
3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3313 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
3314 break; 3507 break;
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3616 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3617 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3618 break;
3426 3619
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3620 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3621 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3622 break;
3431 3623
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3624 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3625 process_sgr_mode (nargs, arg);
3434 break; 3626 break;
… …
3441 break; 3633 break;
3442 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3443 scr_report_position (); 3635 scr_report_position ();
3444 break; 3636 break;
3445 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 3640 break;
3449 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 3643 break;
… …
3518 break; 3710 break;
3519 case CSI_75: 3711 case CSI_75:
3520 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3521 break; 3713 break;
3522 3714
3523#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3524 case CSI_74: 3716 case CSI_74:
3525 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3526 break; 3718 break;
3527#endif 3719#endif
3528 3720
… …
3535 break; 3727 break;
3536 } 3728 }
3537} 3729}
3538/*}}} */ 3730/*}}} */
3539 3731
3540#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3733/* ARGSUSED */
3542void 3734void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3736{
3545 int x, y; 3737 int x, y;
3546 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3547 Window wdummy; 3739 Window wdummy;
3548 dDisp; 3740
3741 dLocal (Display *, dpy);
3549 3742
3550 if (nargs == 0) 3743 if (nargs == 0)
3551 return; 3744 return;
3552 3745
3553 switch (args[0]) 3746 switch (args[0])
3554 { 3747 {
3555 /* 3748 /*
3556 * commands 3749 * commands
3557 */ 3750 */
3558 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3560 break; 3753 break;
3561 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3756 break;
3564 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3759 break;
3567 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3762 break;
3570 case 5: /* raise window */ 3763 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3572 break; 3765 break;
3573 case 6: /* lower window */ 3766 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3575 break; 3768 break;
3576 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3577 scr_touch (true); 3770 scr_touch (true);
3578 break; 3771 break;
3579 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3780 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3781 (unsigned int) (args[1] * fheight));
3589 break; 3782 break;
3590 3783
3591
3592 /* 3784 /*
3593 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3594 */ 3786 */
3595 case 11: /* report window state */ 3787 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3790 break;
3599 case 13: /* report window position */ 3791 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3797 break;
3606 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3801 break;
3610 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3804 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3807 break;
3616 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3617 { 3809 {
3618 char *s; 3810 char *s;
3619 XGetIconName (disp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3620 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 */
3621 XFree (s); 3813 XFree (s);
3622 } 3814 }
3623 break; 3815 break;
3624 case 21: /* report window title */ 3816 case 21: /* report window title */
3625 { 3817 {
3626 char *s; 3818 char *s;
3627 XFetchName (disp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3628 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 */
3629 XFree (s); 3821 XFree (s);
3630 } 3822 }
3631 break; 3823 break;
3632 } 3824 }
3633} 3825}
… …
3636/*----------------------------------------------------------------------*/ 3828/*----------------------------------------------------------------------*/
3637/* 3829/*
3638 * get input up until STRING TERMINATOR (or BEL) 3830 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3831 * ends_how is terminator used. returned input must be free()'d
3640 */ 3832 */
3641unsigned char * 3833char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3834rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3835{
3644 unicode_t ch; 3836 unicode_t ch;
3645 bool seen_esc = false; 3837 bool seen_esc = false;
3646 unsigned int n = 0; 3838 unsigned int n = 0;
… …
3660 seen_esc = true; 3852 seen_esc = true;
3661 continue; 3853 continue;
3662 } 3854 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3859 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3667 3861
3668 seen_esc = false; 3862 seen_esc = false;
3669 3863
3670 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3865 // stop at some sane length
3672 return NULL; 3866 return NULL;
3673 3867
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3868 string[n++] = ch;
3678 } 3869 }
3679 3870
3680 string[n++] = '\0'; 3871 string[n++] = '\0';
3681 3872
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3874
3684 return (unsigned char *)rxvt_wcstombs (string); 3875 return rxvt_wcstombs (string);
3685} 3876}
3686 3877
3687/*----------------------------------------------------------------------*/ 3878/*----------------------------------------------------------------------*/
3688/* 3879/*
3689 * 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)'
3690 */ 3881 */
3691void 3882void
3692rxvt_term::process_dcs_seq () 3883rxvt_term::process_dcs_seq ()
3693{ 3884{
3694 unsigned char *s; 3885 char *s;
3695 unicode_t eh; 3886 unicode_t eh;
3696 3887
3697 /* 3888 /*
3698 * Not handled yet 3889 * Not handled yet
3699 */ 3890 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3909 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3910 arg = arg * 10 + (ch - '0');
3720 3911
3721 if (ch == ';') 3912 if (ch == ';')
3722 { 3913 {
3723 unsigned char *s = get_to_st (eh); 3914 char *s = get_to_st (eh);
3724 3915
3725 if (s) 3916 if (s)
3726 { 3917 {
3727 process_xterm_seq (arg, (char *)s, eh); 3918 process_xterm_seq (arg, s, eh);
3728 free (s); 3919 free (s);
3729 } 3920 }
3730 } 3921 }
3731} 3922}
3732 3923
3733void 3924void
3734rxvt_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)
3735{ 3926{
3736 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3737 { 3928 {
3738 unsigned short r, g, b; 3929 rgba c;
3739 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
3740 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);
3741 } 3938 }
3742 else 3939 else
3743 set_window_color (color, str); 3940 set_window_color (color, str);
3744} 3941}
3745 3942
3746/* 3943/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3945 */
3749void 3946void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3947rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3948{
3752 int changed = 0;
3753 int color; 3949 int color;
3754 char *buf, *name; 3950 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3952 int saveop = op;
3757 dDisp; 3953
3954 dLocal (Display *, dpy);
3758 3955
3759 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
3760 switch (op) 3961 switch (op)
3761 { 3962 {
3762 case XTerm_name: 3963 case XTerm_name:
3763 set_title (str); 3964 set_title (str);
3764 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3778 unsigned long bytes_after; 3979 unsigned long bytes_after;
3779 unsigned char *value = 0; 3980 unsigned char *value = 0;
3780 const char *str = ""; 3981 const char *str = "";
3781 3982
3782 if (prop 3983 if (prop
3783 && XGetWindowProperty (disp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3784 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3785 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3786 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3787 && actual_type != None 3988 && actual_type != None
3788 && actual_format == 8) 3989 && actual_format == 8)
3789 str = (const char *)(value); 3990 str = (const char *)(value);
3790 3991
3791 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3792 3993
3793 XFree (value); 3994 XFree (value);
3794 } 3995 }
3795 else 3996 else
3796 { 3997 {
… …
3800 { 4001 {
3801 *eq = 0; 4002 *eq = 0;
3802 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3803 } 4004 }
3804 else 4005 else
3805 XDeleteProperty (disp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3806 display->atom (str)); 4007 display->atom (str));
3807 } 4008 }
3808 break; 4009 break;
3809 4010
3810 case XTerm_Color: 4011 case XTerm_Color:
… …
3812 { 4013 {
3813 if ((name = strchr (buf, ';')) == NULL) 4014 if ((name = strchr (buf, ';')) == NULL)
3814 break; 4015 break;
3815 4016
3816 *name++ = '\0'; 4017 *name++ = '\0';
3817 color = atoi (buf); 4018 color = atoi (buf) + minCOLOR;
3818 4019
3819 if (color < 0 || color >= TOTAL_COLORS) 4020 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 4021 break;
3821 4022
3822 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 4024 *buf++ = '\0';
3824 4025
3825 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3826 {
3827 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3829 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 }
3831 else
3832 set_window_color (color + minCOLOR, name);
3833 } 4027 }
3834 break; 4028 break;
3835 case XTerm_Color00: 4029 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3837 break; 4031 break;
3838 case XTerm_Color01: 4032 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3840 break; 4034 break;
3841#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3844 break; 4038 break;
3845#endif 4039#endif
3846 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3847 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3848 break; 4042 break;
3849 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3851 break; 4045 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3860 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);
3861 break; 4057 break;
3862 case URxvt_Color_IT: 4058 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4059 process_color_seq (op, Color_IT, str, resp);
3864 break; 4060 break;
3865#endif 4061#endif
3866#if TRANSPARENT && TINTING 4062#if TRANSPARENT && TINTING
3867 case URxvt_Color_tint: 4063 case URxvt_Color_tint:
3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4064 process_color_seq (op, Color_tint, str, resp);
4065
3869 check_our_parents (); 4066 check_our_parents ();
4067
3870 if (am_transparent) 4068 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 4069 want_full_refresh = want_refresh = 1;
3872 break;
3873#endif
3874 4070
4071 break;
4072#endif
4073
3875 case XTerm_Pixmap: 4074 case Rxvt_Pixmap:
4075 {
3876 if (*str != ';') 4076 if (*str != ';')
3877 { 4077 {
3878#if XPM_BACKGROUND 4078#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 4079 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 4080 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 4081 scr_touch (true);
4082#endif
3883 } 4083 }
4084
4085 int changed = 0;
4086
3884 while ((str = strchr (str, ';')) != NULL) 4087 while ((str = strchr (str, ';')) != NULL)
3885 { 4088 {
3886 str++; 4089 str++;
3887#if XPM_BACKGROUND 4090#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 4091 changed += scale_pixmap (str);
3889#endif 4092#endif
3890 } 4093 }
3891 4094
3892 if (changed) 4095 if (changed)
3893 { 4096 {
3894#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 4098 resize_pixmap ();
3896#endif
3897 scr_touch (true); 4099 scr_touch (true);
4100#endif
3898 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 }
3899 break; 4108 break;
3900 4109
3901 case XTerm_restoreFG: 4110 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3903 break; 4112 break;
3904 case XTerm_restoreBG: 4113 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 4114 set_window_color (Color_bg, str);
3906 break; 4115 break;
3907 4116
3908 case XTerm_logfile: 4117 case XTerm_logfile:
3909 // TODO, when secure mode? 4118 // TODO, when secure mode?
3910 break; 4119 break;
3911 4120
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0 4121#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 4122 case Rxvt_dumpscreen: /* no error notices */
3920 { 4123 {
3921 int fd; 4124 int fd;
3922 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)
3923 { 4126 {
3924 scr_dump (fd); 4127 scr_dump (fd);
… …
3935 case URxvt_italicFont: 4138 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3937#endif 4140#endif
3938 if (query) 4141 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 4145 resp);
3943 else 4146 else
3944 { 4147 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 4151 allocated.push_back ((void *)res);
3949 set_fonts (); 4152 set_fonts ();
3950 } 4153 }
3951 break; 4154 break;
3952 4155
3953#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
3954 case URxvt_locale: 4165 case URxvt_locale:
3955 if (query) 4166 if (query)
3956 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);
3957 else 4168 else
3958 { 4169 {
3959 set_locale (str); 4170 set_locale (str);
3960 pty.set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 4172 init_xlocale ();
3962 } 4173 }
3963 break; 4174 break;
3964 4175
3965 case URxvt_view_up: 4176 case URxvt_view_up:
… …
3976 break; 4187 break;
3977#endif 4188#endif
3978 4189
3979#if ENABLE_PERL 4190#if ENABLE_PERL
3980 case URxvt_perl: 4191 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 4193 ; // no responses yet
3983 break; 4194 break;
3984#endif 4195#endif
3985 } 4196 }
3986} 4197}
… …
4018 return state; 4229 return state;
4019} 4230}
4020 4231
4021/* we're not using priv _yet_ */ 4232/* we're not using priv _yet_ */
4022void 4233void
4023rxvt_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)
4024{ 4235{
4025 unsigned int i, j; 4236 unsigned int i, j;
4026 int state; 4237 int state;
4027 4238
4028 static const struct 4239 static const struct
… …
4039 { 5, PrivMode_rVideo }, 4250 { 5, PrivMode_rVideo },
4040 { 6, PrivMode_relOrigin }, 4251 { 6, PrivMode_relOrigin },
4041 { 7, PrivMode_Autowrap }, 4252 { 7, PrivMode_Autowrap },
4042 // 8, bi-directional support mode 4253 // 8, bi-directional support mode
4043 { 9, PrivMode_MouseX10 }, 4254 { 9, PrivMode_MouseX10 },
4044#ifdef menuBar_esc
4045 { menuBar_esc, PrivMode_menuBar },
4046#endif
4047 // 18, 19 printing-related 4255 // 18, 19 printing-related
4048 { 25, PrivMode_VisibleCursor }, 4256 { 25, PrivMode_VisibleCursor },
4049#ifdef scrollBar_esc 4257#ifdef scrollBar_esc
4050 { scrollBar_esc, PrivMode_scrollBar }, 4258 { scrollBar_esc, PrivMode_scrollBar },
4051#endif 4259#endif
… …
4098 /* extra handling for values with state unkept */ 4306 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4307 switch (arg[i])
4100 { 4308 {
4101#if ENABLE_STYLES 4309#if ENABLE_STYLES
4102 case 1021: 4310 case 1021:
4103 if (mode) 4311 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4312
4108 scr_touch (true); 4313 scr_touch (true);
4109 break; 4314 break;
4110#endif 4315#endif
4111 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4112 case 1049: 4317 case 1049:
4113 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4114 if (mode == 0) 4319 if (mode == 0)
4115 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4116 else if (mode == 1) 4321 else if (mode == 1)
4117 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4118 break; 4323 break;
… …
4133 case 3: /* 80/132 */ 4338 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4339 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4340 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4341 break;
4137 case 4: /* smooth scrolling */ 4342 case 4: /* smooth scrolling */
4138 if (!state) 4343 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4344 break;
4143 case 5: /* reverse video */ 4345 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4346 scr_rvideo_mode (state);
4145 break; 4347 break;
4146 case 6: /* relative/absolute origins */ 4348 case 6: /* relative/absolute origins */
… …
4152 /* 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 */
4153 case 9: /* X10 mouse reporting */ 4355 case 9: /* X10 mouse reporting */
4154 if (state) /* orthogonal */ 4356 if (state) /* orthogonal */
4155 priv_modes &= ~PrivMode_MouseX11; 4357 priv_modes &= ~PrivMode_MouseX11;
4156 break; 4358 break;
4157#ifdef menuBar_esc
4158 case menuBar_esc:
4159#ifdef MENUBAR
4160 map_menuBar (state);
4161#endif
4162 break;
4163#endif
4164#ifdef scrollBar_esc 4359#ifdef scrollBar_esc
4165 case scrollBar_esc: 4360 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 4361 if (scrollbar_mapping (state))
4167 { 4362 {
4168 resize_all_windows (0, 0, 0); 4363 resize_all_windows (0, 0, 0);
… …
4187#if 0 4382#if 0
4188 case 1001: 4383 case 1001:
4189 break; /* X11 mouse highlighting */ 4384 break; /* X11 mouse highlighting */
4190#endif 4385#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4386 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4387 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4388 break;
4197 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4198 if (state) 4390 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4391 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4395 scr_erase_screen (2);
4207 scr_change_screen (state); 4396 scr_change_screen (state);
4208 break; 4397 break;
4209 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4210 scr_change_screen (state); 4399 scr_change_screen (state);
4211 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4213 scr_erase_screen (2); 4402 scr_erase_screen (2);
4214 break; 4403 break;
4215 default: 4404 default:
4216 break; 4405 break;
… …
4344 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4345 break; 4534 break;
4346 4535
4347 //case 50: // not variable spacing 4536 //case 50: // not variable spacing
4348 4537
4349#ifndef NO_BRIGHTCOLOR 4538#if !ENABLE_MINIMAL
4350 case 90: 4539 case 90:
4351 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4352 case 92: 4541 case 92:
4353 case 93: 4542 case 93:
4354 case 94: 4543 case 94:
… …
4399 */ 4588 */
4400void 4589void
4401rxvt_term::tt_printf (const char *fmt,...) 4590rxvt_term::tt_printf (const char *fmt,...)
4402{ 4591{
4403 va_list arg_ptr; 4592 va_list arg_ptr;
4404 unsigned char buf[256]; 4593 char buf[256];
4405 4594
4406 va_start (arg_ptr, fmt); 4595 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4596 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4597 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4598 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4603 * or generated by us in response to a query ESC sequence.
4415 */ 4604 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4605const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4606
4418void 4607void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4608rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 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
4421 if (v_buflen == 0) 4616 if (v_buflen == 0)
4422 { 4617 {
4423 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));
4424 4619
4425 if ((unsigned int)written == len) 4620 if ((unsigned int)written == len)
4426 return; 4621 return;
4427 4622
4428 data += written; 4623 data += written;
4429 len -= written; 4624 len -= written;
4430 } 4625 }
4431 4626
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4628
4434 memcpy (v_buffer + v_buflen, data, len); 4629 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4630 v_buflen += len;
4436 4631
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4632 pty_ev.set (EVENT_READ | EVENT_WRITE);
4438} 4633}
4439 4634
4440void rxvt_term::pty_write () 4635void rxvt_term::pty_write ()
4441{ 4636{
4442 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));
4443 4638
4444 if (written > 0) 4639 if (written > 0)
4445 { 4640 {
4446 v_buflen -= written; 4641 v_buflen -= written;
4447 4642

Diff Legend

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