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.255 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 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// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
905 { 909 {
906 const char ch = C0_ESC; 910 const char ch = C0_ESC;
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
921} 915}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 995unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 997{
930 unsigned int n, s; 998 unsigned int n, s;
931 999
972 1040
973 if (want_refresh) 1041 if (want_refresh)
974 { 1042 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1044 {
977 int row = -view_start; 1045 int row = view_start;
978 int end_row = row + nrow; 1046 int end_row = row + nrow;
979 1047
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1049 --row;
982 1050
983 do 1051 do
984 { 1052 {
985 int start_row = row; 1053 int start_row = row;
1008 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1009 } 1077 }
1010 while (row < end_row); 1078 while (row < end_row);
1011 } 1079 }
1012 1080
1013 scr_refresh (refresh_type); 1081 scr_refresh ();
1014 scrollbar_show (1); 1082 scrollbar_show (1);
1015#ifdef USE_XIM 1083#ifdef USE_XIM
1016 IMSendSpot (); 1084 IMSendSpot ();
1017#endif 1085#endif
1018 } 1086 }
1021} 1089}
1022 1090
1023void 1091void
1024rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1025{ 1093{
1026 SET_R (this); 1094 make_current ();
1027 SET_LOCALE (locale);
1028 1095
1029 display->flush (); 1096 display->flush ();
1030 1097
1031 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1100}
1034 1101
1035void 1102void
1036rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1037{ 1104{
1038 SET_R (this); 1105 make_current ();
1039 SET_LOCALE (locale);
1040 1106
1041 refresh_limit = 1; 1107 refresh_limit = 1;
1042 refresh_count = 0; 1108 refresh_count = 0;
1043 flush (); 1109 flush ();
1044} 1110}
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1115{
1050 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1117 want_refresh = 1;
1052 1118
1053 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1120}
1055#endif 1121#endif
1056 1122
1057#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1058void 1124void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1139{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1142 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1143 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1145 }
1081} 1146}
1082#endif 1147#endif
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1152{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1154 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1156 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1158 }
1095} 1159}
1096#endif 1160#endif
1101{ 1165{
1102 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1169 {
1106 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1109 1172
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1173 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1175 }
1114} 1176}
1115#endif 1177#endif
1116 1178
1117#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1118static struct event_handler 1180static struct event_handler
1119{ 1181{
1120 check_watcher cw_yield; 1182 check_watcher yield_ev;
1121 1183
1122 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1123 { 1185 {
1124 sched_yield (); 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
1125 w.stop (); 1194 w.stop ();
1126 } 1195 }
1127 1196
1128 event_handler () 1197 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1130 { 1199 {
1131 } 1200 }
1132} event_handler; 1201} event_handler;
1133#endif 1202#endif
1134 1203
1145 1214
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1149 1218
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1220
1152 if (r > 0) 1221 if (r > 0)
1153 { 1222 {
1154 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1155 return true; 1224 return true;
1156 } 1225 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1227 {
1159#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1160 if (display->is_local) 1229 if (display->is_local)
1161 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1162#endif 1231#endif
1163 } 1232 }
1164 else 1233 else
1165 { 1234 {
1166 pty_ev.stop (); 1235 pty_ev.stop ();
1173} 1242}
1174 1243
1175void 1244void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1246{
1178 SET_R (this); 1247 make_current ();
1179 SET_LOCALE (locale);
1180 1248
1181 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1251 while (pty_fill ())
1184 if (cmd_parse ()) 1252 if (cmd_parse ())
1189} 1257}
1190 1258
1191void 1259void
1192rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1193{ 1261{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1263 recolour_cursor ();
1196 1264
1197#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1266 hidden_pointer = 0;
1199 1267
1207rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1208{ 1276{
1209 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1210 return; 1278 return;
1211 1279
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1281 XFlush (dpy);
1214 1282
1215 hidden_pointer = 1; 1283 hidden_pointer = 1;
1216} 1284}
1217 1285
1218void 1286void
1219rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1220{ 1288{
1221 SET_R (this); 1289 make_current ();
1222 SET_LOCALE (locale);
1223 1290
1224 pointer_blank (); 1291 pointer_blank ();
1225} 1292}
1226#endif 1293#endif
1227 1294
1292 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1293 (32 + x + 1), 1360 (32 + x + 1),
1294 (32 + y + 1)); 1361 (32 + y + 1));
1295} 1362}
1296 1363
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1364/*{{{ process an X event */
1308void 1365void
1309rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1310{ 1367{
1311 dDisp; 1368 make_current ();
1312 1369
1313 SET_R (this); 1370 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1371
1372 if (ev.xany.window == vt
1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1375 return;
1376
1377 // for XQueryPointer
1316 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1380 unsigned int unused_mask;
1319 1381
1320 switch (ev.type) 1382 switch (ev.type)
1321 { 1383 {
1322 case KeyPress: 1384 case KeyPress:
1323#if ISO_14755 1385 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1386 break;
1329 1387
1330 case KeyRelease: 1388 case KeyRelease:
1331 { 1389 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1390 break;
1403 }
1404 1391
1405 case ButtonPress: 1392 case ButtonPress:
1406 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1407 break; 1394 break;
1408 1395
1410 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1411 break; 1398 break;
1412 1399
1413 case ClientMessage: 1400 case ClientMessage:
1414 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 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 {
1417 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)))
1418 destroy (); 1411 destroy ();
1412 }
1419#if ENABLE_EWMH 1413#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &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 }
1424#endif 1429#endif
1425 } 1430 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1431 break;
1462 1432
1463 case MappingNotify: 1433 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1435 break;
1498 break; 1468 break;
1499 1469
1500 case ConfigureNotify: 1470 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1502 { 1472 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1474 ;
1505 1475
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1477 {
1508 seen_resize = 1; 1478 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1480 }
1511 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1486 check_our_parents ();
1515#endif 1487#endif
1516 } 1488 }
1517 break; 1489 break;
1518 1490
1519 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1496
1524 break; 1497 break;
1525 1498
1526 case SelectionClear: 1499 case SelectionClear:
1527 selection_clear (); 1500 selection_clear ();
1563 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1564 { 1537 {
1565 do 1538 do
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1542
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1544
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1575 1548
1576 want_refresh = 1; 1549 want_refresh = 1;
1577 } 1550 }
1578 else 1551 else
1579 { 1552 {
1580 XEvent unused_event; 1553 XEvent unused_event;
1581 1554
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1556 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1558 ;
1586 1559
1587 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1588 { 1561 {
1589 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1590 scrollbar_show (0); 1563 scrollbar_show (0);
1591 } 1564 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1565
1597#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1600#endif 1569#endif
1601 } 1570 }
1602 break; 1571 break;
1603 1572
1604 case MotionNotify: 1573 case MotionNotify:
1605#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1575 if (hidden_pointer)
1607 pointer_unblank (); 1576 pointer_unblank ();
1608#endif 1577#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1579 break;
1618 1580
1619 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1620 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1585 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1587 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626 ; 1589 ;
1627 1590
1628 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1629 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1632 &ev.xbutton.state); 1595 &ev.xbutton.state);
1633#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1697#endif 1660#endif
1698 } 1661 }
1699 } 1662 }
1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701 { 1664 {
1702 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1704 ; 1667 ;
1705 1668
1706 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1707 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1708 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1673 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1715 scrollbar_show (1); 1678 scrollbar_show (1);
1716 } 1679 }
1717 break; 1680 break;
1718 } 1681 }
1719 1682
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 { 1685 {
1725 if (hidden_cursor) 1686 if (hidden_cursor)
1726 { 1687 {
1727 hidden_cursor = 0; 1688 hidden_cursor = 0;
1728 want_refresh = 1; 1689 want_refresh = 1;
1729 } 1690 }
1730 1691
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1693 }
1733#endif 1694#endif
1734 1695
1735#if defined(POINTER_BLANK) 1696#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1753 if (!focus) 1714 if (!focus)
1754 { 1715 {
1755 focus = 1; 1716 focus = 1;
1756 want_refresh = 1; 1717 want_refresh = 1;
1757 1718
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 1720
1760#if USE_XIM 1721#if USE_XIM
1761 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1762 { 1723 {
1763 IMSetStatusPosition (); 1724 IMSetPosition ();
1764 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1765 } 1726 }
1766#endif 1727#endif
1767#if CURSOR_BLINK 1728#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1731#endif
1771#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1773 { 1734 {
1774 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1814 } 1775 }
1815#endif 1776#endif
1816 } 1777 }
1817} 1778}
1818 1779
1819#if TRANSPARENT 1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1791}
1792
1793#if TRANSPARENT || ENABLE_PERL
1820void 1794void
1821rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1796{
1823 SET_R (this); 1797 make_current ();
1824 SET_LOCALE (locale);
1825 1798
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return;
1802
1803# if TRANSPARENT
1826 switch (ev.type) 1804 switch (ev.type)
1827 { 1805 {
1828 case PropertyNotify: 1806 case PropertyNotify:
1829 /* 1807 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1808 * if user used some Esetroot compatible prog to set the root bg,
1838 case ReparentNotify: 1816 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1841 break; 1819 break;
1842 } 1820 }
1821# endif
1843} 1822}
1844#endif 1823#endif
1845 1824
1846void 1825void
1847rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1856 /* 1835 /*
1857 * VT window processing of button press 1836 * VT window processing of button press
1858 */ 1837 */
1859 if (ev.window == vt) 1838 if (ev.window == vt)
1860 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1861#if ISO_14755 1843#if ISO_14755
1862 // 5.4 1844 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1846 {
1865 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
1907 else 1889 else
1908 { 1890 {
1909 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1911 1893
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1894 switch (ev.button)
1914 { 1895 {
1915 case Button1: 1896 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1901#else
1921 selection.rect = false; 1902 selection.rect = false;
1922#endif 1903#endif
1923 1904
1924 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1907 {
1927 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1929 else 1910 else
1930 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1931 } 1912 }
1932 else 1913 else
1933 { 1914 {
1934 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1916 MEvent.clicks++;
1936 else 1917 else
1937 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1938 1919
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1921 }
1941 1922
1942 MEvent.button = Button1; 1923 MEvent.button = Button1;
1943 break; 1924 break;
1944 1925
1945 case Button3: 1926 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1948 else 1929 else
1949 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1950 1931
1951 MEvent.button = Button3; 1932 MEvent.button = Button3;
1952 break; 1933 break;
1953 } 1934 }
1954 } 1935 }
1955 1936
1956 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1957 return; 1938 return;
1958 } 1939 }
1959 1940
2098 } 2079 }
2099 } 2080 }
2100 2081
2101 return; 2082 return;
2102 } 2083 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2084}
2112 2085
2113void 2086void
2114rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2115{ 2088{
2121 2094
2122 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2123 { 2096 {
2124 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2125 scrollbar_show (0); 2098 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2099 }
2130 2100
2131#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2134#endif 2104#endif
2135 2105
2136 if (ev.window == vt) 2106 if (ev.window == vt)
2137 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2138#if ISO_14755 2111#if ISO_14755
2139 // 5.4 2112 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2114 return;
2142#endif 2115#endif
2116
2143 if (reportmode) 2117 if (reportmode)
2144 { 2118 {
2145 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2121 if (ev.button >= 4)
2171 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2146 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2175 2149
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2150 switch (ev.button)
2180 { 2151 {
2181 case Button1: 2152 case Button1:
2182 case Button3: 2153 case Button3:
2183 selection_make (ev.time); 2154 selection_make (ev.time);
2184 break; 2155 break;
2156
2185 case Button2: 2157 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187 break; 2160 break;
2161
2188#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2189 case Button4: 2163 case Button4:
2190 case Button5: 2164 case Button5:
2191 { 2165 {
2192 int i; 2166 int i;
2224 } 2198 }
2225 break; 2199 break;
2226#endif 2200#endif
2227 } 2201 }
2228 } 2202 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2203}
2234 2204
2235#ifdef TRANSPARENT 2205#ifdef TRANSPARENT
2236#if TINTING 2206#if TINTING
2237/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2238 2208
2239typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2240 2210
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{ 2212{
2243 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i; 2218 int i;
2249 2219
2250 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2251 2221
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253 2223
2254 /* for convenience */ 2224 /* for convenience */
2255 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
2476 Atom atype; 2446 Atom atype;
2477 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2478 Window root, oldp, *list; 2448 Window root, oldp, *list;
2479 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482 2451
2483 pchanged = 0; 2452 pchanged = 0;
2484 2453
2485 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2487 2456
2488 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2490 2459
2491 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2492 2461
2493 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2494 { 2463 {
2495 if (am_transparent) 2464 if (am_transparent)
2496 { 2465 {
2497 pchanged = 1; 2466 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2500 } 2469 }
2501 2470
2502 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2503 } 2472 }
2504 2473
2505 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False); 2475 XSync (dpy, False);
2507 2476
2508 /* 2477 /*
2509 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2512 */ 2481 */
2513 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2517 2486
2518 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2523 2492
2524 if (!i || prop == NULL 2493 if (!i || prop == NULL
2525#if TINTING 2494#if TINTING
2526 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2527#endif 2496#endif
2528 ) 2497 )
2529 have_pixmap = 0; 2498 have_pixmap = 0;
2530 else 2499 else
2531 { 2500 {
2544 Window cr; 2513 Window cr;
2545 XImage *image; 2514 XImage *image;
2546 GC gc; 2515 GC gc;
2547 XGCValues gcvalue; 2516 XGCValues gcvalue;
2548 2517
2549 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2553 nx = ny = 0; 2522 nx = ny = 0;
2554 2523
2567 } 2536 }
2568 2537
2569 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571 2540
2572 XSync (disp, False); 2541 XSync (dpy, False);
2573 allowedxerror = -1; 2542 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575 2544
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2578 allowedxerror = 0; 2547 allowedxerror = 0;
2579 2548
2582 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2583 { 2552 {
2584 pchanged = 1; 2553 pchanged = 1;
2585 if (pixmap != None) 2554 if (pixmap != None)
2586 { 2555 {
2587 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2588 pixmap = None; 2557 pixmap = None;
2589 } 2558 }
2590 } 2559 }
2591 2560
2592 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2593 } 2562 }
2594 else 2563 else
2595 { 2564 {
2596 if (pixmap != None) 2565 if (pixmap != None)
2597 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2598 2567
2599#if TINTING 2568#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2601 { 2570 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604 2572
2573 rgba c;
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2606 2575
2607 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608 } 2577 }
2609#endif 2578#endif
2610 2579
2611 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2617 XDestroyImage (image); 2585 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2620 2588
2621 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1; 2590 pchanged = 1;
2623 2591
2624 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2625 } 2593 }
2626 } 2594 }
2627 2595
2628 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2630 else 2598 else
2631 { 2599 {
2632 unsigned int n; 2600 unsigned int n;
2633 /* 2601 /*
2634 * InheritPixmap transparency 2602 * InheritPixmap transparency
2635 */ 2603 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 { 2605 {
2638 oldp = parent[i]; 2606 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2640 &parent[i], &list, &n);
2641 XFree (list); 2608 XFree (list);
2642 2609
2643 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2644 { 2611 {
2645 if (oldp != None) 2612 if (oldp != None)
2653 } 2620 }
2654 2621
2655 n = 0; 2622 n = 0;
2656 2623
2657 if (pchanged) 2624 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2660 { 2626 {
2661 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 { 2630 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break; 2632 break;
2666 } 2633 }
2667 } 2634 }
2668 }
2669 2635
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2671 { 2637 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0; 2640 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2676 } 2642 }
2677 else 2643 else
2678 { 2644 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++) 2645 for (n = 0; n < (unsigned int)i; n++)
2685 { 2646 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2688 } 2649 }
2689 2650
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2691 am_transparent = 1; 2652 am_transparent = 1;
2692 } 2653 }
2693 2654
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None; 2656 parent[i] = None;
2696 } 2657 }
2697 2658
2698 if (scrollBar.win) 2659 if (scrollBar.win)
2699 { 2660 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2702 scrollbar_show (0); 2663 scrollbar_show (0);
2703 } 2664 }
2704 2665
2705 if (am_transparent) 2666 if (am_transparent)
2780 } 2741 }
2781 2742
2782 // scr_add_lines only works for nlines <= nrow - 1. 2743 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2744 if (nlines >= nrow - 1)
2784 { 2745 {
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2748 scr_add_lines (buf, str - buf, nlines);
2787 2749
2788 nlines = 0; 2750 nlines = 0;
2789 str = buf; 2751 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2752 eol = str + min (ncol, UBUFSIZ);
2805 2767
2806 seq_begin = cmdbuf_ptr; 2768 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2769 ch = next_char ();
2808 } 2770 }
2809 2771
2772 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2774 scr_add_lines (buf, str - buf, nlines);
2812 2775
2813 /* 2776 /*
2814 * If there have been a lot of new lines, then update the screen 2777 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2778 * What the heck I'll cheat and only refresh less than every page-full.
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++; 2785 refresh_limit++;
2823 else 2786 else
2824 { 2787 {
2825 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2826 scr_refresh (refresh_type); 2790 scr_refresh ();
2827 want_refresh = 1; 2791 want_refresh = 1;
2828 } 2792 }
2829 } 2793 }
2830 2794
2831 } 2795 }
2849 return flag; 2813 return flag;
2850} 2814}
2851 2815
2852// read the next character 2816// read the next character
2853wchar_t 2817wchar_t
2854rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2855{ 2819{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2821 {
2858 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2880 return NOCHAR; 2844 return NOCHAR;
2881} 2845}
2882 2846
2883// read the next octet 2847// read the next octet
2884uint32_t 2848uint32_t
2885rxvt_term::next_octet () 2849rxvt_term::next_octet () NOTHROW
2886{ 2850{
2887 return cmdbuf_ptr < cmdbuf_endp 2851 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2852 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2853 : NOCHAR;
2890} 2854}
2855
2856static class out_of_input out_of_input;
2891 2857
2892/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2893/* 2859/*
2894 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2895 * to the command. 2861 * to the command.
2896 */ 2862 */
2897wchar_t 2863wchar_t
2898rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2865{
2900 wchar_t c = next_char (); 2866 wchar_t c = next_char ();
2901 2867
2902 if (c == NOCHAR) 2868 if (c == NOCHAR)
2903 throw out_of_input; 2869 throw out_of_input;
2904 2870
2905 return c; 2871 return c;
2906} 2872}
2907 2873
2908uint32_t 2874uint32_t
2909rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2876{
2911 uint32_t c = next_octet (); 2877 uint32_t c = next_octet ();
2912 2878
2913 if (c == NOCHAR) 2879 if (c == NOCHAR)
2914 throw out_of_input; 2880 throw out_of_input;
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 3119 break;
3154 case '+': 3120 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 3122 break;
3157#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3158 case '6': 3124 case '6':
3159 scr_backindex (); 3125 scr_backindex ();
3160 break; 3126 break;
3161#endif 3127#endif
3162 case '7': 3128 case '7':
3163 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3164 break; 3130 break;
3165 case '8': 3131 case '8':
3166 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3167 break; 3133 break;
3168#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3169 case '9': 3135 case '9':
3170 scr_forwardindex (); 3136 scr_forwardindex ();
3171 break; 3137 break;
3172#endif 3138#endif
3173 case '=': 3139 case '=':
3335 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 3303 if (arg[p] == -1)
3338 arg[p] = ndef; 3304 arg[p] = ndef;
3339 3305
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 3306 /*
3348 * private mode handling 3307 * private mode handling
3349 */ 3308 */
3350 if (priv) 3309 if (priv)
3351 { 3310 {
3352 switch (priv) 3311 switch (priv)
3353 { 3312 {
3354 case '>': 3313 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3315 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do).
3322 //
3323 tt_printf ("\033[>%d;94;0c", 'U');
3324 }
3357 break; 3325 break;
3358 case '?': 3326 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 3329 break;
3564 break; 3532 break;
3565 case CSI_75: 3533 case CSI_75:
3566 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3567 break; 3535 break;
3568 3536
3569#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3570 case CSI_74: 3538 case CSI_74:
3571 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3572 break; 3540 break;
3573#endif 3541#endif
3574 3542
3581 break; 3549 break;
3582 } 3550 }
3583} 3551}
3584/*}}} */ 3552/*}}} */
3585 3553
3586#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3555/* ARGSUSED */
3588void 3556void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3558{
3591 int x, y; 3559 int x, y;
3592 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3593 Window wdummy; 3561 Window wdummy;
3594 dDisp; 3562
3563 dLocal (Display *, dpy);
3595 3564
3596 if (nargs == 0) 3565 if (nargs == 0)
3597 return; 3566 return;
3598 3567
3599 switch (args[0]) 3568 switch (args[0])
3600 { 3569 {
3601 /* 3570 /*
3602 * commands 3571 * commands
3603 */ 3572 */
3604 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3606 break; 3575 break;
3607 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3578 break;
3610 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3581 break;
3613 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3584 break;
3616 case 5: /* raise window */ 3585 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3618 break; 3587 break;
3619 case 6: /* lower window */ 3588 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3621 break; 3590 break;
3622 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3623 scr_touch (true); 3592 scr_touch (true);
3624 break; 3593 break;
3625 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
3632 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3635 break; 3604 break;
3636 3605
3637
3638 /* 3606 /*
3639 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3640 */ 3608 */
3641 case 11: /* report window state */ 3609 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3612 break;
3645 case 13: /* report window position */ 3613 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3619 break;
3652 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3623 break;
3656 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3626 break;
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3629 break;
3662 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3663 { 3631 {
3664 char *s; 3632 char *s;
3665 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3635 XFree (s);
3668 } 3636 }
3669 break; 3637 break;
3670 case 21: /* report window title */ 3638 case 21: /* report window title */
3671 { 3639 {
3672 char *s; 3640 char *s;
3673 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3643 XFree (s);
3676 } 3644 }
3677 break; 3645 break;
3678 } 3646 }
3779void 3747void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3748rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3749{
3782 if (str[0] == '?' && !str[1]) 3750 if (str[0] == '?' && !str[1])
3783 { 3751 {
3784 unsigned short r, g, b; 3752 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3753 pix_colors_focused[color].get (c);
3754
3755#if XFT
3756 if (c.a != rgba::MAX_CC)
3757 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3758 else
3759#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3760 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3761 }
3788 else 3762 else
3789 set_window_color (color, str); 3763 set_window_color (color, str);
3790} 3764}
3791 3765
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3768 */
3795void 3769void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3770rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3771{
3798 int changed = 0;
3799 int color; 3772 int color;
3800 char *buf, *name; 3773 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3774 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3775 int saveop = op;
3803 dDisp; 3776
3777 dLocal (Display *, dpy);
3804 3778
3805 assert (str != NULL); 3779 assert (str != NULL);
3780
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return;
3783
3806 switch (op) 3784 switch (op)
3807 { 3785 {
3808 case XTerm_name: 3786 case XTerm_name:
3809 set_title (str); 3787 set_title (str);
3810 /* FALLTHROUGH */ 3788 /* FALLTHROUGH */
3824 unsigned long bytes_after; 3802 unsigned long bytes_after;
3825 unsigned char *value = 0; 3803 unsigned char *value = 0;
3826 const char *str = ""; 3804 const char *str = "";
3827 3805
3828 if (prop 3806 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3807 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3808 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3809 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3810 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3811 && actual_type != None
3834 && actual_format == 8) 3812 && actual_format == 8)
3835 str = (const char *)(value); 3813 str = (const char *)(value);
3836 3814
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3815 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3816
3839 XFree (value); 3817 XFree (value);
3840 } 3818 }
3841 else 3819 else
3842 { 3820 {
3846 { 3824 {
3847 *eq = 0; 3825 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3826 set_utf8_property (display->atom (str), eq + 1);
3849 } 3827 }
3850 else 3828 else
3851 XDeleteProperty (disp, parent[0], 3829 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 3830 display->atom (str));
3853 } 3831 }
3854 break; 3832 break;
3855 3833
3856 case XTerm_Color: 3834 case XTerm_Color:
3858 { 3836 {
3859 if ((name = strchr (buf, ';')) == NULL) 3837 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3838 break;
3861 3839
3862 *name++ = '\0'; 3840 *name++ = '\0';
3863 color = atoi (buf); 3841 color = atoi (buf) + minCOLOR;
3864 3842
3865 if (color < 0 || color >= TOTAL_COLORS) 3843 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3844 break;
3867 3845
3868 if ((buf = strchr (name, ';')) != NULL) 3846 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3847 *buf++ = '\0';
3870 3848
3871 if (name[0] == '?' && !name[1]) 3849 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3878 set_window_color (color + minCOLOR, name);
3879 } 3850 }
3880 break; 3851 break;
3881 case XTerm_Color00: 3852 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (op, Color_fg, str, resp);
3883 break; 3854 break;
3884 case XTerm_Color01: 3855 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (op, Color_bg, str, resp);
3886 break; 3857 break;
3887#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (op, Color_cursor, str, resp);
3890 break; 3861 break;
3891#endif 3862#endif
3892 case XTerm_Color_pointer_fg: 3863 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3864 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 3865 break;
3895 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 3868 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3907 break; 3880 break;
3908 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (op, Color_IT, str, resp);
3910 break; 3883 break;
3911#endif 3884#endif
3912#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3913 case URxvt_Color_tint: 3886 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3887 process_color_seq (op, Color_tint, str, resp);
3888
3915 check_our_parents (); 3889 check_our_parents ();
3890
3916 if (am_transparent) 3891 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3892 want_full_refresh = want_refresh = 1;
3918 break;
3919#endif
3920 3893
3894 break;
3895#endif
3896
3921 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3922 if (*str != ';') 3899 if (*str != ';')
3923 { 3900 {
3924#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3904 scr_touch (true);
3905#endif
3929 } 3906 }
3907
3908 int changed = 0;
3909
3930 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3931 { 3911 {
3932 str++; 3912 str++;
3933#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3934 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3935#endif 3915#endif
3936 } 3916 }
3937 3917
3938 if (changed) 3918 if (changed)
3939 { 3919 {
3940#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3921 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3922 scr_touch (true);
3923#endif
3944 } 3924 }
3925 }
3945 break; 3926 break;
3946 3927
3947 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3948 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3949 break; 3930 break;
3950 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3951 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3952 break; 3933 break;
3953 3934
3954 case XTerm_logfile: 3935 case XTerm_logfile:
3955 // TODO, when secure mode? 3936 // TODO, when secure mode?
3956 break; 3937 break;
3957 3938
3958#ifdef MENUBAR
3959 case URxvt_Menu:
3960 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break;
3963#endif
3964#if 0 3939#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3966 { 3941 {
3967 int fd; 3942 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3944 {
3970 scr_dump (fd); 3945 scr_dump (fd);
3994 allocated.push_back ((void *)res); 3969 allocated.push_back ((void *)res);
3995 set_fonts (); 3970 set_fonts ();
3996 } 3971 }
3997 break; 3972 break;
3998 3973
3999#if ENABLE_FRILLS 3974 case URxvt_version:
3975 if (query)
3976 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3977 op,
3978 rs[Rs_name], VERSION[0], VERSION[2],
3979 resp);
3980 break;
3981
3982#if !ENABLE_MINIMAL
4000 case URxvt_locale: 3983 case URxvt_locale:
4001 if (query) 3984 if (query)
4002 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4003 else 3986 else
4004 { 3987 {
4005 set_locale (str); 3988 set_locale (str);
4006 pty.set_utf8_mode (enc_utf8); 3989 pty->set_utf8_mode (enc_utf8);
4007 init_xlocale (); 3990 init_xlocale ();
4008 } 3991 }
4009 break; 3992 break;
4010 3993
4011 case URxvt_view_up: 3994 case URxvt_view_up:
4022 break; 4005 break;
4023#endif 4006#endif
4024 4007
4025#if ENABLE_PERL 4008#if ENABLE_PERL
4026 case URxvt_perl: 4009 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4028 ; // no responses yet 4011 ; // no responses yet
4029 break; 4012 break;
4030#endif 4013#endif
4031 } 4014 }
4032} 4015}
4064 return state; 4047 return state;
4065} 4048}
4066 4049
4067/* we're not using priv _yet_ */ 4050/* we're not using priv _yet_ */
4068void 4051void
4069rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4052rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4070{ 4053{
4071 unsigned int i, j; 4054 unsigned int i, j;
4072 int state; 4055 int state;
4073 4056
4074 static const struct 4057 static const struct
4085 { 5, PrivMode_rVideo }, 4068 { 5, PrivMode_rVideo },
4086 { 6, PrivMode_relOrigin }, 4069 { 6, PrivMode_relOrigin },
4087 { 7, PrivMode_Autowrap }, 4070 { 7, PrivMode_Autowrap },
4088 // 8, bi-directional support mode 4071 // 8, bi-directional support mode
4089 { 9, PrivMode_MouseX10 }, 4072 { 9, PrivMode_MouseX10 },
4090#ifdef menuBar_esc
4091 { menuBar_esc, PrivMode_menuBar },
4092#endif
4093 // 18, 19 printing-related 4073 // 18, 19 printing-related
4094 { 25, PrivMode_VisibleCursor }, 4074 { 25, PrivMode_VisibleCursor },
4095#ifdef scrollBar_esc 4075#ifdef scrollBar_esc
4096 { scrollBar_esc, PrivMode_scrollBar }, 4076 { scrollBar_esc, PrivMode_scrollBar },
4097#endif 4077#endif
4192 /* case 8: - auto repeat, can't do on a per window basis */ 4172 /* case 8: - auto repeat, can't do on a per window basis */
4193 case 9: /* X10 mouse reporting */ 4173 case 9: /* X10 mouse reporting */
4194 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
4195 priv_modes &= ~PrivMode_MouseX11; 4175 priv_modes &= ~PrivMode_MouseX11;
4196 break; 4176 break;
4197#ifdef menuBar_esc
4198 case menuBar_esc:
4199#ifdef MENUBAR
4200 map_menuBar (state);
4201#endif
4202 break;
4203#endif
4204#ifdef scrollBar_esc 4177#ifdef scrollBar_esc
4205 case scrollBar_esc: 4178 case scrollBar_esc:
4206 if (scrollbar_mapping (state)) 4179 if (scrollbar_mapping (state))
4207 { 4180 {
4208 resize_all_windows (0, 0, 0); 4181 resize_all_windows (0, 0, 0);
4378 scr_color (Color_bg, Color_bg); 4351 scr_color (Color_bg, Color_bg);
4379 break; 4352 break;
4380 4353
4381 //case 50: // not variable spacing 4354 //case 50: // not variable spacing
4382 4355
4383#if ENABLE_FRILLS 4356#if !ENABLE_MINIMAL
4384 case 90: 4357 case 90:
4385 case 91: /* set bright fg color */ 4358 case 91: /* set bright fg color */
4386 case 92: 4359 case 92:
4387 case 93: 4360 case 93:
4388 case 94: 4361 case 94:
4453rxvt_term::tt_write (const char *data, unsigned int len) 4426rxvt_term::tt_write (const char *data, unsigned int len)
4454{ 4427{
4455 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4428 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4456 return; 4429 return;
4457 4430
4458 if (pty.pty < 0) 4431 if (pty->pty < 0)
4459 return; 4432 return;
4460 4433
4461 if (v_buflen == 0) 4434 if (v_buflen == 0)
4462 { 4435 {
4463 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4436 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4464 4437
4465 if ((unsigned int)written == len) 4438 if ((unsigned int)written == len)
4466 return; 4439 return;
4467 4440
4468 data += written; 4441 data += written;
4477 pty_ev.set (EVENT_READ | EVENT_WRITE); 4450 pty_ev.set (EVENT_READ | EVENT_WRITE);
4478} 4451}
4479 4452
4480void rxvt_term::pty_write () 4453void rxvt_term::pty_write ()
4481{ 4454{
4482 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4483 4456
4484 if (written > 0) 4457 if (written > 0)
4485 { 4458 {
4486 v_buflen -= written; 4459 v_buflen -= written;
4487 4460

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines