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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME 60#if LINUX_YIELD_HACK
60#if HAVE_SCHED_YIELD
61# include <sched.h> 61# include <ctime>
62#endif 62#endif
63 63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
229# if !UNICODE3 226# if !UNICODE3
230 if (ch >= 0x10000) 227 if (ch >= 0x10000)
231 ch = 0xfffd; 228 ch = 0xfffd;
232# endif 229# endif
233 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
235 } 234 }
236 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
237 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
239 243
240 free (fname); 244 free (fname);
241 245
… …
267 mb[0] = ch[0]; 271 mb[0] = ch[0];
268 len = 1; 272 len = 1;
269 } 273 }
270 274
271 if (len > 0) 275 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
273 else 277 else
274 scr_bell (); 278 scr_bell ();
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 309 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
311 316
312 /* 317 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
315 * 320 *
… …
333 Status status_return; 338 Status status_return;
334 339
335#if 0 340#if 0
336#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
340 else 345 else
341#endif 346#endif
342#endif 347#endif
343 { 348 {
… …
380 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
381 } 386 }
382 else 387 else
383#endif 388#endif
384 { 389 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
387 } 392 }
388 393
389 if (valid_keysym) 394 if (valid_keysym)
390 { 395 {
… …
442 scr_move_to (0, 1); 447 scr_move_to (0, 1);
443 return; 448 return;
444 } 449 }
445 else if (keysym == XK_End) 450 else if (keysym == XK_End)
446 { 451 {
447 scr_move_to (1, 0); 452 scr_move_to (1, 1);
448 return; 453 return;
449 } 454 }
450 } 455 }
451#endif 456#endif
452 } 457 }
… …
463 { 468 {
464 switch (keysym) 469 switch (keysym)
465 { 470 {
466 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
469 return; 474 return;
470#if TODO 475#if TODO
471 /* rxvt extras */ 476 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
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 + 0.01); 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
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
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
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1075bool 1204bool
1076rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1077{ 1206{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1208
1080 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1081 { 1210 {
1082 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");
1083 n = 0; 1212 n = 0;
1084 } 1213 }
1085 1214
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1088 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1089 1218
1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1091 1220
1092 if (r > 0) 1221 if (r > 0)
1093 { 1222 {
1094 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1095 return true; 1224 return true;
1096 } 1225 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1227 {
1099#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1100 sched_yield (); 1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1101#endif 1231#endif
1102 } 1232 }
1103 else 1233 else
1104 { 1234 {
1105 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1112} 1242}
1113 1243
1114void 1244void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1246{
1117 SET_R (this); 1247 make_current ();
1118 SET_LOCALE (locale);
1119 1248
1120 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1251 while (pty_fill ())
1123 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1128} 1257}
1129 1258
1130void 1259void
1131rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1132{ 1261{
1133 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1134 recolour_cursor (); 1263 recolour_cursor ();
1135 1264
1136#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1137 hidden_pointer = 0; 1266 hidden_pointer = 0;
1138 1267
… …
1143 1272
1144#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1145void 1274void
1146rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1147{ 1276{
1148 if (! OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1149 return; 1278 return;
1150 1279
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1152 XFlush (display->display); 1281 XFlush (dpy);
1153 1282
1154 hidden_pointer = 1; 1283 hidden_pointer = 1;
1155} 1284}
1156 1285
1157void 1286void
1158rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1159{ 1288{
1160 SET_R (this); 1289 make_current ();
1161 SET_LOCALE (locale);
1162 1290
1163 pointer_blank (); 1291 pointer_blank ();
1164} 1292}
1165#endif 1293#endif
1166 1294
… …
1231 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1232 (32 + x + 1), 1360 (32 + x + 1),
1233 (32 + y + 1)); 1361 (32 + y + 1));
1234} 1362}
1235 1363
1236#ifdef USING_W11LIB
1237void
1238rxvt_W11_process_x_event (XEvent *ev)
1239{
1240 rxvt_t *r = rxvt_get_r ();
1241
1242 x_cb (*ev);
1243}
1244#endif
1245
1246/*{{{ process an X event */ 1364/*{{{ process an X event */
1247void 1365void
1248rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1249{ 1367{
1250 dDisp; 1368 make_current ();
1251 1369
1252 SET_R (this); 1370 dLocal (Display *, dpy);
1253 SET_LOCALE (locale);
1254 1371
1255#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1257 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1258 if (hidden_cursor) 1375 return;
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263 1376
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1380 unsigned int unused_mask;
1285 1381
1286 switch (ev.type) 1382 switch (ev.type)
1287 { 1383 {
1288 case KeyPress: 1384 case KeyPress:
1289#if ISO_14755 1385 key_press (ev.xkey);
1290 if (!(iso14755buf & ISO_14755_52))
1291#endif
1292 lookup_key (ev.xkey);
1293
1294 break; 1386 break;
1295 1387
1296 case KeyRelease: 1388 case KeyRelease:
1297 { 1389 key_release (ev.xkey);
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1299 KeySym ks;
1300
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif
1303
1304#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support
1306 if (iso14755buf)
1307 if (iso14755buf & ISO_14755_52)
1308 {
1309# if ENABLE_OVERLAY
1310 scr_overlay_off ();
1311# endif
1312# if ISO_14755
1313 // iso14755 part 5.2 handling: release time
1314 // first: controls
1315 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f)))
1318 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1320 commit_iso14755 ();
1321 return; // case-break;
1322 }
1323
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks)
1326 {
1327 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 ();
1329 return; // case-break;
1330 }
1331
1332 scr_bell ();
1333# endif
1334 iso14755buf = 0;
1335 break;
1336 }
1337 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1338 {
1339# if ENABLE_OVERLAY
1340 scr_overlay_off ();
1341# endif
1342 if (iso14755buf & ISO_14755_51)
1343 commit_iso14755 ();
1344#if ISO_14755
1345 else if (iso14755buf & ISO_14755_STARTED)
1346 {
1347 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1348
1349 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1350 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1351 }
1352# endif
1353 else
1354 iso14755buf = 0;
1355 }
1356#endif
1357
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R)
1362 mouse_slip_wheel_speed = 0;
1363#endif
1364 break; 1390 break;
1365 }
1366 1391
1367 case ButtonPress: 1392 case ButtonPress:
1368 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1369 break; 1394 break;
1370 1395
… …
1372 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1373 break; 1398 break;
1374 1399
1375 case ClientMessage: 1400 case ClientMessage:
1376 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1378 { 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 {
1379 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)))
1380 destroy (); 1411 destroy ();
1412 }
1381#if ENABLE_EWMH 1413#if ENABLE_EWMH
1382 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])
1383 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &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 }
1386#endif 1429#endif
1387 } 1430 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1397#ifdef OFFIX_DND
1398 /* OffiX Dnd (drag 'n' drop) protocol */
1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1400 && (ev.xclient.data.l[0] == DndFile
1401 || ev.xclient.data.l[0] == DndDir
1402 || ev.xclient.data.l[0] == DndLink))
1403 {
1404 /* Get Dnd data */
1405 Atom ActualType;
1406 int ActualFormat;
1407 unsigned char *data;
1408 unsigned long Size, RemainingBytes;
1409
1410 XGetWindowProperty (disp, display->root,
1411 xa[XA_DNDSELECTION],
1412 0L, 1000000L,
1413 False, AnyPropertyType,
1414 &ActualType, &ActualFormat,
1415 &Size, &RemainingBytes,
1416 &data);
1417 set_string_property (XA_CUT_BUFFER0, data);
1418 XFree (data);
1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1421 }
1422#endif /* OFFIX_DND */
1423 break; 1431 break;
1424 1432
1425 case MappingNotify: 1433 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1435 break;
… …
1460 break; 1468 break;
1461 1469
1462 case ConfigureNotify: 1470 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1464 { 1472 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1474 ;
1467 1475
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1477 {
1470 seen_resize = 1; 1478 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1480 }
1473 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1475 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1476 check_our_parents (); 1486 check_our_parents ();
1477#endif 1487#endif
1478 } 1488 }
1479 break; 1489 break;
1480 1490
1481 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1483 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1484 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1485 1496
1486 break; 1497 break;
1487 1498
1488 case SelectionClear: 1499 case SelectionClear:
1489 selection_clear (); 1500 selection_clear ();
… …
1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1495 break; 1506 break;
1496 1507
1497 case SelectionRequest: 1508 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1510 break;
1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 break; 1518 break;
1500 1519
1501 case UnmapNotify: 1520 case UnmapNotify:
1502 mapped = 0; 1521 mapped = 0;
1503#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1505#endif 1524#endif
1506 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507
1508 case MapNotify:
1509 mapped = 1;
1510#ifdef TEXT_BLINK
1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1512#endif
1513 break; 1526 break;
1514 1527
1515#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1516 case ReparentNotify: 1529 case ReparentNotify:
1517 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1523 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1524 { 1537 {
1525 do 1538 do
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1542
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1544
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1535 1548
1536 scr_refresh (refresh_type); 1549 want_refresh = 1;
1537 } 1550 }
1538 else 1551 else
1539 { 1552 {
1540 XEvent unused_event; 1553 XEvent unused_event;
1541 1554
1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1543 ; 1556 ;
1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1545 ; 1558 ;
1546 1559
1547 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1548 { 1561 {
1549 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1550 scrollbar_show (0); 1563 scrollbar_show (0);
1551 } 1564 }
1552#ifdef MENUBAR
1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1554 menubar_expose ();
1555#endif
1556 1565
1557#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1560#endif 1569#endif
1561 } 1570 }
1562 break; 1571 break;
1563 1572
1564 case MotionNotify: 1573 case MotionNotify:
1565#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1575 if (hidden_pointer)
1567 pointer_unblank (); 1576 pointer_unblank ();
1568#endif 1577#endif
1569#if MENUBAR
1570 if (isMenuBarWindow (ev.xany.window))
1571 {
1572 menubar_control (ev.xbutton);
1573 break;
1574 }
1575#endif
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1579 break;
1578 1580
1579 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1580 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1587 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1589 ;
1585 1590
1586 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1595 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1655#endif 1660#endif
1656 } 1661 }
1657 } 1662 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659 { 1664 {
1660 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1662 ; 1667 ;
1663 1668
1664 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1673 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1675 scrollbar_size ());
1671 scr_refresh (refresh_type); 1676 want_refresh = 1;
1672 refresh_limit = 0; 1677 refresh_limit = 0;
1673 scrollbar_show (1); 1678 scrollbar_show (1);
1674 } 1679 }
1675 break; 1680 break;
1676 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1677} 1709}
1678 1710
1679void 1711void
1680rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1681{ 1713{
1682 if (!focus) 1714 if (!focus)
1683 { 1715 {
1684 focus = 1; 1716 focus = 1;
1685 want_refresh = 1; 1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1686#if USE_XIM 1721#if USE_XIM
1687 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1688 { 1723 {
1689 IMSetStatusPosition (); 1724 IMSetPosition ();
1690 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1691 } 1726 }
1692#endif 1727#endif
1693#if CURSOR_BLINK 1728#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696#endif 1731#endif
1697#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1699 { 1734 {
1700 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1710 if (focus) 1745 if (focus)
1711 { 1746 {
1712 focus = 0; 1747 focus = 0;
1713 want_refresh = 1; 1748 want_refresh = 1;
1714 1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1715#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1716 iso14755buf = 0; 1755 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1756# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1757 scr_overlay_off ();
1758# endif
1759 }
1720#endif 1760#endif
1721#if USE_XIM 1761#if USE_XIM
1722 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1724#endif 1764#endif
… …
1735 } 1775 }
1736#endif 1776#endif
1737 } 1777 }
1738} 1778}
1739 1779
1740#if TRANSPARENT 1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1791}
1792
1793#if TRANSPARENT || ENABLE_PERL
1741void 1794void
1742rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1796{
1744 SET_R (this); 1797 make_current ();
1745 SET_LOCALE (locale);
1746 1798
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return;
1802
1803# if TRANSPARENT
1747 switch (ev.type) 1804 switch (ev.type)
1748 { 1805 {
1749 case PropertyNotify: 1806 case PropertyNotify:
1750 /* 1807 /*
1751 * if user used some Esetroot compatible prog to set the root bg, 1808 * if user used some Esetroot compatible prog to set the root bg,
… …
1759 case ReparentNotify: 1816 case ReparentNotify:
1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1761 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1762 break; 1819 break;
1763 } 1820 }
1821# endif
1764} 1822}
1765#endif 1823#endif
1766 1824
1767void 1825void
1768rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1769{ 1827{
1770 int reportmode = 0, clickintime; 1828 int reportmode = 0, clickintime;
1771 1829
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1830 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1831
1773 if (!bypass_keystate) 1832 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1833 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1834
1776 /* 1835 /*
1777 * VT window processing of button press 1836 * VT window processing of button press
1778 */ 1837 */
1779 if (ev.window == vt) 1838 if (ev.window == vt)
1780 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1781#if ISO_14755 1843#if ISO_14755
1782 // 5.4 1844 // 5.4
1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1784 { 1846 {
1785 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1859#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1860 if (ev.button == MEvent.button && clickintime)
1799 { 1861 {
1800 /* same button, within alloted time */ 1862 /* same button, within alloted time */
1801 MEvent.clicks++; 1863 MEvent.clicks++;
1864
1802 if (MEvent.clicks > 1) 1865 if (MEvent.clicks > 1)
1803 { 1866 {
1804 /* only report double clicks */ 1867 /* only report double clicks */
1805 MEvent.clicks = 2; 1868 MEvent.clicks = 2;
1806 mouse_report (ev); 1869 mouse_report (ev);
… …
1838#else 1901#else
1839 selection.rect = false; 1902 selection.rect = false;
1840#endif 1903#endif
1841 1904
1842 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1907 {
1845 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1847 else 1910 else
1848 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
… …
2013 } 2076 }
2014 2077
2015 break; 2078 break;
2016 } 2079 }
2017 } 2080 }
2081
2018 return; 2082 return;
2019 } 2083 }
2020#if MENUBAR
2021 /*
2022 * Menubar window processing of button press
2023 */
2024 if (isMenuBarWindow (ev.window))
2025 menubar_control (ev);
2026#endif
2027} 2084}
2028 2085
2029void 2086void
2030rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2031{ 2088{
… …
2037 2094
2038 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2039 { 2096 {
2040 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2041 scrollbar_show (0); 2098 scrollbar_show (0);
2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 refresh_type &= ~SMOOTH_REFRESH;
2044#endif
2045 } 2099 }
2046 2100
2047#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2048 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2050#endif 2104#endif
2051 2105
2052 if (ev.window == vt) 2106 if (ev.window == vt)
2053 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2054#if ISO_14755 2111#if ISO_14755
2055 // 5.4 2112 // 5.4
2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2057 return; 2114 return;
2058#endif 2115#endif
2116
2059 if (reportmode) 2117 if (reportmode)
2060 { 2118 {
2061 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2062 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2063 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
2093 { 2151 {
2094 case Button1: 2152 case Button1:
2095 case Button3: 2153 case Button3:
2096 selection_make (ev.time); 2154 selection_make (ev.time);
2097 break; 2155 break;
2156
2098 case Button2: 2157 case Button2:
2099 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2100 break; 2160 break;
2161
2101#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2102 case Button4: 2163 case Button4:
2103 case Button5: 2164 case Button5:
2104 { 2165 {
2105 int i; 2166 int i;
… …
2127 slip_wheel_ev.start (); 2188 slip_wheel_ev.start ();
2128 } 2189 }
2129 else 2190 else
2130 { 2191 {
2131# endif 2192# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2193 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2194 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
2145 } 2196 }
2146#endif 2197# endif
2147 } 2198 }
2148 break; 2199 break;
2149#endif 2200#endif
2150 } 2201 }
2151 } 2202 }
2152#ifdef MENUBAR
2153 else if (isMenuBarWindow (ev.window))
2154 menubar_control (ev);
2155#endif
2156} 2203}
2157 2204
2158#ifdef TRANSPARENT 2205#ifdef TRANSPARENT
2159#if TINTING 2206#if TINTING
2160/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2161 2208
2162typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2163 2210
2164void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2165{ 2212{
2166 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2167 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2168 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2169 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2170 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2171 int i; 2218 int i;
2172 2219
2173 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2174 2221
2175 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2176 2223
2177 /* for convenience */ 2224 /* for convenience */
2178 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
… …
2399 Atom atype; 2446 Atom atype;
2400 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2401 Window root, oldp, *list; 2448 Window root, oldp, *list;
2402 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2403 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2404 dDisp;
2405 2451
2406 pchanged = 0; 2452 pchanged = 0;
2407 2453
2408 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2409 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2410 2456
2411 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2412 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2413 2459
2414 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2415 2461
2416 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2417 { 2463 {
2418 if (am_transparent) 2464 if (am_transparent)
2419 { 2465 {
2420 pchanged = 1; 2466 pchanged = 1;
2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2422 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2423 } 2469 }
2424 2470
2425 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2426 } 2472 }
2427 2473
2428 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2429 XSync (disp, False); 2475 XSync (dpy, False);
2430 2476
2431 /* 2477 /*
2432 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2433 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2434 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2435 */ 2481 */
2436 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2439 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2440 2486
2441 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2442 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2443 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2444 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2445 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2446 2492
2447 if (!i || prop == NULL 2493 if (!i || prop == NULL
2448#if TINTING 2494#if TINTING
2449 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2450#endif 2496#endif
2451 ) 2497 )
2452 have_pixmap = 0; 2498 have_pixmap = 0;
2453 else 2499 else
2454 { 2500 {
… …
2467 Window cr; 2513 Window cr;
2468 XImage *image; 2514 XImage *image;
2469 GC gc; 2515 GC gc;
2470 XGCValues gcvalue; 2516 XGCValues gcvalue;
2471 2517
2472 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2473 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2474 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2475 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2476 nx = ny = 0; 2522 nx = ny = 0;
2477 2523
… …
2490 } 2536 }
2491 2537
2492 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2493 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494 2540
2495 XSync (disp, False); 2541 XSync (dpy, False);
2496 allowedxerror = -1; 2542 allowedxerror = -1;
2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2498 2544
2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2500 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2501 allowedxerror = 0; 2547 allowedxerror = 0;
2502 2548
… …
2505 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2506 { 2552 {
2507 pchanged = 1; 2553 pchanged = 1;
2508 if (pixmap != None) 2554 if (pixmap != None)
2509 { 2555 {
2510 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2511 pixmap = None; 2557 pixmap = None;
2512 } 2558 }
2513 } 2559 }
2514 2560
2515 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2516 } 2562 }
2517 else 2563 else
2518 { 2564 {
2519 if (pixmap != None) 2565 if (pixmap != None)
2520 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2521 2567
2522#if TINTING 2568#if TINTING
2523 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2524 { 2570 {
2525 unsigned short rm, gm, bm;
2526 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2527 2572
2573 rgba c;
2528 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2529 2575
2530 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2531 } 2577 }
2532#endif 2578#endif
2533 2579
2534 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2535 szHint.width, szHint.height, image->depth);
2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2537 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2538 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2539 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2540 XDestroyImage (image); 2585 XDestroyImage (image);
2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2542 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2543 2588
2544 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2545 pchanged = 1; 2590 pchanged = 1;
2546 2591
2547 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2548 } 2593 }
2549 } 2594 }
2550 2595
2551 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2553 else 2598 else
2554 { 2599 {
2555 unsigned int n; 2600 unsigned int n;
2556 /* 2601 /*
2557 * InheritPixmap transparency 2602 * InheritPixmap transparency
2558 */ 2603 */
2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2560 { 2605 {
2561 oldp = parent[i]; 2606 oldp = parent[i];
2562 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2563 &parent[i], &list, &n);
2564 XFree (list); 2608 XFree (list);
2565 2609
2566 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2567 { 2611 {
2568 if (oldp != None) 2612 if (oldp != None)
… …
2576 } 2620 }
2577 2621
2578 n = 0; 2622 n = 0;
2579 2623
2580 if (pchanged) 2624 if (pchanged)
2581 {
2582 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2583 { 2626 {
2584 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2586 { 2630 {
2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2588 break; 2632 break;
2589 } 2633 }
2590 } 2634 }
2591 }
2592 2635
2593 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2594 { 2637 {
2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2597 am_transparent = 0; 2640 am_transparent = 0;
2598 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2599 } 2642 }
2600 else 2643 else
2601 { 2644 {
2602#if WAIT_FOR_WM
2603 /* wait (an arbitrary period) for the WM to do its thing
2604 * needed for fvwm2.2.2 (and before?) */
2605 sleep (1);
2606#endif
2607 for (n = 0; n < (unsigned int)i; n++) 2645 for (n = 0; n < (unsigned int)i; n++)
2608 { 2646 {
2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2610 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2611 } 2649 }
2612 2650
2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2614 am_transparent = 1; 2652 am_transparent = 1;
2615 } 2653 }
2616 2654
2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2618 parent[i] = None; 2656 parent[i] = None;
2619 } 2657 }
2620 2658
2621 if (scrollBar.win) 2659 if (scrollBar.win)
2622 { 2660 {
2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2624 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2625 scrollbar_show (0); 2663 scrollbar_show (0);
2626 } 2664 }
2627 2665
2628 if (am_transparent) 2666 if (am_transparent)
… …
2640 2678
2641bool 2679bool
2642rxvt_term::cmd_parse () 2680rxvt_term::cmd_parse ()
2643{ 2681{
2644 bool flag = false; 2682 bool flag = false;
2645 unicode_t ch = NOCHAR; 2683 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2684 char *seq_begin; // remember start of esc-sequence here
2647 2685
2648 for (;;) 2686 for (;;)
2649 { 2687 {
2650 if (ch == NOCHAR) 2688 if (ch == NOCHAR)
2651 { 2689 {
2652 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2691 ch = next_char ();
2654 }
2655 2692
2656 if (ch == NOCHAR) // TODO: improve 2693 if (ch == NOCHAR)
2657 break; 2694 break;
2695 }
2658 2696
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2697 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2698 {
2661 if (!seen_input) 2699 if (!seen_input)
2662 { 2700 {
… …
2671 if (seen_resize && cmd_pid) 2709 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2710 kill (-cmd_pid, SIGWINCH);
2673 } 2711 }
2674 2712
2675 /* Read a text string from the input buffer */ 2713 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2714 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2715 bool refreshnow = false;
2678 int nlines = 0; 2716 int nlines = 0;
2679 unicode_t *str = buf; 2717 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2718 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2719
2682 for (;;) 2720 for (;;)
2683 { 2721 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2722 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2723 break;
… …
2695 2733
2696 if (!OPTION (Opt_jumpScroll) 2734 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2736 {
2699 refreshnow = true; 2737 refreshnow = true;
2738 refresh_count = 0;
2700 ch = NOCHAR; 2739 ch = NOCHAR;
2701 break; 2740 break;
2702 } 2741 }
2703 2742
2704 // scr_add_lines only works for nlines <= nrow - 1. 2743 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2744 if (nlines >= nrow - 1)
2706 { 2745 {
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2749
2708 nlines = 0; 2750 nlines = 0;
2709 str = buf; 2751 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2752 eol = str + min (ncol, UBUFSIZ);
2711 } 2753 }
2712 2754
… …
2725 2767
2726 seq_begin = cmdbuf_ptr; 2768 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2769 ch = next_char ();
2728 } 2770 }
2729 2771
2772 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2774 scr_add_lines (buf, str - buf, nlines);
2731 2775
2732 /* 2776 /*
2733 * If there have been a lot of new lines, then update the screen 2777 * If there have been a lot of new lines, then update the screen
2734 * What the heck I'll cheat and only refresh less than every page-full. 2778 * What the heck I'll cheat and only refresh less than every page-full.
2735 * the number of pages between refreshes is refresh_limit, which 2779 * the number of pages between refreshes is refresh_limit, which
… …
2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2741 refresh_limit++; 2785 refresh_limit++;
2742 else 2786 else
2743 { 2787 {
2744 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2745 scr_refresh (refresh_type); 2790 scr_refresh ();
2791 want_refresh = 1;
2746 } 2792 }
2747 } 2793 }
2748 2794
2749 } 2795 }
2750 else 2796 else
… …
2765 } 2811 }
2766 2812
2767 return flag; 2813 return flag;
2768} 2814}
2769 2815
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2816// read the next character
2780unicode_t 2817wchar_t
2781rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2782{ 2819{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2821 {
2785 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2824 return *cmdbuf_ptr++;
2788 2825
2789 wchar_t wc; 2826 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2827 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2828
2792 if (len == (size_t)-2) 2829 if (len == (size_t)-2)
2793 { 2830 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2831 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2832 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2833 break;
2797 } 2834 }
2798 2835
2799 if (len == (size_t)-1) 2836 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2837 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2838
2802 // assume wchar == unicode 2839 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2840 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2841 return wc & UNICODE_MASK;
2805 } 2842 }
2806 2843
2807 return NOCHAR; 2844 return NOCHAR;
2808} 2845}
2846
2847// read the next octet
2848uint32_t
2849rxvt_term::next_octet () NOTHROW
2850{
2851 return cmdbuf_ptr < cmdbuf_endp
2852 ? (unsigned char)*cmdbuf_ptr++
2853 : NOCHAR;
2854}
2855
2856static class out_of_input out_of_input;
2809 2857
2810/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2811/* 2859/*
2812 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2813 * to the command. 2861 * to the command.
2814 */ 2862 */
2815unicode_t 2863wchar_t
2816rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2817{ 2865{
2818 unicode_t c = next_char (); 2866 wchar_t c = next_char ();
2819 2867
2820 if (c == NOCHAR) 2868 if (c == NOCHAR)
2821 throw out_of_input; 2869 throw out_of_input;
2822 2870
2823 return c; 2871 return c;
2824} 2872}
2825 2873
2826unicode_t 2874uint32_t
2827rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2828{ 2876{
2829 unicode_t c = next_octet (); 2877 uint32_t c = next_octet ();
2830 2878
2831 if (c == NOCHAR) 2879 if (c == NOCHAR)
2832 throw out_of_input; 2880 throw out_of_input;
2833 2881
2834 return c; 2882 return c;
… …
2934 case C0_ESC: 2982 case C0_ESC:
2935 process_escape_seq (); 2983 process_escape_seq ();
2936 break; 2984 break;
2937 case C0_ENQ: /* terminal Status */ 2985 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 2986 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2987 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 2988 else
2942 tt_write ((unsigned char *)VT100_ANS, 2989 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 2990 break;
2945 case C0_BEL: /* bell */ 2991 case C0_BEL: /* bell */
2946 scr_bell (); 2992 scr_bell ();
2947 break; 2993 break;
2948 case C0_BS: /* backspace */ 2994 case C0_BS: /* backspace */
… …
3072 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3073 break; 3119 break;
3074 case '+': 3120 case '+':
3075 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3076 break; 3122 break;
3077#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3078 case '6': 3124 case '6':
3079 scr_backindex (); 3125 scr_backindex ();
3080 break; 3126 break;
3081#endif 3127#endif
3082 case '7': 3128 case '7':
3083 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3084 break; 3130 break;
3085 case '8': 3131 case '8':
3086 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3087 break; 3133 break;
3088#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3089 case '9': 3135 case '9':
3090 scr_forwardindex (); 3136 scr_forwardindex ();
3091 break; 3137 break;
3092#endif 3138#endif
3093 case '=': 3139 case '=':
… …
3103 break; 3149 break;
3104 3150
3105 /* 8.3.87: NEXT LINE */ 3151 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3152 case C1_NEL: /* ESC E */
3107 { 3153 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3154 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3155 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3156 }
3111 break; 3157 break;
3112 3158
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3159 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3160 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3182 process_dcs_seq ();
3137 break; 3183 break;
3138 3184
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3185 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3186 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3187 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3188 break; /* steal obsolete ESC [ c */
3144 3189
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3190 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3191 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3192 process_csi_seq ();
… …
3256 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3257 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3258 if (arg[p] == -1) 3303 if (arg[p] == -1)
3259 arg[p] = ndef; 3304 arg[p] = ndef;
3260 3305
3261#ifdef DEBUG_CMD
3262 fprintf (stderr, "CSI ");
3263 for (p = 0; p < nargs; p++)
3264 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3265 fprintf (stderr, "%c\n", ch);
3266#endif
3267
3268 /* 3306 /*
3269 * private mode handling 3307 * private mode handling
3270 */ 3308 */
3271 if (priv) 3309 if (priv)
3272 { 3310 {
3273 switch (priv) 3311 switch (priv)
3274 { 3312 {
3275 case '>': 3313 case '>':
3276 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3277 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3315 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do).
3322 //
3323 tt_printf ("\033[>%d;94;0c", 'U');
3324 }
3278 break; 3325 break;
3279 case '?': 3326 case '?':
3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3281 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3282 break; 3329 break;
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3438 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3439 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3440 break;
3394 3441
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3442 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3443 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3444 break;
3399 3445
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3446 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3447 process_sgr_mode (nargs, arg);
3402 break; 3448 break;
… …
3486 break; 3532 break;
3487 case CSI_75: 3533 case CSI_75:
3488 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3489 break; 3535 break;
3490 3536
3491#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3492 case CSI_74: 3538 case CSI_74:
3493 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3494 break; 3540 break;
3495#endif 3541#endif
3496 3542
… …
3503 break; 3549 break;
3504 } 3550 }
3505} 3551}
3506/*}}} */ 3552/*}}} */
3507 3553
3508#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3509/* ARGSUSED */ 3555/* ARGSUSED */
3510void 3556void
3511rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3512{ 3558{
3513 int x, y; 3559 int x, y;
3514 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3515 Window wdummy; 3561 Window wdummy;
3516 dDisp; 3562
3563 dLocal (Display *, dpy);
3517 3564
3518 if (nargs == 0) 3565 if (nargs == 0)
3519 return; 3566 return;
3520 3567
3521 switch (args[0]) 3568 switch (args[0])
3522 { 3569 {
3523 /* 3570 /*
3524 * commands 3571 * commands
3525 */ 3572 */
3526 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3527 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3528 break; 3575 break;
3529 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3530 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3531 break; 3578 break;
3532 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3533 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3534 break; 3581 break;
3535 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3537 break; 3584 break;
3538 case 5: /* raise window */ 3585 case 5: /* raise window */
3539 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3540 break; 3587 break;
3541 case 6: /* lower window */ 3588 case 6: /* lower window */
3542 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3543 break; 3590 break;
3544 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3545 scr_touch (true); 3592 scr_touch (true);
3546 break; 3593 break;
3547 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
… …
3554 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3555 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3556 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3557 break; 3604 break;
3558 3605
3559
3560 /* 3606 /*
3561 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3562 */ 3608 */
3563 case 11: /* report window state */ 3609 case 11: /* report window state */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3566 break; 3612 break;
3567 case 13: /* report window position */ 3613 case 13: /* report window position */
3568 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3569 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3570 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3571 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3572 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3573 break; 3619 break;
3574 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3575 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3577 break; 3623 break;
3578 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3579 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3580 break; 3626 break;
… …
3582 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3583 break; 3629 break;
3584 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3585 { 3631 {
3586 char *s; 3632 char *s;
3587 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3589 XFree (s); 3635 XFree (s);
3590 } 3636 }
3591 break; 3637 break;
3592 case 21: /* report window title */ 3638 case 21: /* report window title */
3593 { 3639 {
3594 char *s; 3640 char *s;
3595 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3597 XFree (s); 3643 XFree (s);
3598 } 3644 }
3599 break; 3645 break;
3600 } 3646 }
… …
3604/*----------------------------------------------------------------------*/ 3650/*----------------------------------------------------------------------*/
3605/* 3651/*
3606 * get input up until STRING TERMINATOR (or BEL) 3652 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3653 * ends_how is terminator used. returned input must be free()'d
3608 */ 3654 */
3609unsigned char * 3655char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3656rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3657{
3612 unicode_t ch; 3658 unicode_t ch;
3613 bool seen_esc = false; 3659 bool seen_esc = false;
3614 unsigned int n = 0; 3660 unsigned int n = 0;
… …
3647 3693
3648 string[n++] = '\0'; 3694 string[n++] = '\0';
3649 3695
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3696 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3697
3652 return (unsigned char *)rxvt_wcstombs (string); 3698 return rxvt_wcstombs (string);
3653} 3699}
3654 3700
3655/*----------------------------------------------------------------------*/ 3701/*----------------------------------------------------------------------*/
3656/* 3702/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3703 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3704 */
3659void 3705void
3660rxvt_term::process_dcs_seq () 3706rxvt_term::process_dcs_seq ()
3661{ 3707{
3662 unsigned char *s; 3708 char *s;
3663 unicode_t eh; 3709 unicode_t eh;
3664 3710
3665 /* 3711 /*
3666 * Not handled yet 3712 * Not handled yet
3667 */ 3713 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3732 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3733 arg = arg * 10 + (ch - '0');
3688 3734
3689 if (ch == ';') 3735 if (ch == ';')
3690 { 3736 {
3691 unsigned char *s = get_to_st (eh); 3737 char *s = get_to_st (eh);
3692 3738
3693 if (s) 3739 if (s)
3694 { 3740 {
3695 process_xterm_seq (arg, (char *)s, eh); 3741 process_xterm_seq (arg, s, eh);
3696 free (s); 3742 free (s);
3697 } 3743 }
3698 } 3744 }
3699} 3745}
3700 3746
3701void 3747void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3748rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3749{
3704 if (str[0] == '?' && !str[1]) 3750 if (str[0] == '?' && !str[1])
3705 { 3751 {
3706 unsigned short r, g, b; 3752 rgba c;
3707 pix_colors_focused[color].get (display, r, g, b); 3753 pix_colors_focused[color].get (c);
3754
3755#if XFT
3756 if (c.a != rgba::MAX_CC)
3757 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3758 else
3759#endif
3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3760 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3709 } 3761 }
3710 else 3762 else
3711 set_window_color (color, str); 3763 set_window_color (color, str);
3712} 3764}
3713 3765
3714/* 3766/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3768 */
3717void 3769void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3770rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3771{
3720 int changed = 0;
3721 int color; 3772 int color;
3722 char *buf, *name; 3773 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3774 bool query = str[0] == '?' && !str[1];
3724 int saveop = op; 3775 int saveop = op;
3725 dDisp; 3776
3777 dLocal (Display *, dpy);
3726 3778
3727 assert (str != NULL); 3779 assert (str != NULL);
3780
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return;
3783
3728 switch (op) 3784 switch (op)
3729 { 3785 {
3730 case XTerm_name: 3786 case XTerm_name:
3731 set_title (str); 3787 set_title (str);
3732 /* FALLTHROUGH */ 3788 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3802 unsigned long bytes_after;
3747 unsigned char *value = 0; 3803 unsigned char *value = 0;
3748 const char *str = ""; 3804 const char *str = "";
3749 3805
3750 if (prop 3806 if (prop
3751 && XGetWindowProperty (disp, parent[0], 3807 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3808 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3809 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3810 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3811 && actual_type != None
3756 && actual_format == 8) 3812 && actual_format == 8)
3757 str = (const char *)(value); 3813 str = (const char *)(value);
3758 3814
3759 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3815 tt_printf ("\033]%d;%s%c", op, str, resp);
3760 3816
3761 XFree (value); 3817 XFree (value);
3762 } 3818 }
3763 else 3819 else
3764 { 3820 {
… …
3768 { 3824 {
3769 *eq = 0; 3825 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3826 set_utf8_property (display->atom (str), eq + 1);
3771 } 3827 }
3772 else 3828 else
3773 XDeleteProperty (disp, parent[0], 3829 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3830 display->atom (str));
3775 } 3831 }
3776 break; 3832 break;
3777 3833
3778 case XTerm_Color: 3834 case XTerm_Color:
… …
3780 { 3836 {
3781 if ((name = strchr (buf, ';')) == NULL) 3837 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3838 break;
3783 3839
3784 *name++ = '\0'; 3840 *name++ = '\0';
3785 color = atoi (buf); 3841 color = atoi (buf) + minCOLOR;
3786 3842
3787 if (color < 0 || color >= TOTAL_COLORS) 3843 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3844 break;
3789 3845
3790 if ((buf = strchr (name, ';')) != NULL) 3846 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3847 *buf++ = '\0';
3792 3848
3793 if (name[0] == '?' && !name[1]) 3849 process_color_seq (op, color, name, resp);
3794 {
3795 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 }
3799 else
3800 set_window_color (color + minCOLOR, name);
3801 } 3850 }
3802 break; 3851 break;
3803 case XTerm_Color00: 3852 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (op, Color_fg, str, resp);
3805 break; 3854 break;
3806 case XTerm_Color01: 3855 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (op, Color_bg, str, resp);
3808 break; 3857 break;
3809#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (op, Color_cursor, str, resp);
3812 break; 3861 break;
3813#endif 3862#endif
3814 case XTerm_Color_pointer_fg: 3863 case XTerm_Color_pointer_fg:
3815 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3864 process_color_seq (op, Color_pointer_fg, str, resp);
3816 break; 3865 break;
3817 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (op, Color_pointer_bg, str, resp);
3819 break; 3868 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3821 case XTerm_Color_BD:
3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3823 break;
3824 case XTerm_Color_UL:
3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3826 break;
3827 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3829 break; 3880 break;
3830 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (op, Color_IT, str, resp);
3832 break; 3883 break;
3833#endif 3884#endif
3834#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3835 case URxvt_Color_tint: 3886 case URxvt_Color_tint:
3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3887 process_color_seq (op, Color_tint, str, resp);
3888
3837 check_our_parents (); 3889 check_our_parents ();
3890
3838 if (am_transparent) 3891 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3892 want_full_refresh = want_refresh = 1;
3840 break;
3841#endif
3842 3893
3894 break;
3895#endif
3896
3843 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3844 if (*str != ';') 3899 if (*str != ';')
3845 { 3900 {
3846#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3904 scr_touch (true);
3905#endif
3851 } 3906 }
3907
3908 int changed = 0;
3909
3852 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3853 { 3911 {
3854 str++; 3912 str++;
3855#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3857#endif 3915#endif
3858 } 3916 }
3859 3917
3860 if (changed) 3918 if (changed)
3861 { 3919 {
3862#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3921 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3922 scr_touch (true);
3923#endif
3866 } 3924 }
3925 }
3867 break; 3926 break;
3868 3927
3869 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3871 break; 3930 break;
3872 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3874 break; 3933 break;
3875 3934
3876 case XTerm_logfile: 3935 case XTerm_logfile:
3877 // TODO, when secure mode? 3936 // TODO, when secure mode?
3878 break; 3937 break;
3879 3938
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0 3939#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3888 { 3941 {
3889 int fd; 3942 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3944 {
3892 scr_dump (fd); 3945 scr_dump (fd);
… …
3916 allocated.push_back ((void *)res); 3969 allocated.push_back ((void *)res);
3917 set_fonts (); 3970 set_fonts ();
3918 } 3971 }
3919 break; 3972 break;
3920 3973
3921#if ENABLE_FRILLS 3974 case URxvt_version:
3975 if (query)
3976 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3977 op,
3978 rs[Rs_name], VERSION[0], VERSION[2],
3979 resp);
3980 break;
3981
3982#if !ENABLE_MINIMAL
3922 case URxvt_locale: 3983 case URxvt_locale:
3923 if (query) 3984 if (query)
3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3925 else 3986 else
3926 { 3987 {
3927 set_locale (str); 3988 set_locale (str);
3928 pty.set_utf8_mode (enc_utf8); 3989 pty->set_utf8_mode (enc_utf8);
3929 init_xlocale (); 3990 init_xlocale ();
3930 } 3991 }
3931 break; 3992 break;
3932 3993
3933 case URxvt_view_up: 3994 case URxvt_view_up:
3934 case URxvt_view_down: 3995 case URxvt_view_down:
3996 {
3935 int lines = atoi (str); 3997 int lines = atoi (str);
3936 3998
3937 if (lines) 3999 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4000 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4001 else
3940 {
3941 scr_erase_savelines (); 4002 scr_erase_savelines ();
3942 } 4003 }
3943 4004
4005 break;
4006#endif
4007
4008#if ENABLE_PERL
4009 case URxvt_perl:
4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4011 ; // no responses yet
3944 break; 4012 break;
3945#endif 4013#endif
3946 } 4014 }
3947} 4015}
3948/*----------------------------------------------------------------------*/ 4016/*----------------------------------------------------------------------*/
… …
3979 return state; 4047 return state;
3980} 4048}
3981 4049
3982/* we're not using priv _yet_ */ 4050/* we're not using priv _yet_ */
3983void 4051void
3984rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4052rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3985{ 4053{
3986 unsigned int i, j; 4054 unsigned int i, j;
3987 int state; 4055 int state;
3988 4056
3989 static const struct 4057 static const struct
… …
4000 { 5, PrivMode_rVideo }, 4068 { 5, PrivMode_rVideo },
4001 { 6, PrivMode_relOrigin }, 4069 { 6, PrivMode_relOrigin },
4002 { 7, PrivMode_Autowrap }, 4070 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode 4071 // 8, bi-directional support mode
4004 { 9, PrivMode_MouseX10 }, 4072 { 9, PrivMode_MouseX10 },
4005#ifdef menuBar_esc
4006 { menuBar_esc, PrivMode_menuBar },
4007#endif
4008 // 18, 19 printing-related 4073 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor }, 4074 { 25, PrivMode_VisibleCursor },
4010#ifdef scrollBar_esc 4075#ifdef scrollBar_esc
4011 { scrollBar_esc, PrivMode_scrollBar }, 4076 { scrollBar_esc, PrivMode_scrollBar },
4012#endif 4077#endif
… …
4059 /* extra handling for values with state unkept */ 4124 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4125 switch (arg[i])
4061 { 4126 {
4062#if ENABLE_STYLES 4127#if ENABLE_STYLES
4063 case 1021: 4128 case 1021:
4064 if (mode) 4129 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4130
4069 want_refresh = 1; 4131 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4132 break;
4072#endif 4133#endif
4073 case 1048: /* alternative cursor save */ 4134 case 1048: /* alternative cursor save */
4074 case 1049: 4135 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4136 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4156 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4157 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4158 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4159 break;
4099 case 4: /* smooth scrolling */ 4160 case 4: /* smooth scrolling */
4100 if (!state) 4161 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4162 break;
4105 case 5: /* reverse video */ 4163 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4164 scr_rvideo_mode (state);
4107 break; 4165 break;
4108 case 6: /* relative/absolute origins */ 4166 case 6: /* relative/absolute origins */
… …
4114 /* case 8: - auto repeat, can't do on a per window basis */ 4172 /* case 8: - auto repeat, can't do on a per window basis */
4115 case 9: /* X10 mouse reporting */ 4173 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 4175 priv_modes &= ~PrivMode_MouseX11;
4118 break; 4176 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 4177#ifdef scrollBar_esc
4127 case scrollBar_esc: 4178 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 4179 if (scrollbar_mapping (state))
4129 { 4180 {
4130 resize_all_windows (0, 0, 0); 4181 resize_all_windows (0, 0, 0);
… …
4149#if 0 4200#if 0
4150 case 1001: 4201 case 1001:
4151 break; /* X11 mouse highlighting */ 4202 break; /* X11 mouse highlighting */
4152#endif 4203#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4204 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4205 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4206 break;
4159 case 1011: /* scroll to bottom on key press */ 4207 case 1011: /* scroll to bottom on key press */
4160 if (state) 4208 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4209 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4210 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4211 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4212 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4213 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4351 scr_color (Color_bg, Color_bg);
4307 break; 4352 break;
4308 4353
4309 //case 50: // not variable spacing 4354 //case 50: // not variable spacing
4310 4355
4311#ifndef NO_BRIGHTCOLOR 4356#if !ENABLE_MINIMAL
4312 case 90: 4357 case 90:
4313 case 91: /* set bright fg color */ 4358 case 91: /* set bright fg color */
4314 case 92: 4359 case 92:
4315 case 93: 4360 case 93:
4316 case 94: 4361 case 94:
… …
4361 */ 4406 */
4362void 4407void
4363rxvt_term::tt_printf (const char *fmt,...) 4408rxvt_term::tt_printf (const char *fmt,...)
4364{ 4409{
4365 va_list arg_ptr; 4410 va_list arg_ptr;
4366 unsigned char buf[256]; 4411 char buf[256];
4367 4412
4368 va_start (arg_ptr, fmt); 4413 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4414 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4415 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4416 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4421 * or generated by us in response to a query ESC sequence.
4377 */ 4422 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4423const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4424
4380void 4425void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4426rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4427{
4428 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4429 return;
4430
4431 if (pty->pty < 0)
4432 return;
4433
4383 if (v_buflen == 0) 4434 if (v_buflen == 0)
4384 { 4435 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4436 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4386 4437
4387 if ((unsigned int)written == len) 4438 if ((unsigned int)written == len)
4388 return; 4439 return;
4389 4440
4390 data += written; 4441 data += written;
4391 len -= written; 4442 len -= written;
4392 } 4443 }
4393 4444
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4445 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4446
4396 memcpy (v_buffer + v_buflen, data, len); 4447 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4448 v_buflen += len;
4398 4449
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4450 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400} 4451}
4401 4452
4402void rxvt_term::pty_write () 4453void rxvt_term::pty_write ()
4403{ 4454{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405 4456
4406 if (written > 0) 4457 if (written > 0)
4407 { 4458 {
4408 v_buflen -= written; 4459 v_buflen -= written;
4409 4460

Diff Legend

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