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.316 by root, Thu Dec 7 20:59:59 2006 UTC

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

Diff Legend

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