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.219 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

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

Diff Legend

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