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.224 by root, Sun Jan 1 06:18:20 2006 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC

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

Diff Legend

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