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.226 by root, Sun Jan 1 15:03:49 2006 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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