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.258 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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;
… …
1488 break; 1458 break;
1489 } 1459 }
1490 break; 1460 break;
1491 1461
1492 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1466 focus_in ();
1494 break; 1467 break;
1495 1468
1496 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1473 focus_out ();
1498 break; 1474 break;
1499 1475
1500 case ConfigureNotify: 1476 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1502 { 1478 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1480 ;
1505 1481
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1483 {
1508 seen_resize = 1; 1484 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1486 }
1511 1487
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1513 if (OPTION (Opt_transparent)) 1491 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1492 check_our_parents ();
1515#endif 1493#endif
1516 } 1494 }
1517 break; 1495 break;
1518 1496
1519 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1502
1524 break; 1503 break;
1525 1504
1526 case SelectionClear: 1505 case SelectionClear:
1527 selection_clear (); 1506 selection_clear ();
… …
1563 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1564 { 1543 {
1565 do 1544 do
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1548
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1550
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1575 1554
1576 want_refresh = 1; 1555 want_refresh = 1;
1577 } 1556 }
1578 else 1557 else
1579 { 1558 {
1580 XEvent unused_event; 1559 XEvent unused_event;
1581 1560
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1562 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1564 ;
1586 1565
1587 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1588 { 1567 {
1589 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1590 scrollbar_show (0); 1569 scrollbar_show (0);
1591 } 1570 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1571
1597#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1600#endif 1575#endif
1601 } 1576 }
1602 break; 1577 break;
1603 1578
1604 case MotionNotify: 1579 case MotionNotify:
1605#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1581 if (hidden_pointer)
1607 pointer_unblank (); 1582 pointer_unblank ();
1608#endif 1583#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) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1585 break;
1618 1586
1619 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1620 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1591 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1593 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626 ; 1595 ;
1627 1596
1628 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1629 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1632 &ev.xbutton.state); 1601 &ev.xbutton.state);
1633#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1697#endif 1666#endif
1698 } 1667 }
1699 } 1668 }
1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701 { 1670 {
1702 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1704 ; 1673 ;
1705 1674
1706 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1707 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1708 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1679 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1715 scrollbar_show (1); 1684 scrollbar_show (1);
1716 } 1685 }
1717 break; 1686 break;
1718 } 1687 }
1719 1688
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 { 1691 {
1725 if (hidden_cursor) 1692 if (hidden_cursor)
1726 { 1693 {
1727 hidden_cursor = 0; 1694 hidden_cursor = 0;
1728 want_refresh = 1; 1695 want_refresh = 1;
1729 } 1696 }
1730 1697
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1699 }
1733#endif 1700#endif
1734 1701
1735#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1753 if (!focus) 1720 if (!focus)
1754 { 1721 {
1755 focus = 1; 1722 focus = 1;
1756 want_refresh = 1; 1723 want_refresh = 1;
1757 1724
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 1726
1760#if USE_XIM 1727#if USE_XIM
1761 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1762 { 1729 {
1763 IMSetStatusPosition (); 1730 IMSetPosition ();
1764 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1765 } 1732 }
1766#endif 1733#endif
1767#if CURSOR_BLINK 1734#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1737#endif
1771#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1773 { 1740 {
1774 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1814 } 1781 }
1815#endif 1782#endif
1816 } 1783 }
1817} 1784}
1818 1785
1819#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1820void 1800void
1821rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1802{
1823 SET_R (this); 1803 make_current ();
1824 SET_LOCALE (locale);
1825 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1826 switch (ev.type) 1810 switch (ev.type)
1827 { 1811 {
1828 case PropertyNotify: 1812 case PropertyNotify:
1829 /* 1813 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1838 case ReparentNotify: 1822 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1841 break; 1825 break;
1842 } 1826 }
1827# endif
1843} 1828}
1844#endif 1829#endif
1845 1830
1846void 1831void
1847rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1841 /*
1857 * VT window processing of button press 1842 * VT window processing of button press
1858 */ 1843 */
1859 if (ev.window == vt) 1844 if (ev.window == vt)
1860 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1861#if ISO_14755 1849#if ISO_14755
1862 // 5.4 1850 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1852 {
1865 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1907 else 1895 else
1908 { 1896 {
1909 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1911 1899
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1900 switch (ev.button)
1914 { 1901 {
1915 case Button1: 1902 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1907#else
1921 selection.rect = false; 1908 selection.rect = false;
1922#endif 1909#endif
1923 1910
1924 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1913 {
1927 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1929 else 1916 else
1930 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1931 } 1918 }
1932 else 1919 else
1933 { 1920 {
1934 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1922 MEvent.clicks++;
1936 else 1923 else
1937 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1938 1925
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1927 }
1941 1928
1942 MEvent.button = Button1; 1929 MEvent.button = Button1;
1943 break; 1930 break;
1944 1931
1945 case Button3: 1932 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1948 else 1935 else
1949 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1950 1937
1951 MEvent.button = Button3; 1938 MEvent.button = Button3;
1952 break; 1939 break;
1953 } 1940 }
1954 } 1941 }
1955 1942
1956 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1957 return; 1944 return;
1958 } 1945 }
1959 1946
… …
2098 } 2085 }
2099 } 2086 }
2100 2087
2101 return; 2088 return;
2102 } 2089 }
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} 2090}
2112 2091
2113void 2092void
2114rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2115{ 2094{
… …
2121 2100
2122 if (scrollbar_isUpDn ()) 2101 if (scrollbar_isUpDn ())
2123 { 2102 {
2124 scrollBar.setIdle (); 2103 scrollBar.setIdle ();
2125 scrollbar_show (0); 2104 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2105 }
2130 2106
2131#ifdef SELECTION_SCROLLING 2107#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2108 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2134#endif 2110#endif
2135 2111
2136 if (ev.window == vt) 2112 if (ev.window == vt)
2137 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2138#if ISO_14755 2117#if ISO_14755
2139 // 5.4 2118 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2120 return;
2142#endif 2121#endif
2122
2143 if (reportmode) 2123 if (reportmode)
2144 { 2124 {
2145 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2151 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2152 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2153 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2154 selection_extend (ev.x, ev.y, 0);
2175 2155
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2156 switch (ev.button)
2180 { 2157 {
2181 case Button1: 2158 case Button1:
2182 case Button3: 2159 case Button3:
2183 selection_make (ev.time); 2160 selection_make (ev.time);
2184 break; 2161 break;
2162
2185 case Button2: 2163 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2166 break;
2167
2188#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2189 case Button4: 2169 case Button4:
2190 case Button5: 2170 case Button5:
2191 { 2171 {
2192 int i; 2172 int i;
… …
2224 } 2204 }
2225 break; 2205 break;
2226#endif 2206#endif
2227 } 2207 }
2228 } 2208 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2209}
2234 2210
2235#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2236#if TINTING 2212#if TINTING
2237/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2238 2214
2239typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2240 2216
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{ 2218{
2243 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i; 2224 int i;
2249 2225
2250 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2251 2227
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253 2229
2254 /* for convenience */ 2230 /* for convenience */
2255 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2476 Atom atype; 2452 Atom atype;
2477 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2478 Window root, oldp, *list; 2454 Window root, oldp, *list;
2479 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482 2457
2483 pchanged = 0; 2458 pchanged = 0;
2484 2459
2485 if (!OPTION (Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2487 2462
2488 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2490 2465
2491 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2492 2467
2493 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2494 { 2469 {
2495 if (am_transparent) 2470 if (am_transparent)
2496 { 2471 {
2497 pchanged = 1; 2472 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2500 } 2475 }
2501 2476
2502 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2503 } 2478 }
2504 2479
2505 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False); 2481 XSync (dpy, False);
2507 2482
2508 /* 2483 /*
2509 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2512 */ 2487 */
2513 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2517 2492
2518 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2523 2498
2524 if (!i || prop == NULL 2499 if (!i || prop == NULL
2525#if TINTING 2500#if TINTING
2526 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2527#endif 2502#endif
2528 ) 2503 )
2529 have_pixmap = 0; 2504 have_pixmap = 0;
2530 else 2505 else
2531 { 2506 {
… …
2544 Window cr; 2519 Window cr;
2545 XImage *image; 2520 XImage *image;
2546 GC gc; 2521 GC gc;
2547 XGCValues gcvalue; 2522 XGCValues gcvalue;
2548 2523
2549 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2553 nx = ny = 0; 2528 nx = ny = 0;
2554 2529
… …
2567 } 2542 }
2568 2543
2569 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571 2546
2572 XSync (disp, False); 2547 XSync (dpy, False);
2573 allowedxerror = -1; 2548 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575 2550
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2578 allowedxerror = 0; 2553 allowedxerror = 0;
2579 2554
… …
2582 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2583 { 2558 {
2584 pchanged = 1; 2559 pchanged = 1;
2585 if (pixmap != None) 2560 if (pixmap != None)
2586 { 2561 {
2587 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2588 pixmap = None; 2563 pixmap = None;
2589 } 2564 }
2590 } 2565 }
2591 2566
2592 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2593 } 2568 }
2594 else 2569 else
2595 { 2570 {
2596 if (pixmap != None) 2571 if (pixmap != None)
2597 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2598 2573
2599#if TINTING 2574#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2601 { 2576 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604 2578
2579 rgba c;
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2606 2581
2607 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608 } 2583 }
2609#endif 2584#endif
2610 2585
2611 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2617 XDestroyImage (image); 2591 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2620 2594
2621 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1; 2596 pchanged = 1;
2623 2597
2624 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2625 } 2599 }
2626 } 2600 }
2627 2601
2628 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2630 else 2604 else
2631 { 2605 {
2632 unsigned int n; 2606 unsigned int n;
2633 /* 2607 /*
2634 * InheritPixmap transparency 2608 * InheritPixmap transparency
2635 */ 2609 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 { 2611 {
2638 oldp = parent[i]; 2612 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2640 &parent[i], &list, &n);
2641 XFree (list); 2614 XFree (list);
2642 2615
2643 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2644 { 2617 {
2645 if (oldp != None) 2618 if (oldp != None)
… …
2653 } 2626 }
2654 2627
2655 n = 0; 2628 n = 0;
2656 2629
2657 if (pchanged) 2630 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2660 { 2632 {
2661 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 { 2636 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break; 2638 break;
2666 } 2639 }
2667 } 2640 }
2668 }
2669 2641
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2671 { 2643 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0; 2646 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2676 } 2648 }
2677 else 2649 else
2678 { 2650 {
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++) 2651 for (n = 0; n < (unsigned int)i; n++)
2685 { 2652 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2688 } 2655 }
2689 2656
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2691 am_transparent = 1; 2658 am_transparent = 1;
2692 } 2659 }
2693 2660
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None; 2662 parent[i] = None;
2696 } 2663 }
2697 2664
2698 if (scrollBar.win) 2665 if (scrollBar.win)
2699 { 2666 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2702 scrollbar_show (0); 2669 scrollbar_show (0);
2703 } 2670 }
2704 2671
2705 if (am_transparent) 2672 if (am_transparent)
… …
2780 } 2747 }
2781 2748
2782 // scr_add_lines only works for nlines <= nrow - 1. 2749 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2750 if (nlines >= nrow - 1)
2784 { 2751 {
2752 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2753 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2754 scr_add_lines (buf, str - buf, nlines);
2787 2755
2788 nlines = 0; 2756 nlines = 0;
2789 str = buf; 2757 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2758 eol = str + min (ncol, UBUFSIZ);
… …
2805 2773
2806 seq_begin = cmdbuf_ptr; 2774 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2775 ch = next_char ();
2808 } 2776 }
2809 2777
2778 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2780 scr_add_lines (buf, str - buf, nlines);
2812 2781
2813 /* 2782 /*
2814 * If there have been a lot of new lines, then update the screen 2783 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2784 * What the heck I'll cheat and only refresh less than every page-full.
… …
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++; 2791 refresh_limit++;
2823 else 2792 else
2824 { 2793 {
2825 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2826 scr_refresh (refresh_type); 2796 scr_refresh ();
2827 want_refresh = 1; 2797 want_refresh = 1;
2828 } 2798 }
2829 } 2799 }
2830 2800
2831 } 2801 }
… …
2849 return flag; 2819 return flag;
2850} 2820}
2851 2821
2852// read the next character 2822// read the next character
2853wchar_t 2823wchar_t
2854rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2855{ 2825{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2827 {
2858 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 return NOCHAR; 2850 return NOCHAR;
2881} 2851}
2882 2852
2883// read the next octet 2853// read the next octet
2884uint32_t 2854uint32_t
2885rxvt_term::next_octet () 2855rxvt_term::next_octet () NOTHROW
2886{ 2856{
2887 return cmdbuf_ptr < cmdbuf_endp 2857 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2858 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2859 : NOCHAR;
2890} 2860}
2861
2862static class out_of_input out_of_input;
2891 2863
2892/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2893/* 2865/*
2894 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2895 * to the command. 2867 * to the command.
2896 */ 2868 */
2897wchar_t 2869wchar_t
2898rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2871{
2900 wchar_t c = next_char (); 2872 wchar_t c = next_char ();
2901 2873
2902 if (c == NOCHAR) 2874 if (c == NOCHAR)
2903 throw out_of_input; 2875 throw out_of_input;
2904 2876
2905 return c; 2877 return c;
2906} 2878}
2907 2879
2908uint32_t 2880uint32_t
2909rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2882{
2911 uint32_t c = next_octet (); 2883 uint32_t c = next_octet ();
2912 2884
2913 if (c == NOCHAR) 2885 if (c == NOCHAR)
2914 throw out_of_input; 2886 throw out_of_input;
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 3125 break;
3154 case '+': 3126 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 3128 break;
3157#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3158 case '6': 3130 case '6':
3159 scr_backindex (); 3131 scr_backindex ();
3160 break; 3132 break;
3161#endif 3133#endif
3162 case '7': 3134 case '7':
3163 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3164 break; 3136 break;
3165 case '8': 3137 case '8':
3166 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3167 break; 3139 break;
3168#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3169 case '9': 3141 case '9':
3170 scr_forwardindex (); 3142 scr_forwardindex ();
3171 break; 3143 break;
3172#endif 3144#endif
3173 case '=': 3145 case '=':
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 3309 if (arg[p] == -1)
3338 arg[p] = ndef; 3310 arg[p] = ndef;
3339 3311
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 /* 3312 /*
3348 * private mode handling 3313 * private mode handling
3349 */ 3314 */
3350 if (priv) 3315 if (priv)
3351 { 3316 {
3352 switch (priv) 3317 switch (priv)
3353 { 3318 {
3354 case '>': 3319 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3357 break; 3331 break;
3358 case '?': 3332 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 3335 break;
… …
3564 break; 3538 break;
3565 case CSI_75: 3539 case CSI_75:
3566 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3567 break; 3541 break;
3568 3542
3569#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3570 case CSI_74: 3544 case CSI_74:
3571 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3572 break; 3546 break;
3573#endif 3547#endif
3574 3548
… …
3581 break; 3555 break;
3582 } 3556 }
3583} 3557}
3584/*}}} */ 3558/*}}} */
3585 3559
3586#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3561/* ARGSUSED */
3588void 3562void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3564{
3591 int x, y; 3565 int x, y;
3592 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3593 Window wdummy; 3567 Window wdummy;
3594 dDisp; 3568
3569 dLocal (Display *, dpy);
3595 3570
3596 if (nargs == 0) 3571 if (nargs == 0)
3597 return; 3572 return;
3598 3573
3599 switch (args[0]) 3574 switch (args[0])
3600 { 3575 {
3601 /* 3576 /*
3602 * commands 3577 * commands
3603 */ 3578 */
3604 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3606 break; 3581 break;
3607 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3584 break;
3610 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3587 break;
3613 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3590 break;
3616 case 5: /* raise window */ 3591 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3618 break; 3593 break;
3619 case 6: /* lower window */ 3594 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3621 break; 3596 break;
3622 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3623 scr_touch (true); 3598 scr_touch (true);
3624 break; 3599 break;
3625 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3635 break; 3610 break;
3636 3611
3637
3638 /* 3612 /*
3639 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3640 */ 3614 */
3641 case 11: /* report window state */ 3615 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3618 break;
3645 case 13: /* report window position */ 3619 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3625 break;
3652 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3629 break;
3656 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3632 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3635 break;
3662 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3663 { 3637 {
3664 char *s; 3638 char *s;
3665 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3641 XFree (s);
3668 } 3642 }
3669 break; 3643 break;
3670 case 21: /* report window title */ 3644 case 21: /* report window title */
3671 { 3645 {
3672 char *s; 3646 char *s;
3673 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3649 XFree (s);
3676 } 3650 }
3677 break; 3651 break;
3678 } 3652 }
… …
3706 seen_esc = true; 3680 seen_esc = true;
3707 continue; 3681 continue;
3708 } 3682 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3687 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3713 3689
3714 seen_esc = false; 3690 seen_esc = false;
3715 3691
3716 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3693 // stop at some sane length
3718 return NULL; 3694 return NULL;
3719 3695
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3696 string[n++] = ch;
3724 } 3697 }
3725 3698
3726 string[n++] = '\0'; 3699 string[n++] = '\0';
3727 3700
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3779void 3752void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3754{
3782 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3783 { 3756 {
3784 unsigned short r, g, b; 3757 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3766 }
3788 else 3767 else
3789 set_window_color (color, str); 3768 set_window_color (color, str);
3790} 3769}
3791 3770
… …
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3773 */
3795void 3774void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3776{
3798 int changed = 0;
3799 int color; 3777 int color;
3800 char *buf, *name; 3778 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3780 int saveop = op;
3803 dDisp; 3781
3782 dLocal (Display *, dpy);
3804 3783
3805 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3806 switch (op) 3789 switch (op)
3807 { 3790 {
3808 case XTerm_name: 3791 case XTerm_name:
3809 set_title (str); 3792 set_title (str);
3810 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3807 unsigned long bytes_after;
3825 unsigned char *value = 0; 3808 unsigned char *value = 0;
3826 const char *str = ""; 3809 const char *str = "";
3827 3810
3828 if (prop 3811 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3816 && actual_type != None
3834 && actual_format == 8) 3817 && actual_format == 8)
3835 str = (const char *)(value); 3818 str = (const char *)(value);
3836 3819
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3821
3839 XFree (value); 3822 XFree (value);
3840 } 3823 }
3841 else 3824 else
3842 { 3825 {
… …
3846 { 3829 {
3847 *eq = 0; 3830 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3849 } 3832 }
3850 else 3833 else
3851 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 3835 display->atom (str));
3853 } 3836 }
3854 break; 3837 break;
3855 3838
3856 case XTerm_Color: 3839 case XTerm_Color:
… …
3866 break; 3849 break;
3867 3850
3868 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3852 *buf++ = '\0';
3870 3853
3871 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color].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, name);
3879 } 3855 }
3880 break; 3856 break;
3881 case XTerm_Color00: 3857 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3883 break; 3859 break;
3884 case XTerm_Color01: 3860 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3886 break; 3862 break;
3887#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3890 break; 3866 break;
3891#endif 3867#endif
3892 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 3870 break;
3895 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 3873 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3901 break; 3877 break;
3902 case Rxvt_Color_BD: 3878 case Rxvt_Color_BD:
3903 case URxvt_Color_BD: 3879 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp); 3880 process_color_seq (op, Color_BD, str, resp);
3905 break; 3881 break;
3906 case Rxvt_Color_UL: 3882 case Rxvt_Color_UL:
3907 case URxvt_Color_UL: 3883 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp); 3884 process_color_seq (op, Color_UL, str, resp);
3909 break; 3885 break;
3910 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3912 break; 3888 break;
3913#endif 3889#endif
3914#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3917 check_our_parents (); 3894 check_our_parents ();
3895
3918 if (am_transparent) 3896 if (am_transparent)
3919 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3898
3920 break; 3899 break;
3921#endif 3900#endif
3922 3901
3923 case Rxvt_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3924 if (*str != ';') 3904 if (*str != ';')
3925 { 3905 {
3926#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3929 scr_touch (true); 3909 scr_touch (true);
3930#endif 3910#endif
3931 } 3911 }
3932 3912
3913 int changed = 0;
3914
3933 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3934 { 3916 {
3935 str++; 3917 str++;
3936#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3938#endif 3920#endif
3939 } 3921 }
3940 3922
3941 if (changed) 3923 if (changed)
3942 { 3924 {
3943#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3926 resize_pixmap ();
3945 scr_touch (true); 3927 scr_touch (true);
3946#endif 3928#endif
3947 } 3929 }
3930 }
3948 break; 3931 break;
3949 3932
3950 case Rxvt_restoreFG: 3933 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3952 break; 3935 break;
… …
3956 3939
3957 case XTerm_logfile: 3940 case XTerm_logfile:
3958 // TODO, when secure mode? 3941 // TODO, when secure mode?
3959 break; 3942 break;
3960 3943
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3944#if 0
3968 case Rxvt_dumpscreen: /* no error notices */ 3945 case Rxvt_dumpscreen: /* no error notices */
3969 { 3946 {
3970 int fd; 3947 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3948 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3997 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3998 set_fonts (); 3975 set_fonts ();
3999 } 3976 }
4000 break; 3977 break;
4001 3978
4002#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3988 case URxvt_locale:
4004 if (query) 3989 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3991 else
4007 { 3992 {
4008 set_locale (str); 3993 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3995 init_xlocale ();
4011 } 3996 }
4012 break; 3997 break;
4013 3998
4014 case URxvt_view_up: 3999 case URxvt_view_up:
… …
4025 break; 4010 break;
4026#endif 4011#endif
4027 4012
4028#if ENABLE_PERL 4013#if ENABLE_PERL
4029 case URxvt_perl: 4014 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 4016 ; // no responses yet
4032 break; 4017 break;
4033#endif 4018#endif
4034 } 4019 }
4035} 4020}
… …
4067 return state; 4052 return state;
4068} 4053}
4069 4054
4070/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4071void 4056void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4058{
4074 unsigned int i, j; 4059 unsigned int i, j;
4075 int state; 4060 int state;
4076 4061
4077 static const struct 4062 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4073 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4074 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4075 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4076 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4077 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4078 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4079 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4081 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4082#endif
… …
4195 /* case 8: - auto repeat, can't do on a per window basis */ 4177 /* case 8: - auto repeat, can't do on a per window basis */
4196 case 9: /* X10 mouse reporting */ 4178 case 9: /* X10 mouse reporting */
4197 if (state) /* orthogonal */ 4179 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX11; 4180 priv_modes &= ~PrivMode_MouseX11;
4199 break; 4181 break;
4200#ifdef menuBar_esc
4201 case menuBar_esc:
4202#ifdef MENUBAR
4203 map_menuBar (state);
4204#endif
4205 break;
4206#endif
4207#ifdef scrollBar_esc 4182#ifdef scrollBar_esc
4208 case scrollBar_esc: 4183 case scrollBar_esc:
4209 if (scrollbar_mapping (state)) 4184 if (scrollbar_mapping (state))
4210 { 4185 {
4211 resize_all_windows (0, 0, 0); 4186 resize_all_windows (0, 0, 0);
… …
4381 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4382 break; 4357 break;
4383 4358
4384 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4385 4360
4386#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4387 case 90: 4362 case 90:
4388 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4389 case 92: 4364 case 92:
4390 case 93: 4365 case 93:
4391 case 94: 4366 case 94:
… …
4456rxvt_term::tt_write (const char *data, unsigned int len) 4431rxvt_term::tt_write (const char *data, unsigned int len)
4457{ 4432{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4433 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return; 4434 return;
4460 4435
4461 if (pty.pty < 0) 4436 if (pty->pty < 0)
4462 return; 4437 return;
4463 4438
4464 if (v_buflen == 0) 4439 if (v_buflen == 0)
4465 { 4440 {
4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4441 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4467 4442
4468 if ((unsigned int)written == len) 4443 if ((unsigned int)written == len)
4469 return; 4444 return;
4470 4445
4471 data += written; 4446 data += written;
… …
4480 pty_ev.set (EVENT_READ | EVENT_WRITE); 4455 pty_ev.set (EVENT_READ | EVENT_WRITE);
4481} 4456}
4482 4457
4483void rxvt_term::pty_write () 4458void rxvt_term::pty_write ()
4484{ 4459{
4485 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4486 4461
4487 if (written > 0) 4462 if (written > 0)
4488 { 4463 {
4489 v_buflen -= written; 4464 v_buflen -= written;
4490 4465

Diff Legend

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