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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

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

Diff Legend

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