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

Diff Legend

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