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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines