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.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.315 by root, Tue Aug 22 13:07:17 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);
867#endif 871#endif
868 /* nil */ ; 872 /* nil */ ;
869 } 873 }
870 } 874 }
871 875
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
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;
1046 int end_row = row + nrow;
978 1047
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1049 --row;
981 1050
982 while (row < -view_start + nrow) 1051 do
983 { 1052 {
984 int start_row = row; 1053 int start_row = row;
985 line_t *l; 1054 line_t *l;
986 1055
987 do 1056 do
988 { 1057 {
989 l = &ROW (row); 1058 l = &ROW (row++);
990 1059
991 if (!(l->f & LINE_FILTERED)) 1060 if (!(l->f & LINE_FILTERED))
992 { 1061 {
993 // line not filtered, mark it as filtered 1062 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1063 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1064 while (l->is_longer ())
996 { 1065 {
997 l = &ROW (++row); 1066 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1067 l->f |= LINE_FILTERED;
999 } 1068 }
1000 1069
1001 // and filter it 1070 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1072
1004 break; 1073 break;
1005 } 1074 }
1006 } 1075 }
1007 while (l->is_longer ()); 1076 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1077 }
1078 while (row < end_row);
1011 1079 }
1012 }
1013 1080
1014 scr_refresh (refresh_type); 1081 scr_refresh ();
1015 scrollbar_show (1); 1082 scrollbar_show (1);
1016#ifdef USE_XIM 1083#ifdef USE_XIM
1017 IMSendSpot (); 1084 IMSendSpot ();
1018#endif 1085#endif
1019 } 1086 }
1022} 1089}
1023 1090
1024void 1091void
1025rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1026{ 1093{
1027 SET_R (this); 1094 make_current ();
1028 SET_LOCALE (locale);
1029 1095
1030 display->flush (); 1096 display->flush ();
1031 1097
1032 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1033 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
1034} 1100}
1035 1101
1036void 1102void
1037rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1038{ 1104{
1039 SET_R (this); 1105 make_current ();
1040 SET_LOCALE (locale);
1041 1106
1042 refresh_limit = 1; 1107 refresh_limit = 1;
1043 refresh_count = 0; 1108 refresh_count = 0;
1044 flush (); 1109 flush ();
1045} 1110}
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1115{
1051 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1117 want_refresh = 1;
1053 1118
1054 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1120}
1056#endif 1121#endif
1057 1122
1058#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1059void 1124void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1139{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1142 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1143 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1145 }
1082} 1146}
1083#endif 1147#endif
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1152{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1154 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1156 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1158 }
1096} 1159}
1097#endif 1160#endif
1102{ 1165{
1103 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1104 || 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)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1169 {
1107 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1110 1172
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1173 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1175 }
1115} 1176}
1116#endif 1177#endif
1117 1178
1118#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1119static struct event_handler 1180static struct event_handler
1120{ 1181{
1121 check_watcher cw_yield; 1182 check_watcher yield_ev;
1122 1183
1123 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1124 { 1185 {
1125 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
1126 w.stop (); 1194 w.stop ();
1127 } 1195 }
1128 1196
1129 event_handler () 1197 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1131 { 1199 {
1132 } 1200 }
1133} event_handler; 1201} event_handler;
1134#endif 1202#endif
1135 1203
1146 1214
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1150 1218
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1220
1153 if (r > 0) 1221 if (r > 0)
1154 { 1222 {
1155 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1156 return true; 1224 return true;
1157 } 1225 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1227 {
1160#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1161 if (display->is_local) 1229 if (display->is_local)
1162 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1163#endif 1231#endif
1164 } 1232 }
1165 else 1233 else
1166 { 1234 {
1167 pty_ev.stop (); 1235 pty_ev.stop ();
1174} 1242}
1175 1243
1176void 1244void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1246{
1179 SET_R (this); 1247 make_current ();
1180 SET_LOCALE (locale);
1181 1248
1182 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1251 while (pty_fill ())
1185 if (cmd_parse ()) 1252 if (cmd_parse ())
1190} 1257}
1191 1258
1192void 1259void
1193rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1194{ 1261{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1263 recolour_cursor ();
1197 1264
1198#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1266 hidden_pointer = 0;
1200 1267
1208rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1209{ 1276{
1210 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1211 return; 1278 return;
1212 1279
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1281 XFlush (dpy);
1215 1282
1216 hidden_pointer = 1; 1283 hidden_pointer = 1;
1217} 1284}
1218 1285
1219void 1286void
1220rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1221{ 1288{
1222 SET_R (this); 1289 make_current ();
1223 SET_LOCALE (locale);
1224 1290
1225 pointer_blank (); 1291 pointer_blank ();
1226} 1292}
1227#endif 1293#endif
1228 1294
1293 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1294 (32 + x + 1), 1360 (32 + x + 1),
1295 (32 + y + 1)); 1361 (32 + y + 1));
1296} 1362}
1297 1363
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1364/*{{{ process an X event */
1309void 1365void
1310rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1311{ 1367{
1312 dDisp; 1368 make_current ();
1313 1369
1314 SET_R (this); 1370 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 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
1317 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1318 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1319 unsigned int unused_mask; 1380 unsigned int unused_mask;
1320 1381
1321 switch (ev.type) 1382 switch (ev.type)
1322 { 1383 {
1323 case KeyPress: 1384 case KeyPress:
1324#if ISO_14755 1385 key_press (ev.xkey);
1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1327 lookup_key (ev.xkey);
1328
1329 break; 1386 break;
1330 1387
1331 case KeyRelease: 1388 case KeyRelease:
1332 { 1389 key_release (ev.xkey);
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1334 KeySym ks;
1335
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif
1338
1339#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support
1341 if (iso14755buf)
1342 if (iso14755buf & ISO_14755_52)
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1348 // iso14755 part 5.2 handling: release time
1349 // first: controls
1350 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f)))
1353 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1355 commit_iso14755 ();
1356 goto skip_switch;
1357 }
1358
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks)
1361 {
1362 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 ();
1364 goto skip_switch;
1365 }
1366
1367 scr_bell ();
1368# endif
1369 iso14755buf = 0;
1370 break;
1371 }
1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1377 if (iso14755buf & ISO_14755_51)
1378 commit_iso14755 ();
1379#if ISO_14755
1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1390 }
1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1396
1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1401 mouse_slip_wheel_speed = 0;
1402#endif
1403 break; 1390 break;
1404 }
1405 1391
1406 case ButtonPress: 1392 case ButtonPress:
1407 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1408 break; 1394 break;
1409 1395
1411 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1412 break; 1398 break;
1413 1399
1414 case ClientMessage: 1400 case ClientMessage:
1415 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417 { 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 {
1418 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)))
1419 destroy (); 1411 destroy ();
1412 }
1420#if ENABLE_EWMH 1413#if ENABLE_EWMH
1421 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])
1422 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &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 }
1425#endif 1429#endif
1426 } 1430 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1436#ifdef OFFIX_DND
1437 /* OffiX Dnd (drag 'n' drop) protocol */
1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1439 && (ev.xclient.data.l[0] == DndFile
1440 || ev.xclient.data.l[0] == DndDir
1441 || ev.xclient.data.l[0] == DndLink))
1442 {
1443 /* Get Dnd data */
1444 Atom ActualType;
1445 int ActualFormat;
1446 unsigned char *data;
1447 unsigned long Size, RemainingBytes;
1448
1449 XGetWindowProperty (disp, display->root,
1450 xa[XA_DNDSELECTION],
1451 0L, 1000000L,
1452 False, AnyPropertyType,
1453 &ActualType, &ActualFormat,
1454 &Size, &RemainingBytes,
1455 &data);
1456 set_string_property (XA_CUT_BUFFER0, data);
1457 XFree (data);
1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1460 }
1461#endif /* OFFIX_DND */
1462 break; 1431 break;
1463 1432
1464 case MappingNotify: 1433 case MappingNotify:
1465 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1466 break; 1435 break;
1499 break; 1468 break;
1500 1469
1501 case ConfigureNotify: 1470 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1503 { 1472 {
1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1505 ; 1474 ;
1506 1475
1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508 { 1477 {
1509 seen_resize = 1; 1478 seen_resize = 1;
1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511 } 1480 }
1512 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1515 check_our_parents (); 1486 check_our_parents ();
1516#endif 1487#endif
1517 } 1488 }
1518 break; 1489 break;
1519 1490
1520 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1523 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1524 1496
1525 break; 1497 break;
1526 1498
1527 case SelectionClear: 1499 case SelectionClear:
1528 selection_clear (); 1500 selection_clear ();
1564 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1565 { 1537 {
1566 do 1538 do
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1570 1542
1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572 1544
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1575 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1576 1548
1577 scr_refresh (refresh_type); 1549 want_refresh = 1;
1578 } 1550 }
1579 else 1551 else
1580 { 1552 {
1581 XEvent unused_event; 1553 XEvent unused_event;
1582 1554
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1584 ; 1556 ;
1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1586 ; 1558 ;
1587 1559
1588 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1589 { 1561 {
1590 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1591 scrollbar_show (0); 1563 scrollbar_show (0);
1592 } 1564 }
1593#ifdef MENUBAR
1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595 menubar_expose ();
1596#endif
1597 1565
1598#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1599 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1600 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1601#endif 1569#endif
1602 } 1570 }
1603 break; 1571 break;
1604 1572
1605 case MotionNotify: 1573 case MotionNotify:
1606#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1607 if (hidden_pointer) 1575 if (hidden_pointer)
1608 pointer_unblank (); 1576 pointer_unblank ();
1609#endif 1577#endif
1610#if MENUBAR
1611 if (isMenuBarWindow (ev.xany.window))
1612 {
1613 menubar_control (ev.xbutton);
1614 break;
1615 }
1616#endif
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1579 break;
1619 1580
1620 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1621 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1585 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1587 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1589 ;
1628 1590
1629 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1595 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1698#endif 1660#endif
1699 } 1661 }
1700 } 1662 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702 { 1664 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1705 ; 1667 ;
1706 1668
1707 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1673 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1675 scrollbar_size ());
1714 scr_refresh (refresh_type); 1676 want_refresh = 1;
1715 refresh_limit = 0; 1677 refresh_limit = 0;
1716 scrollbar_show (1); 1678 scrollbar_show (1);
1717 } 1679 }
1718 break; 1680 break;
1719 } 1681 }
1720 1682
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1685 {
1726 if (hidden_cursor) 1686 if (hidden_cursor)
1727 { 1687 {
1728 hidden_cursor = 0; 1688 hidden_cursor = 0;
1729 want_refresh = 1; 1689 want_refresh = 1;
1730 } 1690 }
1731 1691
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1693 }
1734#endif 1694#endif
1735 1695
1736#if defined(POINTER_BLANK) 1696#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1754 if (!focus) 1714 if (!focus)
1755 { 1715 {
1756 focus = 1; 1716 focus = 1;
1757 want_refresh = 1; 1717 want_refresh = 1;
1758 1718
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1720
1761#if USE_XIM 1721#if USE_XIM
1762 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1763 { 1723 {
1764 IMSetStatusPosition (); 1724 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1766 } 1726 }
1767#endif 1727#endif
1768#if CURSOR_BLINK 1728#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1731#endif
1772#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1774 { 1734 {
1775 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1815 } 1775 }
1816#endif 1776#endif
1817 } 1777 }
1818} 1778}
1819 1779
1820#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
1821void 1794void
1822rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1796{
1824 SET_R (this); 1797 make_current ();
1825 SET_LOCALE (locale);
1826 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
1827 switch (ev.type) 1804 switch (ev.type)
1828 { 1805 {
1829 case PropertyNotify: 1806 case PropertyNotify:
1830 /* 1807 /*
1831 * 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,
1839 case ReparentNotify: 1816 case ReparentNotify:
1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1841 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1842 break; 1819 break;
1843 } 1820 }
1821# endif
1844} 1822}
1845#endif 1823#endif
1846 1824
1847void 1825void
1848rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1857 /* 1835 /*
1858 * VT window processing of button press 1836 * VT window processing of button press
1859 */ 1837 */
1860 if (ev.window == vt) 1838 if (ev.window == vt)
1861 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1862#if ISO_14755 1843#if ISO_14755
1863 // 5.4 1844 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 { 1846 {
1866 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
1908 else 1889 else
1909 { 1890 {
1910 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1911 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1912 1893
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 switch (ev.button) 1894 switch (ev.button)
1915 { 1895 {
1916 case Button1: 1896 case Button1:
1917 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1919#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1921#else 1901#else
1922 selection.rect = false; 1902 selection.rect = false;
1923#endif 1903#endif
1924 1904
1925 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927 { 1907 {
1928 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1930 else 1910 else
1931 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1932 } 1912 }
1933 else 1913 else
1934 { 1914 {
1935 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1936 MEvent.clicks++; 1916 MEvent.clicks++;
1937 else 1917 else
1938 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1939 1919
1940 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1941 } 1921 }
1942 1922
1943 MEvent.button = Button1; 1923 MEvent.button = Button1;
1944 break; 1924 break;
1945 1925
1946 case Button3: 1926 case Button3:
1947 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1948 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1949 else 1929 else
1950 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1951 1931
1952 MEvent.button = Button3; 1932 MEvent.button = Button3;
1953 break; 1933 break;
1954 } 1934 }
1955 } 1935 }
1956 1936
1957 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1958 return; 1938 return;
1959 } 1939 }
1960 1940
2099 } 2079 }
2100 } 2080 }
2101 2081
2102 return; 2082 return;
2103 } 2083 }
2104
2105#if MENUBAR
2106 /*
2107 * Menubar window processing of button press
2108 */
2109 if (isMenuBarWindow (ev.window))
2110 menubar_control (ev);
2111#endif
2112} 2084}
2113 2085
2114void 2086void
2115rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2116{ 2088{
2122 2094
2123 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2124 { 2096 {
2125 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2126 scrollbar_show (0); 2098 scrollbar_show (0);
2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128 refresh_type &= ~SMOOTH_REFRESH;
2129#endif
2130 } 2099 }
2131 2100
2132#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2133 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2134 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2135#endif 2104#endif
2136 2105
2137 if (ev.window == vt) 2106 if (ev.window == vt)
2138 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2139#if ISO_14755 2111#if ISO_14755
2140 // 5.4 2112 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return; 2114 return;
2143#endif 2115#endif
2116
2144 if (reportmode) 2117 if (reportmode)
2145 { 2118 {
2146 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2147 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2148 if (ev.button >= 4) 2121 if (ev.button >= 4)
2172 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2173 && bypass_keystate 2146 && bypass_keystate
2174 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2175 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2176 2149
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
2180 switch (ev.button) 2150 switch (ev.button)
2181 { 2151 {
2182 case Button1: 2152 case Button1:
2183 case Button3: 2153 case Button3:
2184 selection_make (ev.time); 2154 selection_make (ev.time);
2185 break; 2155 break;
2156
2186 case Button2: 2157 case Button2:
2187 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);
2188 break; 2160 break;
2161
2189#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2190 case Button4: 2163 case Button4:
2191 case Button5: 2164 case Button5:
2192 { 2165 {
2193 int i; 2166 int i;
2215 slip_wheel_ev.start (); 2188 slip_wheel_ev.start ();
2216 } 2189 }
2217 else 2190 else
2218 { 2191 {
2219# endif 2192# endif
2220# ifdef JUMP_MOUSE_WHEEL
2221 scr_page (v, i); 2193 scr_page (v, i);
2222 scr_refresh (SMOOTH_REFRESH);
2223 scrollbar_show (1); 2194 scrollbar_show (1);
2224# else
2225 while (i--)
2226 {
2227 scr_page (v, 1);
2228 scr_refresh (SMOOTH_REFRESH);
2229 scrollbar_show (1);
2230 }
2231# endif
2232# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
2233 } 2196 }
2234#endif 2197# endif
2235 } 2198 }
2236 break; 2199 break;
2237#endif 2200#endif
2238 } 2201 }
2239 } 2202 }
2240#ifdef MENUBAR
2241 else if (isMenuBarWindow (ev.window))
2242 menubar_control (ev);
2243#endif
2244} 2203}
2245 2204
2246#ifdef TRANSPARENT 2205#ifdef TRANSPARENT
2247#if TINTING 2206#if TINTING
2248/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2249 2208
2250typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2251 2210
2252void 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)
2253{ 2212{
2254 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2255 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259 int i; 2218 int i;
2260 2219
2261 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2262 2221
2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264 2223
2265 /* for convenience */ 2224 /* for convenience */
2266 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
2487 Atom atype; 2446 Atom atype;
2488 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2489 Window root, oldp, *list; 2448 Window root, oldp, *list;
2490 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2491 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2492 dDisp;
2493 2451
2494 pchanged = 0; 2452 pchanged = 0;
2495 2453
2496 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2497 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2498 2456
2499 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2500 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2501 2459
2502 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2503 2461
2504 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2505 { 2463 {
2506 if (am_transparent) 2464 if (am_transparent)
2507 { 2465 {
2508 pchanged = 1; 2466 pchanged = 1;
2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2510 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2511 } 2469 }
2512 2470
2513 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2514 } 2472 }
2515 2473
2516 /* 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. */
2517 XSync (disp, False); 2475 XSync (dpy, False);
2518 2476
2519 /* 2477 /*
2520 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2521 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2522 * 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.
2523 */ 2481 */
2524 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2528 2486
2529 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2530 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2534 2492
2535 if (!i || prop == NULL 2493 if (!i || prop == NULL
2536#if TINTING 2494#if TINTING
2537 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2538#endif 2496#endif
2539 ) 2497 )
2540 have_pixmap = 0; 2498 have_pixmap = 0;
2541 else 2499 else
2542 { 2500 {
2555 Window cr; 2513 Window cr;
2556 XImage *image; 2514 XImage *image;
2557 GC gc; 2515 GC gc;
2558 XGCValues gcvalue; 2516 XGCValues gcvalue;
2559 2517
2560 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2561 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2562 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2563 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2564 nx = ny = 0; 2522 nx = ny = 0;
2565 2523
2578 } 2536 }
2579 2537
2580 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2581 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582 2540
2583 XSync (disp, False); 2541 XSync (dpy, False);
2584 allowedxerror = -1; 2542 allowedxerror = -1;
2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2586 2544
2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2588 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2589 allowedxerror = 0; 2547 allowedxerror = 0;
2590 2548
2593 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2594 { 2552 {
2595 pchanged = 1; 2553 pchanged = 1;
2596 if (pixmap != None) 2554 if (pixmap != None)
2597 { 2555 {
2598 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2599 pixmap = None; 2557 pixmap = None;
2600 } 2558 }
2601 } 2559 }
2602 2560
2603 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2604 } 2562 }
2605 else 2563 else
2606 { 2564 {
2607 if (pixmap != None) 2565 if (pixmap != None)
2608 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2609 2567
2610#if TINTING 2568#if TINTING
2611 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2612 { 2570 {
2613 unsigned short rm, gm, bm;
2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615 2572
2573 rgba c;
2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2617 2575
2618 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2619 } 2577 }
2620#endif 2578#endif
2621 2579
2622 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2623 szHint.width, szHint.height, image->depth);
2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2625 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2626 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2627 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2628 XDestroyImage (image); 2585 XDestroyImage (image);
2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2630 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2631 2588
2632 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2633 pchanged = 1; 2590 pchanged = 1;
2634 2591
2635 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2636 } 2593 }
2637 } 2594 }
2638 2595
2639 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2641 else 2598 else
2642 { 2599 {
2643 unsigned int n; 2600 unsigned int n;
2644 /* 2601 /*
2645 * InheritPixmap transparency 2602 * InheritPixmap transparency
2646 */ 2603 */
2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 { 2605 {
2649 oldp = parent[i]; 2606 oldp = parent[i];
2650 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2651 &parent[i], &list, &n);
2652 XFree (list); 2608 XFree (list);
2653 2609
2654 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2655 { 2611 {
2656 if (oldp != None) 2612 if (oldp != None)
2664 } 2620 }
2665 2621
2666 n = 0; 2622 n = 0;
2667 2623
2668 if (pchanged) 2624 if (pchanged)
2669 {
2670 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2671 { 2626 {
2672 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2674 { 2630 {
2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2676 break; 2632 break;
2677 } 2633 }
2678 } 2634 }
2679 }
2680 2635
2681 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2682 { 2637 {
2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2685 am_transparent = 0; 2640 am_transparent = 0;
2686 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2687 } 2642 }
2688 else 2643 else
2689 { 2644 {
2690#if WAIT_FOR_WM
2691 /* wait (an arbitrary period) for the WM to do its thing
2692 * needed for fvwm2.2.2 (and before?) */
2693 sleep (1);
2694#endif
2695 for (n = 0; n < (unsigned int)i; n++) 2645 for (n = 0; n < (unsigned int)i; n++)
2696 { 2646 {
2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2698 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2699 } 2649 }
2700 2650
2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2702 am_transparent = 1; 2652 am_transparent = 1;
2703 } 2653 }
2704 2654
2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2706 parent[i] = None; 2656 parent[i] = None;
2707 } 2657 }
2708 2658
2709 if (scrollBar.win) 2659 if (scrollBar.win)
2710 { 2660 {
2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2712 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2713 scrollbar_show (0); 2663 scrollbar_show (0);
2714 } 2664 }
2715 2665
2716 if (am_transparent) 2666 if (am_transparent)
2791 } 2741 }
2792 2742
2793 // scr_add_lines only works for nlines <= nrow - 1. 2743 // scr_add_lines only works for nlines <= nrow - 1.
2794 if (nlines >= nrow - 1) 2744 if (nlines >= nrow - 1)
2795 { 2745 {
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796 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))))
2797 scr_add_lines (buf, str - buf, nlines); 2748 scr_add_lines (buf, str - buf, nlines);
2798 2749
2799 nlines = 0; 2750 nlines = 0;
2800 str = buf; 2751 str = buf;
2801 eol = str + min (ncol, UBUFSIZ); 2752 eol = str + min (ncol, UBUFSIZ);
2816 2767
2817 seq_begin = cmdbuf_ptr; 2768 seq_begin = cmdbuf_ptr;
2818 ch = next_char (); 2769 ch = next_char ();
2819 } 2770 }
2820 2771
2772 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821 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))))
2822 scr_add_lines (buf, str - buf, nlines); 2774 scr_add_lines (buf, str - buf, nlines);
2823 2775
2824 /* 2776 /*
2825 * 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
2826 * 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.
2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833 refresh_limit++; 2785 refresh_limit++;
2834 else 2786 else
2835 { 2787 {
2836 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2837 scr_refresh (refresh_type); 2790 scr_refresh ();
2838 flush_ev.stop (); 2791 want_refresh = 1;
2839 } 2792 }
2840 } 2793 }
2841 2794
2842 } 2795 }
2843 else 2796 else
2860 return flag; 2813 return flag;
2861} 2814}
2862 2815
2863// read the next character 2816// read the next character
2864wchar_t 2817wchar_t
2865rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2866{ 2819{
2867 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2868 { 2821 {
2869 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2891 return NOCHAR; 2844 return NOCHAR;
2892} 2845}
2893 2846
2894// read the next octet 2847// read the next octet
2895uint32_t 2848uint32_t
2896rxvt_term::next_octet () 2849rxvt_term::next_octet () NOTHROW
2897{ 2850{
2898 return cmdbuf_ptr < cmdbuf_endp 2851 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++ 2852 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR; 2853 : NOCHAR;
2901} 2854}
2855
2856static class out_of_input out_of_input;
2902 2857
2903/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2904/* 2859/*
2905 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2906 * to the command. 2861 * to the command.
2907 */ 2862 */
2908wchar_t 2863wchar_t
2909rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2910{ 2865{
2911 wchar_t c = next_char (); 2866 wchar_t c = next_char ();
2912 2867
2913 if (c == NOCHAR) 2868 if (c == NOCHAR)
2914 throw out_of_input; 2869 throw out_of_input;
2915 2870
2916 return c; 2871 return c;
2917} 2872}
2918 2873
2919uint32_t 2874uint32_t
2920rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921{ 2876{
2922 uint32_t c = next_octet (); 2877 uint32_t c = next_octet ();
2923 2878
2924 if (c == NOCHAR) 2879 if (c == NOCHAR)
2925 throw out_of_input; 2880 throw out_of_input;
3163 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3164 break; 3119 break;
3165 case '+': 3120 case '+':
3166 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3167 break; 3122 break;
3168#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3169 case '6': 3124 case '6':
3170 scr_backindex (); 3125 scr_backindex ();
3171 break; 3126 break;
3172#endif 3127#endif
3173 case '7': 3128 case '7':
3174 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3175 break; 3130 break;
3176 case '8': 3131 case '8':
3177 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3178 break; 3133 break;
3179#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3180 case '9': 3135 case '9':
3181 scr_forwardindex (); 3136 scr_forwardindex ();
3182 break; 3137 break;
3183#endif 3138#endif
3184 case '=': 3139 case '=':
3346 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3347 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3348 if (arg[p] == -1) 3303 if (arg[p] == -1)
3349 arg[p] = ndef; 3304 arg[p] = ndef;
3350 3305
3351#ifdef DEBUG_CMD
3352 fprintf (stderr, "CSI ");
3353 for (p = 0; p < nargs; p++)
3354 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3355 fprintf (stderr, "%c\n", ch);
3356#endif
3357
3358 /* 3306 /*
3359 * private mode handling 3307 * private mode handling
3360 */ 3308 */
3361 if (priv) 3309 if (priv)
3362 { 3310 {
3363 switch (priv) 3311 switch (priv)
3364 { 3312 {
3365 case '>': 3313 case '>':
3366 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3367 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 }
3368 break; 3325 break;
3369 case '?': 3326 case '?':
3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3371 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3372 break; 3329 break;
3575 break; 3532 break;
3576 case CSI_75: 3533 case CSI_75:
3577 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3578 break; 3535 break;
3579 3536
3580#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3581 case CSI_74: 3538 case CSI_74:
3582 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3583 break; 3540 break;
3584#endif 3541#endif
3585 3542
3592 break; 3549 break;
3593 } 3550 }
3594} 3551}
3595/*}}} */ 3552/*}}} */
3596 3553
3597#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3598/* ARGSUSED */ 3555/* ARGSUSED */
3599void 3556void
3600rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3601{ 3558{
3602 int x, y; 3559 int x, y;
3603 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3604 Window wdummy; 3561 Window wdummy;
3605 dDisp; 3562
3563 dLocal (Display *, dpy);
3606 3564
3607 if (nargs == 0) 3565 if (nargs == 0)
3608 return; 3566 return;
3609 3567
3610 switch (args[0]) 3568 switch (args[0])
3611 { 3569 {
3612 /* 3570 /*
3613 * commands 3571 * commands
3614 */ 3572 */
3615 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3616 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3617 break; 3575 break;
3618 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3619 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3620 break; 3578 break;
3621 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3622 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3623 break; 3581 break;
3624 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3626 break; 3584 break;
3627 case 5: /* raise window */ 3585 case 5: /* raise window */
3628 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3629 break; 3587 break;
3630 case 6: /* lower window */ 3588 case 6: /* lower window */
3631 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3632 break; 3590 break;
3633 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3634 scr_touch (true); 3592 scr_touch (true);
3635 break; 3593 break;
3636 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
3643 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3644 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3645 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3646 break; 3604 break;
3647 3605
3648
3649 /* 3606 /*
3650 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3651 */ 3608 */
3652 case 11: /* report window state */ 3609 case 11: /* report window state */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3655 break; 3612 break;
3656 case 13: /* report window position */ 3613 case 13: /* report window position */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3658 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3659 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3660 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3661 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3662 break; 3619 break;
3663 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3664 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3666 break; 3623 break;
3667 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3668 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669 break; 3626 break;
3671 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3672 break; 3629 break;
3673 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3674 { 3631 {
3675 char *s; 3632 char *s;
3676 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3677 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 */
3678 XFree (s); 3635 XFree (s);
3679 } 3636 }
3680 break; 3637 break;
3681 case 21: /* report window title */ 3638 case 21: /* report window title */
3682 { 3639 {
3683 char *s; 3640 char *s;
3684 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3685 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 */
3686 XFree (s); 3643 XFree (s);
3687 } 3644 }
3688 break; 3645 break;
3689 } 3646 }
3717 seen_esc = true; 3674 seen_esc = true;
3718 continue; 3675 continue;
3719 } 3676 }
3720 else if (ch == C0_BEL || ch == CHAR_ST) 3677 else if (ch == C0_BEL || ch == CHAR_ST)
3721 break; 3678 break;
3679 else if (ch == C0_SYN)
3680 ch = cmd_get8 ();
3722 else if (ch < 0x20) 3681 else if (ch < 0x20)
3723 return NULL; /* other control character - exit */ 3682 return NULL; /* other control character - exit */
3724 3683
3725 seen_esc = false; 3684 seen_esc = false;
3726 3685
3727 if (n >= STRING_MAX - 1) 3686 if (n >= STRING_MAX - 1)
3728 // stop at some sane length 3687 // stop at some sane length
3729 return NULL; 3688 return NULL;
3730 3689
3731 if (ch == C0_SYN)
3732 string[n++] = cmd_get8 ();
3733 else
3734 string[n++] = ch; 3690 string[n++] = ch;
3735 } 3691 }
3736 3692
3737 string[n++] = '\0'; 3693 string[n++] = '\0';
3738 3694
3739 ends_how = (ch == 0x5c ? C0_ESC : ch); 3695 ends_how = (ch == 0x5c ? C0_ESC : ch);
3790void 3746void
3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3747rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792{ 3748{
3793 if (str[0] == '?' && !str[1]) 3749 if (str[0] == '?' && !str[1])
3794 { 3750 {
3795 unsigned short r, g, b; 3751 rgba c;
3796 pix_colors_focused[color].get (display, r, g, b); 3752 pix_colors_focused[color].get (c);
3753
3754#if XFT
3755 if (c.a != rgba::MAX_CC)
3756 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3757 else
3758#endif
3797 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3798 } 3760 }
3799 else 3761 else
3800 set_window_color (color, str); 3762 set_window_color (color, str);
3801} 3763}
3802 3764
3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3805 */ 3767 */
3806void 3768void
3807rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808{ 3770{
3809 int changed = 0;
3810 int color; 3771 int color;
3811 char *buf, *name; 3772 char *buf, *name;
3812 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3813 int saveop = op; 3774 int saveop = op;
3814 dDisp; 3775
3776 dLocal (Display *, dpy);
3815 3777
3816 assert (str != NULL); 3778 assert (str != NULL);
3779
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return;
3782
3817 switch (op) 3783 switch (op)
3818 { 3784 {
3819 case XTerm_name: 3785 case XTerm_name:
3820 set_title (str); 3786 set_title (str);
3821 /* FALLTHROUGH */ 3787 /* FALLTHROUGH */
3835 unsigned long bytes_after; 3801 unsigned long bytes_after;
3836 unsigned char *value = 0; 3802 unsigned char *value = 0;
3837 const char *str = ""; 3803 const char *str = "";
3838 3804
3839 if (prop 3805 if (prop
3840 && XGetWindowProperty (disp, parent[0], 3806 && XGetWindowProperty (dpy, parent[0],
3841 prop, 0, 1<<16, 0, AnyPropertyType, 3807 prop, 0, 1<<16, 0, AnyPropertyType,
3842 &actual_type, &actual_format, 3808 &actual_type, &actual_format,
3843 &nitems, &bytes_after, &value) == Success 3809 &nitems, &bytes_after, &value) == Success
3844 && actual_type != None 3810 && actual_type != None
3845 && actual_format == 8) 3811 && actual_format == 8)
3846 str = (const char *)(value); 3812 str = (const char *)(value);
3847 3813
3848 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3814 tt_printf ("\033]%d;%s%c", op, str, resp);
3849 3815
3850 XFree (value); 3816 XFree (value);
3851 } 3817 }
3852 else 3818 else
3853 { 3819 {
3857 { 3823 {
3858 *eq = 0; 3824 *eq = 0;
3859 set_utf8_property (display->atom (str), eq + 1); 3825 set_utf8_property (display->atom (str), eq + 1);
3860 } 3826 }
3861 else 3827 else
3862 XDeleteProperty (disp, parent[0], 3828 XDeleteProperty (dpy, parent[0],
3863 display->atom (str)); 3829 display->atom (str));
3864 } 3830 }
3865 break; 3831 break;
3866 3832
3867 case XTerm_Color: 3833 case XTerm_Color:
3869 { 3835 {
3870 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3871 break; 3837 break;
3872 3838
3873 *name++ = '\0'; 3839 *name++ = '\0';
3874 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3875 3841
3876 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877 break; 3843 break;
3878 3844
3879 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3880 *buf++ = '\0'; 3846 *buf++ = '\0';
3881 3847
3882 if (name[0] == '?' && !name[1]) 3848 process_color_seq (op, color, name, resp);
3883 {
3884 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 }
3888 else
3889 set_window_color (color + minCOLOR, name);
3890 } 3849 }
3891 break; 3850 break;
3892 case XTerm_Color00: 3851 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3852 process_color_seq (op, Color_fg, str, resp);
3894 break; 3853 break;
3895 case XTerm_Color01: 3854 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3855 process_color_seq (op, Color_bg, str, resp);
3897 break; 3856 break;
3898#ifndef NO_CURSORCOLOR 3857#ifndef NO_CURSORCOLOR
3899 case XTerm_Color_cursor: 3858 case XTerm_Color_cursor:
3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3859 process_color_seq (op, Color_cursor, str, resp);
3901 break; 3860 break;
3902#endif 3861#endif
3903 case XTerm_Color_pointer_fg: 3862 case XTerm_Color_pointer_fg:
3904 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3863 process_color_seq (op, Color_pointer_fg, str, resp);
3905 break; 3864 break;
3906 case XTerm_Color_pointer_bg: 3865 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3866 process_color_seq (op, Color_pointer_bg, str, resp);
3908 break; 3867 break;
3909#ifndef NO_BOLD_UNDERLINE_REVERSE 3868#ifndef NO_BOLD_UNDERLINE_REVERSE
3910 case XTerm_Color_BD:
3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912 break;
3913 case XTerm_Color_UL:
3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915 break;
3916 case XTerm_Color_RV: 3869 case XTerm_Color_RV:
3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3870 process_color_seq (op, Color_RV, str, resp);
3871 break;
3872 case Rxvt_Color_BD:
3873 case URxvt_Color_BD:
3874 process_color_seq (op, Color_BD, str, resp);
3875 break;
3876 case Rxvt_Color_UL:
3877 case URxvt_Color_UL:
3878 process_color_seq (op, Color_UL, str, resp);
3918 break; 3879 break;
3919 case URxvt_Color_IT: 3880 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3881 process_color_seq (op, Color_IT, str, resp);
3921 break; 3882 break;
3922#endif 3883#endif
3923#if TRANSPARENT && TINTING 3884#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint: 3885 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3886 process_color_seq (op, Color_tint, str, resp);
3887
3926 check_our_parents (); 3888 check_our_parents ();
3889
3927 if (am_transparent) 3890 if (am_transparent)
3928 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3929 break;
3930#endif
3931 3892
3893 break;
3894#endif
3895
3932 case XTerm_Pixmap: 3896 case Rxvt_Pixmap:
3897 {
3933 if (*str != ';') 3898 if (*str != ';')
3934 { 3899 {
3935#if XPM_BACKGROUND 3900#if XPM_BACKGROUND
3936 scale_pixmap (""); /* reset to default scaling */ 3901 scale_pixmap (""); /* reset to default scaling */
3937 set_bgPixmap (str); /* change pixmap */ 3902 set_bgPixmap (str); /* change pixmap */
3938#endif
3939 scr_touch (true); 3903 scr_touch (true);
3904#endif
3940 } 3905 }
3906
3907 int changed = 0;
3908
3941 while ((str = strchr (str, ';')) != NULL) 3909 while ((str = strchr (str, ';')) != NULL)
3942 { 3910 {
3943 str++; 3911 str++;
3944#if XPM_BACKGROUND 3912#if XPM_BACKGROUND
3945 changed += scale_pixmap (str); 3913 changed += scale_pixmap (str);
3946#endif 3914#endif
3947 } 3915 }
3948 3916
3949 if (changed) 3917 if (changed)
3950 { 3918 {
3951#ifdef XPM_BACKGROUND 3919#ifdef XPM_BACKGROUND
3952 resize_pixmap (); 3920 resize_pixmap ();
3953#endif
3954 scr_touch (true); 3921 scr_touch (true);
3922#endif
3955 } 3923 }
3924 }
3956 break; 3925 break;
3957 3926
3958 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3959 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3960 break; 3929 break;
3961 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3962 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3963 break; 3932 break;
3964 3933
3965 case XTerm_logfile: 3934 case XTerm_logfile:
3966 // TODO, when secure mode? 3935 // TODO, when secure mode?
3967 break; 3936 break;
3968 3937
3969#ifdef MENUBAR
3970 case URxvt_Menu:
3971 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973 break;
3974#endif
3975#if 0 3938#if 0
3976 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3977 { 3940 {
3978 int fd; 3941 int fd;
3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980 { 3943 {
3981 scr_dump (fd); 3944 scr_dump (fd);
4005 allocated.push_back ((void *)res); 3968 allocated.push_back ((void *)res);
4006 set_fonts (); 3969 set_fonts ();
4007 } 3970 }
4008 break; 3971 break;
4009 3972
4010#if ENABLE_FRILLS 3973 case URxvt_version:
3974 if (query)
3975 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3976 op,
3977 rs[Rs_name], VERSION[0], VERSION[2],
3978 resp);
3979 break;
3980
3981#if !ENABLE_MINIMAL
4011 case URxvt_locale: 3982 case URxvt_locale:
4012 if (query) 3983 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4014 else 3985 else
4015 { 3986 {
4016 set_locale (str); 3987 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
4018 init_xlocale (); 3989 init_xlocale ();
4019 } 3990 }
4020 break; 3991 break;
4021 3992
4022 case URxvt_view_up: 3993 case URxvt_view_up:
4033 break; 4004 break;
4034#endif 4005#endif
4035 4006
4036#if ENABLE_PERL 4007#if ENABLE_PERL
4037 case URxvt_perl: 4008 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4039 ; // no responses yet 4010 ; // no responses yet
4040 break; 4011 break;
4041#endif 4012#endif
4042 } 4013 }
4043} 4014}
4075 return state; 4046 return state;
4076} 4047}
4077 4048
4078/* we're not using priv _yet_ */ 4049/* we're not using priv _yet_ */
4079void 4050void
4080rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4051rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081{ 4052{
4082 unsigned int i, j; 4053 unsigned int i, j;
4083 int state; 4054 int state;
4084 4055
4085 static const struct 4056 static const struct
4096 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
4097 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
4098 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
4100 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
4101#ifdef menuBar_esc
4102 { menuBar_esc, PrivMode_menuBar },
4103#endif
4104 // 18, 19 printing-related 4072 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
4106#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
4107 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
4108#endif 4076#endif
4203 /* case 8: - auto repeat, can't do on a per window basis */ 4171 /* case 8: - auto repeat, can't do on a per window basis */
4204 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4205 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4206 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4207 break; 4175 break;
4208#ifdef menuBar_esc
4209 case menuBar_esc:
4210#ifdef MENUBAR
4211 map_menuBar (state);
4212#endif
4213 break;
4214#endif
4215#ifdef scrollBar_esc 4176#ifdef scrollBar_esc
4216 case scrollBar_esc: 4177 case scrollBar_esc:
4217 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4218 { 4179 {
4219 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
4389 scr_color (Color_bg, Color_bg); 4350 scr_color (Color_bg, Color_bg);
4390 break; 4351 break;
4391 4352
4392 //case 50: // not variable spacing 4353 //case 50: // not variable spacing
4393 4354
4394#if ENABLE_FRILLS 4355#if !ENABLE_MINIMAL
4395 case 90: 4356 case 90:
4396 case 91: /* set bright fg color */ 4357 case 91: /* set bright fg color */
4397 case 92: 4358 case 92:
4398 case 93: 4359 case 93:
4399 case 94: 4360 case 94:
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4422const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462 4423
4463void 4424void
4464rxvt_term::tt_write (const char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4465{ 4426{
4466 if (pty.pty < 0) 4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4467 return; 4428 return;
4468 4429
4430 if (pty->pty < 0)
4431 return;
4432
4469 if (v_buflen == 0) 4433 if (v_buflen == 0)
4470 { 4434 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 4436
4473 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4474 return; 4438 return;
4475 4439
4476 data += written; 4440 data += written;
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486} 4450}
4487 4451
4488void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4489{ 4453{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4455
4492 if (written > 0) 4456 if (written > 0)
4493 { 4457 {
4494 v_buflen -= written; 4458 v_buflen -= written;
4495 4459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines