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.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

… …
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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
… …
155 } 158 }
156 159
157 x--; 160 x--;
158 } 161 }
159} 162}
160#endif
161 163
162void 164void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 166{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
… …
189 190
190 char attr[80]; // plenty 191 char attr[80]; // plenty
191 192
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 194 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 195 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 196 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 197 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 198 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 199 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 200 r & RS_Uline ? " uline" : "",
… …
226# if !UNICODE3 227# if !UNICODE3
227 if (ch >= 0x10000) 228 if (ch >= 0x10000)
228 ch = 0xfffd; 229 ch = 0xfffd;
229# endif 230# endif
230 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
231 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
232 } 235 }
233 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
234 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
235 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
236 244
237 free (fname); 245 free (fname);
238 246
239# if ENABLE_COMBINING 247# if ENABLE_COMBINING
240 if (alloc) 248 if (alloc)
241 delete [] alloc; 249 delete [] alloc;
242# endif 250# endif
243#endif
244} 251}
252#endif
245 253
246void 254void
247rxvt_term::commit_iso14755 () 255rxvt_term::commit_iso14755 ()
248{ 256{
249 wchar_t ch[2]; 257 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 272 mb[0] = ch[0];
265 len = 1; 273 len = 1;
266 } 274 }
267 275
268 if (len > 0) 276 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
270 else 278 else
271 scr_bell (); 279 scr_bell ();
272 } 280 }
273 281
274 iso14755buf = 0; 282 iso14755buf = 0;
… …
298rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
299{ 307{
300 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
301 unsigned int newlen; 309 unsigned int newlen;
302 KeySym keysym; 310 KeySym keysym;
303#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */
305#endif
306 int valid_keysym; 311 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
308 313
309 /* 314 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
312 * 317 *
… …
330 Status status_return; 335 Status status_return;
331 336
332#if 0 337#if 0
333#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 339 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
337 else 342 else
338#endif 343#endif
339#endif 344#endif
340 { 345 {
… …
377 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
378 } 383 }
379 else 384 else
380#endif 385#endif
381 { 386 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
384 } 389 }
385 390
386 if (valid_keysym) 391 if (valid_keysym)
387 { 392 {
… …
439 scr_move_to (0, 1); 444 scr_move_to (0, 1);
440 return; 445 return;
441 } 446 }
442 else if (keysym == XK_End) 447 else if (keysym == XK_End)
443 { 448 {
444 scr_move_to (1, 0); 449 scr_move_to (1, 1);
445 return; 450 return;
446 } 451 }
447 } 452 }
448#endif 453#endif
449 } 454 }
… …
460 { 465 {
461 switch (keysym) 466 switch (keysym)
462 { 467 {
463 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
464 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
465 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
466 return; 471 return;
467#if TODO 472#if TODO
468 /* rxvt extras */ 473 /* rxvt extras */
469 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
470 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
851 { 856 {
852#ifdef META8_OPTION 857#ifdef META8_OPTION
853 /* set 8-bit on */ 858 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
855 { 860 {
856 unsigned char *ch; 861 char *ch;
857 862
858 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 864 *ch |= 0x80;
860 865
861 meta = 0; 866 meta = 0;
… …
863#endif 868#endif
864 /* nil */ ; 869 /* nil */ ;
865 } 870 }
866 } 871 }
867 872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875
868 if (len <= 0) 876 if (len <= 0)
869 return; /* not mapped */ 877 return; /* not mapped */
870 878
871 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
872 if (view_start) 880 if (view_start)
873 { 881 {
874 view_start = 0; 882 view_start = 0;
875 want_refresh = 1; 883 want_refresh = 1;
876 } 884 }
… …
894#ifdef META8_OPTION 902#ifdef META8_OPTION
895 && meta_char == C0_ESC 903 && meta_char == C0_ESC
896#endif 904#endif
897 ) 905 )
898 { 906 {
899 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
900 tt_write (&ch, 1); 908 tt_write (&ch, 1);
901 } 909 }
902 910
903#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */
905 unsigned char *p;
906 int i;
907
908 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
909 for (i = 0, p = kbuf; i < len; i++, p++)
910 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
911 fprintf (stderr, "'\n");
912#endif /* DEBUG_CMD */
913 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
914} 912}
915/*}}} */ 913/*}}} */
916 914
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */
920unsigned int 916unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 918{
923 unsigned int n, s; 919 unsigned int n, s;
924 920
925 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 959 }
964#endif 960#endif
965 961
966 if (want_refresh) 962 if (want_refresh)
967 { 963 {
964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
965 {
966 int row = view_start;
967 int end_row = row + nrow;
968
969 while (row > top_row && ROW (row - 1).is_longer ())
970 --row;
971
972 do
973 {
974 int start_row = row;
975 line_t *l;
976
977 do
978 {
979 l = &ROW (row++);
980
981 if (!(l->f & LINE_FILTERED))
982 {
983 // line not filtered, mark it as filtered
984 l->f |= LINE_FILTERED;
985 while (l->is_longer ())
986 {
987 l = &ROW (row++);
988 l->f |= LINE_FILTERED;
989 }
990
991 // and filter it
992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
993
994 break;
995 }
996 }
997 while (l->is_longer () && row < end_row);
998 }
999 while (row < end_row);
1000 }
1001
968 scr_refresh (refresh_type); 1002 scr_refresh ();
969 scrollbar_show (1); 1003 scrollbar_show (1);
970#ifdef USE_XIM 1004#ifdef USE_XIM
971 IMSendSpot (); 1005 IMSendSpot ();
972#endif 1006#endif
973 } 1007 }
… …
976} 1010}
977 1011
978void 1012void
979rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
980{ 1014{
981 SET_R (this); 1015 make_current ();
982 SET_LOCALE (locale);
983 1016
984 display->flush (); 1017 display->flush ();
985 1018
986 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1021}
989 1022
990void 1023void
991rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
992{ 1025{
993 SET_R (this); 1026 make_current ();
994 SET_LOCALE (locale);
995 1027
996 refresh_limit = 1; 1028 refresh_limit = 1;
997 refresh_count = 0; 1029 refresh_count = 0;
998 flush (); 1030 flush ();
999} 1031}
… …
1003rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
1004{ 1036{
1005 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
1006 want_refresh = 1; 1038 want_refresh = 1;
1007 1039
1008 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1009} 1041}
1010#endif 1042#endif
1011 1043
1012#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1013void 1045void
… …
1027rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1028{ 1060{
1029 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1030 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1031 { 1063 {
1032 refresh_type |= SMOOTH_REFRESH;
1033 want_refresh = 1; 1064 want_refresh = 1;
1034 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1035 } 1066 }
1036} 1067}
1037#endif 1068#endif
… …
1041rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1042{ 1073{
1043 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1044 { 1075 {
1045 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1046 refresh_type |= SMOOTH_REFRESH;
1047 want_refresh = 1; 1077 want_refresh = 1;
1048 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1049 } 1079 }
1050} 1080}
1051#endif 1081#endif
… …
1056{ 1086{
1057 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1059 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1060 { 1090 {
1061 if (view_start == nsaved || 1091 if (view_start == top_row || view_start == 0)
1062 view_start == 0)
1063 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1064 1093
1065 refresh_type |= SMOOTH_REFRESH;
1066 want_refresh = 1; 1094 want_refresh = 1;
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1096 }
1069} 1097}
1070#endif 1098#endif
1071 1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif
1117
1072bool 1118bool
1073rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1074{ 1120{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1122
1077 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1078 { 1124 {
1079 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1125 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1080 n = 0; 1126 n = 0;
1081 } 1127 }
1082 1128
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1086 1132
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1088 1134
1089 if (n > 0) 1135 if (r > 0)
1090 { 1136 {
1091 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1092 return true; 1138 return true;
1093 } 1139 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 {
1142#if HAVE_SCHED_YIELD
1143 if (display->is_local)
1144 event_handler.cw_yield.start ();
1145#endif
1146 }
1147 else
1095 { 1148 {
1096 pty_ev.stop (); 1149 pty_ev.stop ();
1097 1150
1098 if (!(options & Opt_hold)) 1151 if (!OPTION (Opt_hold))
1099 destroy (); 1152 destroy ();
1100 } 1153 }
1101 1154
1102 return false; 1155 return false;
1103} 1156}
1104 1157
1105void 1158void
1106rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1107{ 1160{
1108 SET_R (this); 1161 make_current ();
1109 SET_LOCALE (locale);
1110 1162
1111 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1112 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1113 while (pty_fill ()) 1165 while (pty_fill ())
1114 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1119} 1171}
1120 1172
1121void 1173void
1122rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1123{ 1175{
1124 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1125 recolour_cursor (); 1177 recolour_cursor ();
1126 1178
1127#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1128 hidden_pointer = 0; 1180 hidden_pointer = 0;
1129 1181
1130 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1131 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1132#endif 1184#endif
1133} 1185}
1134 1186
1135#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1136void 1188void
1137rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1138{ 1190{
1139 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1140 return; 1192 return;
1141 1193
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1143 XFlush (display->display); 1195 XFlush (xdisp);
1144 1196
1145 hidden_pointer = 1; 1197 hidden_pointer = 1;
1146} 1198}
1147 1199
1148void 1200void
1149rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1150{ 1202{
1151 SET_R (this); 1203 make_current ();
1152 SET_LOCALE (locale);
1153 1204
1154 pointer_blank (); 1205 pointer_blank ();
1155} 1206}
1156#endif 1207#endif
1157 1208
… …
1222 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1223 (32 + x + 1), 1274 (32 + x + 1),
1224 (32 + y + 1)); 1275 (32 + y + 1));
1225} 1276}
1226 1277
1227#ifdef USING_W11LIB
1228void
1229rxvt_W11_process_x_event (XEvent *ev)
1230{
1231 rxvt_t *r = rxvt_get_r ();
1232
1233 x_cb (*ev);
1234}
1235#endif
1236
1237/*{{{ process an X event */ 1278/*{{{ process an X event */
1238void 1279void
1239rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1240{ 1281{
1241 dDisp; 1282 make_current ();
1242 1283
1243 SET_R (this); 1284 dLocal (Display *, xdisp);
1244 SET_LOCALE (locale);
1245 1285
1246#if defined(CURSOR_BLINK) 1286 if (ev.xany.window == vt
1247 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1248 { 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1249 if (hidden_cursor) 1289 return;
1250 {
1251 hidden_cursor = 0;
1252 want_refresh = 1;
1253 }
1254 1290
1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 // for XQueryPointer
1256 }
1257#endif
1258
1259#if defined(POINTER_BLANK)
1260 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1261 {
1262 if (ev.type == MotionNotify
1263 || ev.type == ButtonPress
1264 || ev.type == ButtonRelease)
1265 if (hidden_pointer)
1266 pointer_unblank ();
1267
1268 if (ev.type == KeyPress && hidden_pointer == 0)
1269 pointer_blank ();
1270 }
1271#endif
1272
1273 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1294 unsigned int unused_mask;
1276 1295
1277 switch (ev.type) 1296 switch (ev.type)
… …
1284 1303
1285 break; 1304 break;
1286 1305
1287 case KeyRelease: 1306 case KeyRelease:
1288 { 1307 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1290 KeySym ks; 1309 KeySym keysym;
1291 1310
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif 1312#endif
1294 1313
1295#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support 1315 // ISO 14755 support
1297 if (iso14755buf) 1316 if (iso14755buf)
… …
1302# endif 1321# endif
1303# if ISO_14755 1322# if ISO_14755
1304 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1305 // first: controls 1324 // first: controls
1306 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1309 { 1328 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1311 commit_iso14755 (); 1330 commit_iso14755 ();
1312 return; // case-break; 1331 goto skip_switch;
1313 } 1332 }
1314 1333
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1335 if (i[0] == keysym)
1317 { 1336 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1338 commit_iso14755 ();
1320 return; // case-break; 1339 goto skip_switch;
1321 } 1340 }
1322 1341
1323 scr_bell (); 1342 scr_bell ();
1324# endif 1343# endif
1325 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1344 else 1363 else
1345 iso14755buf = 0; 1364 iso14755buf = 0;
1346 } 1365 }
1347#endif 1366#endif
1348 1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1354#endif 1377#endif
1355 break; 1378 break;
1356 } 1379 }
1357 1380
… …
1363 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1364 break; 1387 break;
1365 1388
1366 case ClientMessage: 1389 case ClientMessage:
1367 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1369 { 1392 {
1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1394 {
1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1396 {
1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1398 {
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1371 destroy (); 1400 destroy ();
1401 }
1372#if ENABLE_EWMH 1402#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev); 1406 &ev);
1407#endif
1408 }
1409 }
1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1377#endif 1418#endif
1378 } 1419 }
1379#if ENABLE_XEMBED
1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1381 {
1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1383 focus_in ();
1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1385 focus_out ();
1386 }
1387#endif
1388#ifdef OFFIX_DND
1389 /* OffiX Dnd (drag 'n' drop) protocol */
1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1391 && (ev.xclient.data.l[0] == DndFile
1392 || ev.xclient.data.l[0] == DndDir
1393 || ev.xclient.data.l[0] == DndLink))
1394 {
1395 /* Get Dnd data */
1396 Atom ActualType;
1397 int ActualFormat;
1398 unsigned char *data;
1399 unsigned long Size, RemainingBytes;
1400
1401 XGetWindowProperty (disp, display->root,
1402 xa[XA_DNDSELECTION],
1403 0L, 1000000L,
1404 False, AnyPropertyType,
1405 &ActualType, &ActualFormat,
1406 &Size, &RemainingBytes,
1407 &data);
1408 set_string_property (XA_CUT_BUFFER0, data);
1409 XFree (data);
1410 selection_paste (display->root, XA_CUT_BUFFER0, true);
1411 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1412 }
1413#endif /* OFFIX_DND */
1414 break; 1420 break;
1415 1421
1416 case MappingNotify: 1422 case MappingNotify:
1417 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1418 break; 1424 break;
… …
1451 break; 1457 break;
1452 1458
1453 case ConfigureNotify: 1459 case ConfigureNotify:
1454 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1455 { 1461 {
1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ; 1463 ;
1458 1464
1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1460 { 1466 {
1461 seen_resize = 1; 1467 seen_resize = 1;
1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1463 } 1469 }
1464 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1466 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1467 check_our_parents (); 1475 check_our_parents ();
1468#endif 1476#endif
1469 } 1477 }
1470 break; 1478 break;
1471 1479
1472 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1473 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1474 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1475 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1476 1485
1477 break; 1486 break;
1478 1487
1479 case SelectionClear: 1488 case SelectionClear:
1480 selection_clear (); 1489 selection_clear ();
… …
1485 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1486 break; 1495 break;
1487 1496
1488 case SelectionRequest: 1497 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1499 break;
1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 break; 1507 break;
1491 1508
1492 case UnmapNotify: 1509 case UnmapNotify:
1493 mapped = 0; 1510 mapped = 0;
1494#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1496#endif 1513#endif
1497 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498
1499 case MapNotify:
1500 mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break; 1515 break;
1505 1516
1506#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1507 case ReparentNotify: 1518 case ReparentNotify:
1508 rootwin_cb (ev); 1519 rootwin_cb (ev);
… …
1514 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1515 { 1526 {
1516 do 1527 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1520 1531
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1533
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1526 1537
1527 scr_refresh (refresh_type); 1538 want_refresh = 1;
1528 } 1539 }
1529 else 1540 else
1530 { 1541 {
1531 XEvent unused_event; 1542 XEvent unused_event;
1532 1543
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1534 ; 1545 ;
1535 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1547 ;
1537 1548
1538 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1539 { 1550 {
1540 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1541 scrollbar_show (0); 1552 scrollbar_show (0);
1542 } 1553 }
1543#ifdef MENUBAR
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose ();
1546#endif
1547 1554
1548#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1551#endif 1558#endif
1552 } 1559 }
1553 break; 1560 break;
1554 1561
1555 case MotionNotify: 1562 case MotionNotify:
1556#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1564 if (hidden_pointer)
1558 pointer_unblank (); 1565 pointer_unblank ();
1559#endif 1566#endif
1560#if MENUBAR
1561 if (isMenuBarWindow (ev.xany.window))
1562 {
1563 menubar_control (ev.xbutton);
1564 break;
1565 }
1566#endif
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1568 break;
1569 1569
1570 if (ev.xany.window == vt) 1570 if (ev.xany.window == vt)
1571 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1576 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1575 ; 1578 ;
1576 1579
1577 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1578 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1580 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1581 &ev.xbutton.state); 1584 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1646#endif 1649#endif
1647 } 1650 }
1648 } 1651 }
1649 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1650 { 1653 {
1651 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1652 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1653 ; 1656 ;
1654 1657
1655 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1656 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1657 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1662 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1664 scrollbar_size ());
1662 scr_refresh (refresh_type); 1665 want_refresh = 1;
1663 refresh_limit = 0; 1666 refresh_limit = 0;
1664 scrollbar_show (1); 1667 scrollbar_show (1);
1665 } 1668 }
1666 break; 1669 break;
1667 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1668} 1700}
1669 1701
1670void 1702void
1671rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1672{ 1704{
1673 if (!focus) 1705 if (!focus)
1674 { 1706 {
1675 focus = 1; 1707 focus = 1;
1676 want_refresh = 1; 1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1677#if USE_XIM 1712#if USE_XIM
1678 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1679 { 1714 {
1680 IMSetStatusPosition (); 1715 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1682 } 1717 }
1683#endif 1718#endif
1684#if CURSOR_BLINK 1719#if CURSOR_BLINK
1685 if (options & Opt_cursorBlink) 1720 if (OPTION (Opt_cursorBlink))
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687#endif 1722#endif
1688#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1690 { 1725 {
1691 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
… …
1701 if (focus) 1736 if (focus)
1702 { 1737 {
1703 focus = 0; 1738 focus = 0;
1704 want_refresh = 1; 1739 want_refresh = 1;
1705 1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1742
1706#if ENABLE_FRILLS || ISO_14755 1743#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf)
1745 {
1707 iso14755buf = 0; 1746 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1747# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1748 scr_overlay_off ();
1749# endif
1750 }
1711#endif 1751#endif
1712#if USE_XIM 1752#if USE_XIM
1713 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1754 XUnsetICFocus (Input_Context);
1715#endif 1755#endif
1716#if CURSOR_BLINK 1756#if CURSOR_BLINK
1717 if (options & Opt_cursorBlink) 1757 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.stop (); 1758 cursor_blink_ev.stop ();
1719 hidden_cursor = 0; 1759 hidden_cursor = 0;
1720#endif 1760#endif
1721#if OFF_FOCUS_FADING 1761#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade]) 1762 if (rs[Rs_fade])
… …
1730 1770
1731#if TRANSPARENT 1771#if TRANSPARENT
1732void 1772void
1733rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1734{ 1774{
1735 SET_R (this); 1775 make_current ();
1736 SET_LOCALE (locale);
1737 1776
1738 switch (ev.type) 1777 switch (ev.type)
1739 { 1778 {
1740 case PropertyNotify: 1779 case PropertyNotify:
1741 /* 1780 /*
… …
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1747 return; 1786 return;
1748 1787
1749 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1750 case ReparentNotify: 1789 case ReparentNotify:
1751 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1752 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1753 break; 1792 break;
1754 } 1793 }
1755} 1794}
1756#endif 1795#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1760{ 1799{
1761 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1762 1801
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1764 if (!bypass_keystate) 1804 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1806
1767 /* 1807 /*
1768 * VT window processing of button press 1808 * VT window processing of button press
1769 */ 1809 */
1770 if (ev.window == vt) 1810 if (ev.window == vt)
1771 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1772#if ISO_14755 1815#if ISO_14755
1773 // 5.4 1816 // 5.4
1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1775 { 1818 {
1776 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1790 { 1833 {
1791 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1792 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1793 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1794 { 1838 {
1795 /* only report double clicks */ 1839 /* only report double clicks */
1796 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1797 mouse_report (ev); 1841 mouse_report (ev);
… …
1829#else 1873#else
1830 selection.rect = false; 1874 selection.rect = false;
1831#endif 1875#endif
1832 1876
1833 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1835 { 1879 {
1836 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1838 else 1882 else
1839 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
2004 } 2048 }
2005 2049
2006 break; 2050 break;
2007 } 2051 }
2008 } 2052 }
2053
2009 return; 2054 return;
2010 } 2055 }
2011#if MENUBAR
2012 /*
2013 * Menubar window processing of button press
2014 */
2015 if (isMenuBarWindow (ev.window))
2016 menubar_control (ev);
2017#endif
2018} 2056}
2019 2057
2020void 2058void
2021rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
2022{ 2060{
… …
2028 2066
2029 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2030 { 2068 {
2031 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2032 scrollbar_show (0); 2070 scrollbar_show (0);
2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2034 refresh_type &= ~SMOOTH_REFRESH;
2035#endif
2036 } 2071 }
2037 2072
2038#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2039 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2040 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2041#endif 2076#endif
2042 2077
2043 if (ev.window == vt) 2078 if (ev.window == vt)
2044 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2045#if ISO_14755 2083#if ISO_14755
2046 // 5.4 2084 // 5.4
2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2048 return; 2086 return;
2049#endif 2087#endif
2088
2050 if (reportmode) 2089 if (reportmode)
2051 { 2090 {
2052 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2053 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2054 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2084 { 2123 {
2085 case Button1: 2124 case Button1:
2086 case Button3: 2125 case Button3:
2087 selection_make (ev.time); 2126 selection_make (ev.time);
2088 break; 2127 break;
2128
2089 case Button2: 2129 case Button2:
2090 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2091 break; 2132 break;
2133
2092#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2093 case Button4: 2135 case Button4:
2094 case Button5: 2136 case Button5:
2095 { 2137 {
2096 int i; 2138 int i;
… …
2098 2140
2099 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2100 2142
2101 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2102 i = 1; 2144 i = 1;
2103 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2104 i = nrow - 1; 2146 i = nrow - 1;
2105 else 2147 else
2106 i = 5; 2148 i = 5;
2107 2149
2108# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2118 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2119 } 2161 }
2120 else 2162 else
2121 { 2163 {
2122# endif 2164# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2165 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2166 scrollbar_show (1);
2127# else
2128 while (i--)
2129 {
2130 scr_page (v, 1);
2131 scr_refresh (SMOOTH_REFRESH);
2132 scrollbar_show (1);
2133 }
2134# endif
2135# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2136 } 2168 }
2137#endif 2169# endif
2138 } 2170 }
2139 break; 2171 break;
2140#endif 2172#endif
2141 } 2173 }
2142 } 2174 }
2143#ifdef MENUBAR
2144 else if (isMenuBarWindow (ev.window))
2145 menubar_control (ev);
2146#endif
2147} 2175}
2148 2176
2149#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2150#if TINTING 2178#if TINTING
2151/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2152 2180
2153typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2154 2182
2155void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2156{ 2184{
2157 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2158 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2159 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2160 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2161 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2162 int i; 2190 int i;
2163 2191
2164 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2165 2193
2166 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2167 2195
2168 /* for convenience */ 2196 /* for convenience */
2169 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2390 Atom atype; 2418 Atom atype;
2391 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2392 Window root, oldp, *list; 2420 Window root, oldp, *list;
2393 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2394 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2395 dDisp;
2396 2423
2397 pchanged = 0; 2424 pchanged = 0;
2398 2425
2399 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2400 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2401 2428
2402 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2403 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2404 2431
2405 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2406 2433
2407 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2408 { 2435 {
2409 if (am_transparent) 2436 if (am_transparent)
2410 { 2437 {
2411 pchanged = 1; 2438 pchanged = 1;
2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2413 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2414 } 2441 }
2415 2442
2416 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2417 } 2444 }
2418 2445
2419 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2420 XSync (disp, False); 2447 XSync (xdisp, False);
2421 2448
2422 /* 2449 /*
2423 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2424 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2425 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2426 */ 2453 */
2427 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2431 2458
2432 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2433 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2434 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2435 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2436 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2437 2464
2438 if (!i || prop == NULL 2465 if (!i || prop == NULL
2439#if TINTING 2466#if TINTING
… …
2458 Window cr; 2485 Window cr;
2459 XImage *image; 2486 XImage *image;
2460 GC gc; 2487 GC gc;
2461 XGCValues gcvalue; 2488 XGCValues gcvalue;
2462 2489
2463 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2464 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2465 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2466 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2467 nx = ny = 0; 2494 nx = ny = 0;
2468 2495
… …
2481 } 2508 }
2482 2509
2483 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2484 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2485 2512
2486 XSync (disp, False); 2513 XSync (xdisp, False);
2487 allowedxerror = -1; 2514 allowedxerror = -1;
2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2489 2516
2490 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2491 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2492 allowedxerror = 0; 2519 allowedxerror = 0;
2493 2520
… …
2496 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2497 { 2524 {
2498 pchanged = 1; 2525 pchanged = 1;
2499 if (pixmap != None) 2526 if (pixmap != None)
2500 { 2527 {
2501 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2502 pixmap = None; 2529 pixmap = None;
2503 } 2530 }
2504 } 2531 }
2505 2532
2506 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2507 } 2534 }
2508 else 2535 else
2509 { 2536 {
2510 if (pixmap != None) 2537 if (pixmap != None)
2511 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2512 2539
2513#if TINTING 2540#if TINTING
2514 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2515 { 2542 {
2516 unsigned short rm, gm, bm; 2543 rxvt_rgba c;
2517 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2518 2545
2519 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused[Color_tint].get (this, c);
2520 2547
2521 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2522 } 2549 }
2523#endif 2550#endif
2524 2551
2525 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2526 szHint.width, szHint.height, image->depth);
2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2528 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2529 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2530 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2531 XDestroyImage (image); 2557 XDestroyImage (image);
2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2533 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2534 2560
2535 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2536 pchanged = 1; 2562 pchanged = 1;
2537 2563
2538 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2539 } 2565 }
2540 } 2566 }
2541 2567
2542 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2544 else 2570 else
2545 { 2571 {
2546 unsigned int n; 2572 unsigned int n;
2547 /* 2573 /*
2548 * InheritPixmap transparency 2574 * InheritPixmap transparency
2549 */ 2575 */
2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2551 { 2577 {
2552 oldp = parent[i]; 2578 oldp = parent[i];
2553 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2554 &parent[i], &list, &n); 2580 &parent[i], &list, &n);
2555 XFree (list); 2581 XFree (list);
2556 2582
2557 if (parent[i] == display->root) 2583 if (parent[i] == display->root)
2558 { 2584 {
… …
2570 2596
2571 if (pchanged) 2597 if (pchanged)
2572 { 2598 {
2573 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2574 { 2600 {
2575 XGetWindowAttributes (disp, parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2577 { 2603 {
2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2579 break; 2605 break;
2580 } 2606 }
2581 } 2607 }
2582 } 2608 }
2583 2609
2584 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2585 { 2611 {
2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2588 am_transparent = 0; 2614 am_transparent = 0;
2589 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2590 } 2616 }
2591 else 2617 else
2592 { 2618 {
2593#if WAIT_FOR_WM
2594 /* wait (an arbitrary period) for the WM to do its thing
2595 * needed for fvwm2.2.2 (and before?) */
2596 sleep (1);
2597#endif
2598 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2599 { 2620 {
2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2601 XClearWindow (disp, parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2602 } 2623 }
2603 2624
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2605 am_transparent = 1; 2626 am_transparent = 1;
2606 } 2627 }
2607 2628
2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 parent[i] = None; 2630 parent[i] = None;
2610 } 2631 }
2611 2632
2612 if (scrollBar.win) 2633 if (scrollBar.win)
2613 { 2634 {
2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2615 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2616 scrollbar_show (0); 2637 scrollbar_show (0);
2617 } 2638 }
2618 2639
2619 if (am_transparent) 2640 if (am_transparent)
… …
2631 2652
2632bool 2653bool
2633rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2634{ 2655{
2635 bool flag = false; 2656 bool flag = false;
2636 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2638 2659
2639 for (;;) 2660 for (;;)
2640 { 2661 {
2641 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2642 { 2663 {
2643 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2665 ch = next_char ();
2645 }
2646 2666
2647 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2648 break; 2668 break;
2669 }
2649 2670
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2671 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2672 {
2652 if (!seen_input) 2673 if (!seen_input)
2653 { 2674 {
… …
2662 if (seen_resize && cmd_pid) 2683 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2684 kill (-cmd_pid, SIGWINCH);
2664 } 2685 }
2665 2686
2666 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2689 bool refreshnow = false;
2669 int nlines = 0; 2690 int nlines = 0;
2670 unicode_t *str = buf; 2691 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2693
2673 for (;;) 2694 for (;;)
2674 { 2695 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2696 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2697 break;
… …
2682 if (ch == C0_LF) 2703 if (ch == C0_LF)
2683 nlines++; 2704 nlines++;
2684 2705
2685 refresh_count++; 2706 refresh_count++;
2686 2707
2687 if (!(options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2710 {
2690 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2691 ch = NOCHAR; 2713 ch = NOCHAR;
2692 break; 2714 break;
2693 } 2715 }
2694 2716
2695 // scr_add_lines only works for nlines <= nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2718 if (nlines >= nrow - 1)
2697 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2698 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2699 nlines = 0; 2724 nlines = 0;
2700 str = buf; 2725 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2726 eol = str + min (ncol, UBUFSIZ);
2702 } 2727 }
2703 2728
… …
2716 2741
2717 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2743 ch = next_char ();
2719 } 2744 }
2720 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2721 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2722 2749
2723 /* 2750 /*
2724 * If there have been a lot of new lines, then update the screen 2751 * If there have been a lot of new lines, then update the screen
2725 * What the heck I'll cheat and only refresh less than every page-full. 2752 * What the heck I'll cheat and only refresh less than every page-full.
2726 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2727 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2728 */ 2755 */
2729 if (refreshnow) 2756 if (refreshnow)
2730 { 2757 {
2731 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2732 refresh_limit++; 2759 refresh_limit++;
2733 else 2760 else
2734 { 2761 {
2735 flag = true; 2762 flag = true;
2736 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2737 } 2765 }
2738 } 2766 }
2739 2767
2740 } 2768 }
2741 else 2769 else
… …
2756 } 2784 }
2757 2785
2758 return flag; 2786 return flag;
2759} 2787}
2760 2788
2761// read the next octet
2762unicode_t
2763rxvt_term::next_octet ()
2764{
2765 return cmdbuf_ptr < cmdbuf_endp
2766 ? *cmdbuf_ptr++
2767 : NOCHAR;
2768}
2769
2770// read the next character 2789// read the next character
2771unicode_t 2790wchar_t
2772rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2773{ 2792{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2794 {
2776 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2779 2798
2780 wchar_t wc; 2799 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2800 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2801
2783 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2784 { 2803 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2806 break;
2788 } 2807 }
2789 2808
2790 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2810 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2811
2793 // assume wchar == unicode 2812 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2814 return wc & UNICODE_MASK;
2796 } 2815 }
2797 2816
2798 return NOCHAR; 2817 return NOCHAR;
2799} 2818}
2819
2820// read the next octet
2821uint32_t
2822rxvt_term::next_octet () NOTHROW
2823{
2824 return cmdbuf_ptr < cmdbuf_endp
2825 ? (unsigned char)*cmdbuf_ptr++
2826 : NOCHAR;
2827}
2828
2829static class out_of_input out_of_input;
2800 2830
2801/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2802/* 2832/*
2803 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2804 * to the command. 2834 * to the command.
2805 */ 2835 */
2806unicode_t 2836wchar_t
2807rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2808{ 2838{
2809 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2810 2840
2811 if (c == NOCHAR) 2841 if (c == NOCHAR)
2812 throw out_of_input; 2842 throw out_of_input;
2813 2843
2814 return c; 2844 return c;
2815} 2845}
2816 2846
2817unicode_t 2847uint32_t
2818rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2819{ 2849{
2820 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2821 2851
2822 if (c == NOCHAR) 2852 if (c == NOCHAR)
2823 throw out_of_input; 2853 throw out_of_input;
2824 2854
2825 return c; 2855 return c;
… …
2925 case C0_ESC: 2955 case C0_ESC:
2926 process_escape_seq (); 2956 process_escape_seq ();
2927 break; 2957 break;
2928 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 2961 else
2933 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 2963 break;
2936 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2937 scr_bell (); 2965 scr_bell ();
2938 break; 2966 break;
2939 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
3094 break; 3122 break;
3095 3123
3096 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
3098 { 3126 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3129 }
3102 break; 3130 break;
3103 3131
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3155 process_dcs_seq ();
3128 break; 3156 break;
3129 3157
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
3135 3162
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3165 process_csi_seq ();
… …
3247 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3248 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3249 if (arg[p] == -1) 3276 if (arg[p] == -1)
3250 arg[p] = ndef; 3277 arg[p] = ndef;
3251 3278
3252#ifdef DEBUG_CMD
3253 fprintf (stderr, "CSI ");
3254 for (p = 0; p < nargs; p++)
3255 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3256 fprintf (stderr, "%c\n", ch);
3257#endif
3258
3259 /* 3279 /*
3260 * private mode handling 3280 * private mode handling
3261 */ 3281 */
3262 if (priv) 3282 if (priv)
3263 { 3283 {
3264 switch (priv) 3284 switch (priv)
3265 { 3285 {
3266 case '>': 3286 case '>':
3267 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3268 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3269 break; 3298 break;
3270 case '?': 3299 case '?':
3271 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3272 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3273 break; 3302 break;
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3413 break;
3385 3414
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3417 break;
3390 3418
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3393 break; 3421 break;
… …
3400 break; 3428 break;
3401 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3402 scr_report_position (); 3430 scr_report_position ();
3403 break; 3431 break;
3404 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3405 if (options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3406 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3407 break; 3435 break;
3408 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3410 break; 3438 break;
… …
3502rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3503{ 3531{
3504 int x, y; 3532 int x, y;
3505 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3506 Window wdummy; 3534 Window wdummy;
3507 dDisp; 3535
3536 dLocal (Display *, xdisp);
3508 3537
3509 if (nargs == 0) 3538 if (nargs == 0)
3510 return; 3539 return;
3511 3540
3512 switch (args[0]) 3541 switch (args[0])
3513 { 3542 {
3514 /* 3543 /*
3515 * commands 3544 * commands
3516 */ 3545 */
3517 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3518 XMapWindow (disp, parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3519 break; 3548 break;
3520 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3521 XIconifyWindow (disp, parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3522 break; 3551 break;
3523 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3524 XMoveWindow (disp, parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3525 break; 3554 break;
3526 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3528 break; 3557 break;
3529 case 5: /* raise window */ 3558 case 5: /* raise window */
3530 XRaiseWindow (disp, parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3531 break; 3560 break;
3532 case 6: /* lower window */ 3561 case 6: /* lower window */
3533 XLowerWindow (disp, parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3534 break; 3563 break;
3535 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3536 scr_touch (true); 3565 scr_touch (true);
3537 break; 3566 break;
3538 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
… …
3550 3579
3551 /* 3580 /*
3552 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3553 */ 3582 */
3554 case 11: /* report window state */ 3583 case 11: /* report window state */
3555 XGetWindowAttributes (disp, parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3557 break; 3586 break;
3558 case 13: /* report window position */ 3587 case 13: /* report window position */
3559 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3560 XTranslateCoordinates (disp, parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3561 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3562 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3563 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3564 break; 3593 break;
3565 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3566 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3568 break; 3597 break;
3569 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3570 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3571 break; 3600 break;
… …
3573 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3574 break; 3603 break;
3575 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3576 { 3605 {
3577 char *s; 3606 char *s;
3578 XGetIconName (disp, parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s); 3609 XFree (s);
3581 } 3610 }
3582 break; 3611 break;
3583 case 21: /* report window title */ 3612 case 21: /* report window title */
3584 { 3613 {
3585 char *s; 3614 char *s;
3586 XFetchName (disp, parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s); 3617 XFree (s);
3589 } 3618 }
3590 break; 3619 break;
3591 } 3620 }
3592} 3621}
… …
3595/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3596/* 3625/*
3597 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3599 */ 3628 */
3600unsigned char * 3629char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3631{
3603 unicode_t ch; 3632 unicode_t ch;
3604 bool seen_esc = false; 3633 bool seen_esc = false;
3605 unsigned int n = 0; 3634 unsigned int n = 0;
… …
3638 3667
3639 string[n++] = '\0'; 3668 string[n++] = '\0';
3640 3669
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3671
3643 return (unsigned char *)rxvt_wcstombs (string); 3672 return rxvt_wcstombs (string);
3644} 3673}
3645 3674
3646/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3647/* 3676/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3677 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3678 */
3650void 3679void
3651rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3652{ 3681{
3653 unsigned char *s; 3682 char *s;
3654 unicode_t eh; 3683 unicode_t eh;
3655 3684
3656 /* 3685 /*
3657 * Not handled yet 3686 * Not handled yet
3658 */ 3687 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3679 3708
3680 if (ch == ';') 3709 if (ch == ';')
3681 { 3710 {
3682 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3683 3712
3684 if (s) 3713 if (s)
3685 { 3714 {
3686 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3687 free (s); 3716 free (s);
3688 } 3717 }
3689 } 3718 }
3690} 3719}
3691 3720
3692void 3721void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3723{
3695 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3696 { 3725 {
3697 unsigned short r, g, b; 3726 rxvt_rgba c;
3698 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3699 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3700 } 3735 }
3701 else 3736 else
3702 set_window_color (color, str); 3737 set_window_color (color, str);
3703} 3738}
3704 3739
3705/* 3740/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3742 */
3708void 3743void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3745{
3711 int changed = 0;
3712 int color; 3746 int color;
3713 char *buf, *name; 3747 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3715 int saveop = op; 3749 int saveop = op;
3716 dDisp; 3750
3751 dLocal (Display *, xdisp);
3717 3752
3718 assert (str != NULL); 3753 assert (str != NULL);
3719 switch (op) 3754 switch (op)
3720 { 3755 {
3721 case XTerm_name: 3756 case XTerm_name:
… …
3737 unsigned long bytes_after; 3772 unsigned long bytes_after;
3738 unsigned char *value = 0; 3773 unsigned char *value = 0;
3739 const char *str = ""; 3774 const char *str = "";
3740 3775
3741 if (prop 3776 if (prop
3742 && XGetWindowProperty (disp, parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3743 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3744 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3745 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3746 && actual_type != None 3781 && actual_type != None
3747 && actual_format == 8) 3782 && actual_format == 8)
3748 str = (const char *)(value); 3783 str = (const char *)(value);
3749 3784
3750 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3751 3786
3752 XFree (value); 3787 XFree (value);
3753 } 3788 }
3754 else 3789 else
3755 { 3790 {
… …
3759 { 3794 {
3760 *eq = 0; 3795 *eq = 0;
3761 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3762 } 3797 }
3763 else 3798 else
3764 XDeleteProperty (disp, parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3765 display->atom (str)); 3800 display->atom (str));
3766 } 3801 }
3767 break; 3802 break;
3768 3803
3769 case XTerm_Color: 3804 case XTerm_Color:
… …
3771 { 3806 {
3772 if ((name = strchr (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3773 break; 3808 break;
3774 3809
3775 *name++ = '\0'; 3810 *name++ = '\0';
3776 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3777 3812
3778 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3779 break; 3814 break;
3780 3815
3781 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3782 *buf++ = '\0'; 3817 *buf++ = '\0';
3783 3818
3784 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3785 {
3786 unsigned short r, g, b;
3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3789 }
3790 else
3791 set_window_color (color + minCOLOR, name);
3792 } 3820 }
3793 break; 3821 break;
3794 case XTerm_Color00: 3822 case XTerm_Color00:
3795 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3796 break; 3824 break;
3797 case XTerm_Color01: 3825 case XTerm_Color01:
3798 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3799 break; 3827 break;
3800#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3801 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3803 break; 3831 break;
3804#endif 3832#endif
3805 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3806 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3807 break; 3835 break;
3808 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3809 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3810 break; 3838 break;
3811#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3812 case XTerm_Color_BD:
3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3814 break;
3815 case XTerm_Color_UL:
3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3817 break;
3818 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3842 break;
3843 case Rxvt_Color_BD:
3844 case URxvt_Color_BD:
3845 process_color_seq (op, Color_BD, str, resp);
3846 break;
3847 case Rxvt_Color_UL:
3848 case URxvt_Color_UL:
3849 process_color_seq (op, Color_UL, str, resp);
3820 break; 3850 break;
3821 case URxvt_Color_IT: 3851 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3852 process_color_seq (op, Color_IT, str, resp);
3823 break; 3853 break;
3824#endif 3854#endif
3825#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3826 case URxvt_Color_tint: 3856 case URxvt_Color_tint:
3827 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3828 check_our_parents (); 3858 check_our_parents ();
3829 if (am_transparent) 3859 if (am_transparent)
3830 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3831 break; 3861 break;
3832#endif 3862#endif
3833 3863
3834 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3835 if (*str != ';') 3866 if (*str != ';')
3836 { 3867 {
3837#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3838 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3839 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3840#endif
3841 scr_touch (true); 3871 scr_touch (true);
3872#endif
3842 } 3873 }
3874
3875 int changed = 0;
3876
3843 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3844 { 3878 {
3845 str++; 3879 str++;
3846#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3847 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3848#endif 3882#endif
3849 } 3883 }
3850 3884
3851 if (changed) 3885 if (changed)
3852 { 3886 {
3853#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3854 resize_pixmap (); 3888 resize_pixmap ();
3855#endif
3856 scr_touch (true); 3889 scr_touch (true);
3890#endif
3857 } 3891 }
3892 }
3858 break; 3893 break;
3859 3894
3860 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3861 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3862 break; 3897 break;
3863 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3864 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3865 break; 3900 break;
3866 3901
3867 case XTerm_logfile: 3902 case XTerm_logfile:
3868 // TODO, when secure mode? 3903 // TODO, when secure mode?
3869 break; 3904 break;
3870 3905
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (options & Opt_insecure)
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0 3906#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3907 case Rxvt_dumpscreen: /* no error notices */
3879 { 3908 {
3880 int fd; 3909 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 { 3911 {
3883 scr_dump (fd); 3912 scr_dump (fd);
… …
3894 case URxvt_italicFont: 3923 case URxvt_italicFont:
3895 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3896#endif 3925#endif
3897 if (query) 3926 if (query)
3898 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3900 ? fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3901 resp); 3930 resp);
3902 else 3931 else
3903 { 3932 {
3904 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3907 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3908 set_fonts (); 3937 set_fonts ();
3909 } 3938 }
3910 break; 3939 break;
3911 3940
3941 case URxvt_version:
3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3912#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3913 case URxvt_locale: 3950 case URxvt_locale:
3914 if (query) 3951 if (query)
3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3916 else 3953 else
3917 { 3954 {
3918 set_locale (str); 3955 set_locale (str);
3919 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3920 init_xlocale (); 3957 init_xlocale ();
3921 } 3958 }
3922 break; 3959 break;
3923 3960
3924 case URxvt_view_up: 3961 case URxvt_view_up:
3925 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3926 int lines = atoi (str); 3964 int lines = atoi (str);
3927 3965
3928 if (lines) 3966 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 3968 else
3931 {
3932 scr_erase_savelines (); 3969 scr_erase_savelines ();
3933 } 3970 }
3934 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet
3935 break; 3979 break;
3936#endif 3980#endif
3937 } 3981 }
3938} 3982}
3939/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3970 return state; 4014 return state;
3971} 4015}
3972 4016
3973/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3974void 4018void
3975rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3976{ 4020{
3977 unsigned int i, j; 4021 unsigned int i, j;
3978 int state; 4022 int state;
3979 4023
3980 static const struct 4024 static const struct
… …
3991 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3992 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3993 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3995 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3996#ifdef menuBar_esc
3997 { menuBar_esc, PrivMode_menuBar },
3998#endif
3999 // 18, 19 printing-related 4040 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
4001#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
4002 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
4003#endif 4044#endif
… …
4048 } 4089 }
4049 4090
4050 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4092 switch (arg[i])
4052 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
4053 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4054 case 1049: 4102 case 1049:
4055 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4104 if (mode == 0)
4057 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
4058 else if (mode == 1) 4106 else if (mode == 1)
4059 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
4060 break; 4108 break;
… …
4075 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4126 break;
4079 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4080 if (state)
4081 options &= ~Opt_jumpScroll;
4082 else
4083 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4084 break; 4129 break;
4085 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4087 break; 4132 break;
4088 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4094 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4095 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4096 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4097 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4098 break; 4143 break;
4099#ifdef menuBar_esc
4100 case menuBar_esc:
4101#ifdef MENUBAR
4102 map_menuBar (state);
4103#endif
4104 break;
4105#endif
4106#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4107 case scrollBar_esc: 4145 case scrollBar_esc:
4108 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4109 { 4147 {
4110 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4129#if 0 4167#if 0
4130 case 1001: 4168 case 1001:
4131 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4132#endif 4170#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (state)
4135 options &= ~Opt_scrollTtyOutput;
4136 else
4137 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4138 break; 4173 break;
4139 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4140 if (state)
4141 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4142 else
4143 options &= ~Opt_scrollTtyKeypress;
4144 break; 4176 break;
4145 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4146 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4147 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4148 scr_erase_screen (2); 4180 scr_erase_screen (2);
4149 scr_change_screen (state); 4181 scr_change_screen (state);
4150 break; 4182 break;
4151 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4152 scr_change_screen (state); 4184 scr_change_screen (state);
4153 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4187 scr_erase_screen (2);
4156 break; 4188 break;
4157 default: 4189 default:
4158 break; 4190 break;
… …
4286 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4287 break; 4319 break;
4288 4320
4289 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4290 4322
4291#ifndef NO_BRIGHTCOLOR 4323#if ENABLE_FRILLS
4292 case 90: 4324 case 90:
4293 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4294 case 92: 4326 case 92:
4295 case 93: 4327 case 93:
4296 case 94: 4328 case 94:
… …
4308 case 106: 4340 case 106:
4309 case 107: 4341 case 107:
4310 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4311 break; 4343 break;
4312#endif 4344#endif
4313
4314 } 4345 }
4315 } 4346 }
4316} 4347}
4317/*}}} */ 4348/*}}} */
4318 4349
… …
4342 */ 4373 */
4343void 4374void
4344rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4345{ 4376{
4346 va_list arg_ptr; 4377 va_list arg_ptr;
4347 unsigned char buf[256]; 4378 char buf[256];
4348 4379
4349 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4350 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4351 va_end (arg_ptr); 4382 va_end (arg_ptr);
4352 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4357 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4358 */ 4389 */
4359const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4360 4391
4361void 4392void
4362rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4363{ 4394{
4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4396 return;
4397
4398 if (pty->pty < 0)
4399 return;
4400
4364 if (v_buflen == 0) 4401 if (v_buflen == 0)
4365 { 4402 {
4366 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4367 4404
4368 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4369 return; 4406 return;
4370 4407
4371 data += written; 4408 data += written;
4372 len -= written; 4409 len -= written;
4373 } 4410 }
4374 4411
4375 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4376 4413
4377 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4378 v_buflen += len; 4415 v_buflen += len;
4379 4416
4380 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4381} 4418}
4382 4419
4383void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4384{ 4421{
4385 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4386 4423
4387 if (written > 0) 4424 if (written > 0)
4388 { 4425 {
4389 v_buflen -= written; 4426 v_buflen -= written;
4390 4427

Diff Legend

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