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.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);
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;
1500 break; 1468 break;
1501 1469
1502 case ConfigureNotify: 1470 case ConfigureNotify:
1503 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1504 { 1472 {
1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1506 ; 1474 ;
1507 1475
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 { 1477 {
1510 seen_resize = 1; 1478 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1480 }
1513 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1516 check_our_parents (); 1486 check_our_parents ();
1517#endif 1487#endif
1518 } 1488 }
1519 break; 1489 break;
1520 1490
1521 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1524 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1525 1496
1526 break; 1497 break;
1527 1498
1528 case SelectionClear: 1499 case SelectionClear:
1529 selection_clear (); 1500 selection_clear ();
1565 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1566 { 1537 {
1567 do 1538 do
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1571 1542
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573 1544
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1577 1548
1578 want_refresh = 1; 1549 want_refresh = 1;
1579 } 1550 }
1580 else 1551 else
1581 { 1552 {
1582 XEvent unused_event; 1553 XEvent unused_event;
1583 1554
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1585 ; 1556 ;
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1587 ; 1558 ;
1588 1559
1589 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1590 { 1561 {
1591 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1592 scrollbar_show (0); 1563 scrollbar_show (0);
1593 } 1564 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598 1565
1599#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1602#endif 1569#endif
1603 } 1570 }
1604 break; 1571 break;
1605 1572
1606 case MotionNotify: 1573 case MotionNotify:
1607#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1575 if (hidden_pointer)
1609 pointer_unblank (); 1576 pointer_unblank ();
1610#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1579 break;
1620 1580
1621 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1622 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1585 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1587 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1628 ; 1589 ;
1629 1590
1630 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1631 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1595 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1699#endif 1660#endif
1700 } 1661 }
1701 } 1662 }
1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703 { 1664 {
1704 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1705 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1706 ; 1667 ;
1707 1668
1708 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1709 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1710 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1673 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1717 scrollbar_show (1); 1678 scrollbar_show (1);
1718 } 1679 }
1719 break; 1680 break;
1720 } 1681 }
1721 1682
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 { 1685 {
1727 if (hidden_cursor) 1686 if (hidden_cursor)
1728 { 1687 {
1729 hidden_cursor = 0; 1688 hidden_cursor = 0;
1730 want_refresh = 1; 1689 want_refresh = 1;
1731 } 1690 }
1732 1691
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1693 }
1735#endif 1694#endif
1736 1695
1737#if defined(POINTER_BLANK) 1696#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1755 if (!focus) 1714 if (!focus)
1756 { 1715 {
1757 focus = 1; 1716 focus = 1;
1758 want_refresh = 1; 1717 want_refresh = 1;
1759 1718
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1761 1720
1762#if USE_XIM 1721#if USE_XIM
1763 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1764 { 1723 {
1765 IMSetStatusPosition (); 1724 IMSetPosition ();
1766 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1767 } 1726 }
1768#endif 1727#endif
1769#if CURSOR_BLINK 1728#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1731#endif
1773#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1775 { 1734 {
1776 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1816 } 1775 }
1817#endif 1776#endif
1818 } 1777 }
1819} 1778}
1820 1779
1821#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
1822void 1794void
1823rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1796{
1825 SET_R (this); 1797 make_current ();
1826 SET_LOCALE (locale);
1827 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
1828 switch (ev.type) 1804 switch (ev.type)
1829 { 1805 {
1830 case PropertyNotify: 1806 case PropertyNotify:
1831 /* 1807 /*
1832 * 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,
1840 case ReparentNotify: 1816 case ReparentNotify:
1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1842 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1843 break; 1819 break;
1844 } 1820 }
1821# endif
1845} 1822}
1846#endif 1823#endif
1847 1824
1848void 1825void
1849rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1858 /* 1835 /*
1859 * VT window processing of button press 1836 * VT window processing of button press
1860 */ 1837 */
1861 if (ev.window == vt) 1838 if (ev.window == vt)
1862 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1863#if ISO_14755 1843#if ISO_14755
1864 // 5.4 1844 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 { 1846 {
1867 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
1909 else 1889 else
1910 { 1890 {
1911 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1912 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1913 1893
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915 switch (ev.button) 1894 switch (ev.button)
1916 { 1895 {
1917 case Button1: 1896 case Button1:
1918 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1920#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1922#else 1901#else
1923 selection.rect = false; 1902 selection.rect = false;
1924#endif 1903#endif
1925 1904
1926 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1907 {
1929 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1931 else 1910 else
1932 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1933 } 1912 }
1934 else 1913 else
1935 { 1914 {
1936 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1937 MEvent.clicks++; 1916 MEvent.clicks++;
1938 else 1917 else
1939 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1940 1919
1941 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1942 } 1921 }
1943 1922
1944 MEvent.button = Button1; 1923 MEvent.button = Button1;
1945 break; 1924 break;
1946 1925
1947 case Button3: 1926 case Button3:
1948 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1949 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1950 else 1929 else
1951 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1952 1931
1953 MEvent.button = Button3; 1932 MEvent.button = Button3;
1954 break; 1933 break;
1955 } 1934 }
1956 } 1935 }
1957 1936
1958 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1959 return; 1938 return;
1960 } 1939 }
1961 1940
2100 } 2079 }
2101 } 2080 }
2102 2081
2103 return; 2082 return;
2104 } 2083 }
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} 2084}
2114 2085
2115void 2086void
2116rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2117{ 2088{
2123 2094
2124 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2125 { 2096 {
2126 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2127 scrollbar_show (0); 2098 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2099 }
2132 2100
2133#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2136#endif 2104#endif
2137 2105
2138 if (ev.window == vt) 2106 if (ev.window == vt)
2139 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2140#if ISO_14755 2111#if ISO_14755
2141 // 5.4 2112 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return; 2114 return;
2144#endif 2115#endif
2116
2145 if (reportmode) 2117 if (reportmode)
2146 { 2118 {
2147 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2148 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2149 if (ev.button >= 4) 2121 if (ev.button >= 4)
2173 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2174 && bypass_keystate 2146 && bypass_keystate
2175 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2176 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2177 2149
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2181 switch (ev.button) 2150 switch (ev.button)
2182 { 2151 {
2183 case Button1: 2152 case Button1:
2184 case Button3: 2153 case Button3:
2185 selection_make (ev.time); 2154 selection_make (ev.time);
2186 break; 2155 break;
2156
2187 case Button2: 2157 case Button2:
2188 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);
2189 break; 2160 break;
2161
2190#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2191 case Button4: 2163 case Button4:
2192 case Button5: 2164 case Button5:
2193 { 2165 {
2194 int i; 2166 int i;
2226 } 2198 }
2227 break; 2199 break;
2228#endif 2200#endif
2229 } 2201 }
2230 } 2202 }
2231#ifdef MENUBAR
2232 else if (isMenuBarWindow (ev.window))
2233 menubar_control (ev);
2234#endif
2235} 2203}
2236 2204
2237#ifdef TRANSPARENT 2205#ifdef TRANSPARENT
2238#if TINTING 2206#if TINTING
2239/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2240 2208
2241typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2242 2210
2243void 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)
2244{ 2212{
2245 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2246 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2247 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2248 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2249 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2250 int i; 2218 int i;
2251 2219
2252 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2253 2221
2254 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2255 2223
2256 /* for convenience */ 2224 /* for convenience */
2257 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
2478 Atom atype; 2446 Atom atype;
2479 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2480 Window root, oldp, *list; 2448 Window root, oldp, *list;
2481 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2482 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2483 dDisp;
2484 2451
2485 pchanged = 0; 2452 pchanged = 0;
2486 2453
2487 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2488 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2489 2456
2490 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2491 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2492 2459
2493 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2494 2461
2495 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2496 { 2463 {
2497 if (am_transparent) 2464 if (am_transparent)
2498 { 2465 {
2499 pchanged = 1; 2466 pchanged = 1;
2500 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2501 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2502 } 2469 }
2503 2470
2504 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2505 } 2472 }
2506 2473
2507 /* 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. */
2508 XSync (disp, False); 2475 XSync (dpy, False);
2509 2476
2510 /* 2477 /*
2511 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2512 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2513 * 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.
2514 */ 2481 */
2515 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2516 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2519 2486
2520 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2521 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2522 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2523 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2524 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2525 2492
2526 if (!i || prop == NULL 2493 if (!i || prop == NULL
2527#if TINTING 2494#if TINTING
2528 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2529#endif 2496#endif
2530 ) 2497 )
2531 have_pixmap = 0; 2498 have_pixmap = 0;
2532 else 2499 else
2533 { 2500 {
2546 Window cr; 2513 Window cr;
2547 XImage *image; 2514 XImage *image;
2548 GC gc; 2515 GC gc;
2549 XGCValues gcvalue; 2516 XGCValues gcvalue;
2550 2517
2551 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2552 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2553 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2554 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2555 nx = ny = 0; 2522 nx = ny = 0;
2556 2523
2569 } 2536 }
2570 2537
2571 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2572 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2573 2540
2574 XSync (disp, False); 2541 XSync (dpy, False);
2575 allowedxerror = -1; 2542 allowedxerror = -1;
2576 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2577 2544
2578 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2579 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2580 allowedxerror = 0; 2547 allowedxerror = 0;
2581 2548
2584 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2585 { 2552 {
2586 pchanged = 1; 2553 pchanged = 1;
2587 if (pixmap != None) 2554 if (pixmap != None)
2588 { 2555 {
2589 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2590 pixmap = None; 2557 pixmap = None;
2591 } 2558 }
2592 } 2559 }
2593 2560
2594 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2595 } 2562 }
2596 else 2563 else
2597 { 2564 {
2598 if (pixmap != None) 2565 if (pixmap != None)
2599 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2600 2567
2601#if TINTING 2568#if TINTING
2602 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2603 { 2570 {
2604 unsigned short rm, gm, bm;
2605 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2606 2572
2573 rgba c;
2607 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2608 2575
2609 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2610 } 2577 }
2611#endif 2578#endif
2612 2579
2613 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2614 szHint.width, szHint.height, image->depth);
2615 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2616 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2617 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2618 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2619 XDestroyImage (image); 2585 XDestroyImage (image);
2620 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2621 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2622 2588
2623 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2624 pchanged = 1; 2590 pchanged = 1;
2625 2591
2626 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2627 } 2593 }
2628 } 2594 }
2629 2595
2630 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2631 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2632 else 2598 else
2633 { 2599 {
2634 unsigned int n; 2600 unsigned int n;
2635 /* 2601 /*
2636 * InheritPixmap transparency 2602 * InheritPixmap transparency
2637 */ 2603 */
2638 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2639 { 2605 {
2640 oldp = parent[i]; 2606 oldp = parent[i];
2641 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2642 &parent[i], &list, &n);
2643 XFree (list); 2608 XFree (list);
2644 2609
2645 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2646 { 2611 {
2647 if (oldp != None) 2612 if (oldp != None)
2655 } 2620 }
2656 2621
2657 n = 0; 2622 n = 0;
2658 2623
2659 if (pchanged) 2624 if (pchanged)
2660 {
2661 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2662 { 2626 {
2663 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2664 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2665 { 2630 {
2666 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2667 break; 2632 break;
2668 } 2633 }
2669 } 2634 }
2670 }
2671 2635
2672 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2673 { 2637 {
2674 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2675 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2676 am_transparent = 0; 2640 am_transparent = 0;
2677 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2678 } 2642 }
2679 else 2643 else
2680 { 2644 {
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++) 2645 for (n = 0; n < (unsigned int)i; n++)
2687 { 2646 {
2688 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2689 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2690 } 2649 }
2691 2650
2692 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2693 am_transparent = 1; 2652 am_transparent = 1;
2694 } 2653 }
2695 2654
2696 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2697 parent[i] = None; 2656 parent[i] = None;
2698 } 2657 }
2699 2658
2700 if (scrollBar.win) 2659 if (scrollBar.win)
2701 { 2660 {
2702 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2703 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2704 scrollbar_show (0); 2663 scrollbar_show (0);
2705 } 2664 }
2706 2665
2707 if (am_transparent) 2666 if (am_transparent)
2782 } 2741 }
2783 2742
2784 // scr_add_lines only works for nlines <= nrow - 1. 2743 // scr_add_lines only works for nlines <= nrow - 1.
2785 if (nlines >= nrow - 1) 2744 if (nlines >= nrow - 1)
2786 { 2745 {
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 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))))
2788 scr_add_lines (buf, str - buf, nlines); 2748 scr_add_lines (buf, str - buf, nlines);
2789 2749
2790 nlines = 0; 2750 nlines = 0;
2791 str = buf; 2751 str = buf;
2792 eol = str + min (ncol, UBUFSIZ); 2752 eol = str + min (ncol, UBUFSIZ);
2807 2767
2808 seq_begin = cmdbuf_ptr; 2768 seq_begin = cmdbuf_ptr;
2809 ch = next_char (); 2769 ch = next_char ();
2810 } 2770 }
2811 2771
2772 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 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))))
2813 scr_add_lines (buf, str - buf, nlines); 2774 scr_add_lines (buf, str - buf, nlines);
2814 2775
2815 /* 2776 /*
2816 * 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
2817 * 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.
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++; 2785 refresh_limit++;
2825 else 2786 else
2826 { 2787 {
2827 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2828 scr_refresh (refresh_type); 2790 scr_refresh ();
2829 want_refresh = 1; 2791 want_refresh = 1;
2830 } 2792 }
2831 } 2793 }
2832 2794
2833 } 2795 }
2851 return flag; 2813 return flag;
2852} 2814}
2853 2815
2854// read the next character 2816// read the next character
2855wchar_t 2817wchar_t
2856rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2857{ 2819{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2821 {
2860 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2882 return NOCHAR; 2844 return NOCHAR;
2883} 2845}
2884 2846
2885// read the next octet 2847// read the next octet
2886uint32_t 2848uint32_t
2887rxvt_term::next_octet () 2849rxvt_term::next_octet () NOTHROW
2888{ 2850{
2889 return cmdbuf_ptr < cmdbuf_endp 2851 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2852 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2853 : NOCHAR;
2892} 2854}
2855
2856static class out_of_input out_of_input;
2893 2857
2894/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2895/* 2859/*
2896 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2897 * to the command. 2861 * to the command.
2898 */ 2862 */
2899wchar_t 2863wchar_t
2900rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2865{
2902 wchar_t c = next_char (); 2866 wchar_t c = next_char ();
2903 2867
2904 if (c == NOCHAR) 2868 if (c == NOCHAR)
2905 throw out_of_input; 2869 throw out_of_input;
2906 2870
2907 return c; 2871 return c;
2908} 2872}
2909 2873
2910uint32_t 2874uint32_t
2911rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2876{
2913 uint32_t c = next_octet (); 2877 uint32_t c = next_octet ();
2914 2878
2915 if (c == NOCHAR) 2879 if (c == NOCHAR)
2916 throw out_of_input; 2880 throw out_of_input;
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 3119 break;
3156 case '+': 3120 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 3122 break;
3159#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3160 case '6': 3124 case '6':
3161 scr_backindex (); 3125 scr_backindex ();
3162 break; 3126 break;
3163#endif 3127#endif
3164 case '7': 3128 case '7':
3165 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3166 break; 3130 break;
3167 case '8': 3131 case '8':
3168 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3169 break; 3133 break;
3170#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3171 case '9': 3135 case '9':
3172 scr_forwardindex (); 3136 scr_forwardindex ();
3173 break; 3137 break;
3174#endif 3138#endif
3175 case '=': 3139 case '=':
3337 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 3303 if (arg[p] == -1)
3340 arg[p] = ndef; 3304 arg[p] = ndef;
3341 3305
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 /* 3306 /*
3350 * private mode handling 3307 * private mode handling
3351 */ 3308 */
3352 if (priv) 3309 if (priv)
3353 { 3310 {
3354 switch (priv) 3311 switch (priv)
3355 { 3312 {
3356 case '>': 3313 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3358 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 }
3359 break; 3325 break;
3360 case '?': 3326 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 3329 break;
3566 break; 3532 break;
3567 case CSI_75: 3533 case CSI_75:
3568 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3569 break; 3535 break;
3570 3536
3571#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3572 case CSI_74: 3538 case CSI_74:
3573 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3574 break; 3540 break;
3575#endif 3541#endif
3576 3542
3583 break; 3549 break;
3584 } 3550 }
3585} 3551}
3586/*}}} */ 3552/*}}} */
3587 3553
3588#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3589/* ARGSUSED */ 3555/* ARGSUSED */
3590void 3556void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3558{
3593 int x, y; 3559 int x, y;
3594 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3595 Window wdummy; 3561 Window wdummy;
3596 dDisp; 3562
3563 dLocal (Display *, dpy);
3597 3564
3598 if (nargs == 0) 3565 if (nargs == 0)
3599 return; 3566 return;
3600 3567
3601 switch (args[0]) 3568 switch (args[0])
3602 { 3569 {
3603 /* 3570 /*
3604 * commands 3571 * commands
3605 */ 3572 */
3606 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3608 break; 3575 break;
3609 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3611 break; 3578 break;
3612 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3614 break; 3581 break;
3615 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3584 break;
3618 case 5: /* raise window */ 3585 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3620 break; 3587 break;
3621 case 6: /* lower window */ 3588 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3623 break; 3590 break;
3624 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3625 scr_touch (true); 3592 scr_touch (true);
3626 break; 3593 break;
3627 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
3634 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3636 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3637 break; 3604 break;
3638 3605
3639
3640 /* 3606 /*
3641 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3642 */ 3608 */
3643 case 11: /* report window state */ 3609 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3612 break;
3647 case 13: /* report window position */ 3613 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3619 break;
3654 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3623 break;
3658 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3626 break;
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3629 break;
3664 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3665 { 3631 {
3666 char *s; 3632 char *s;
3667 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3668 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 */
3669 XFree (s); 3635 XFree (s);
3670 } 3636 }
3671 break; 3637 break;
3672 case 21: /* report window title */ 3638 case 21: /* report window title */
3673 { 3639 {
3674 char *s; 3640 char *s;
3675 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3676 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 */
3677 XFree (s); 3643 XFree (s);
3678 } 3644 }
3679 break; 3645 break;
3680 } 3646 }
3708 seen_esc = true; 3674 seen_esc = true;
3709 continue; 3675 continue;
3710 } 3676 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3677 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3678 break;
3679 else if (ch == C0_SYN)
3680 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3681 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3682 return NULL; /* other control character - exit */
3715 3683
3716 seen_esc = false; 3684 seen_esc = false;
3717 3685
3718 if (n >= STRING_MAX - 1) 3686 if (n >= STRING_MAX - 1)
3719 // stop at some sane length 3687 // stop at some sane length
3720 return NULL; 3688 return NULL;
3721 3689
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3690 string[n++] = ch;
3726 } 3691 }
3727 3692
3728 string[n++] = '\0'; 3693 string[n++] = '\0';
3729 3694
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3695 ends_how = (ch == 0x5c ? C0_ESC : ch);
3781void 3746void
3782rxvt_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)
3783{ 3748{
3784 if (str[0] == '?' && !str[1]) 3749 if (str[0] == '?' && !str[1])
3785 { 3750 {
3786 unsigned short r, g, b; 3751 rgba c;
3787 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
3788 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);
3789 } 3760 }
3790 else 3761 else
3791 set_window_color (color, str); 3762 set_window_color (color, str);
3792} 3763}
3793 3764
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3767 */
3797void 3768void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3770{
3800 int changed = 0;
3801 int color; 3771 int color;
3802 char *buf, *name; 3772 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3774 int saveop = op;
3805 dDisp; 3775
3776 dLocal (Display *, dpy);
3806 3777
3807 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
3808 switch (op) 3783 switch (op)
3809 { 3784 {
3810 case XTerm_name: 3785 case XTerm_name:
3811 set_title (str); 3786 set_title (str);
3812 /* FALLTHROUGH */ 3787 /* FALLTHROUGH */
3826 unsigned long bytes_after; 3801 unsigned long bytes_after;
3827 unsigned char *value = 0; 3802 unsigned char *value = 0;
3828 const char *str = ""; 3803 const char *str = "";
3829 3804
3830 if (prop 3805 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3806 && XGetWindowProperty (dpy, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3807 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3808 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3809 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3810 && actual_type != None
3836 && actual_format == 8) 3811 && actual_format == 8)
3837 str = (const char *)(value); 3812 str = (const char *)(value);
3838 3813
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3814 tt_printf ("\033]%d;%s%c", op, str, resp);
3840 3815
3841 XFree (value); 3816 XFree (value);
3842 } 3817 }
3843 else 3818 else
3844 { 3819 {
3848 { 3823 {
3849 *eq = 0; 3824 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3825 set_utf8_property (display->atom (str), eq + 1);
3851 } 3826 }
3852 else 3827 else
3853 XDeleteProperty (disp, parent[0], 3828 XDeleteProperty (dpy, parent[0],
3854 display->atom (str)); 3829 display->atom (str));
3855 } 3830 }
3856 break; 3831 break;
3857 3832
3858 case XTerm_Color: 3833 case XTerm_Color:
3860 { 3835 {
3861 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3862 break; 3837 break;
3863 3838
3864 *name++ = '\0'; 3839 *name++ = '\0';
3865 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3866 3841
3867 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868 break; 3843 break;
3869 3844
3870 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3846 *buf++ = '\0';
3872 3847
3873 if (name[0] == '?' && !name[1]) 3848 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 } 3849 }
3882 break; 3850 break;
3883 case XTerm_Color00: 3851 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3852 process_color_seq (op, Color_fg, str, resp);
3885 break; 3853 break;
3886 case XTerm_Color01: 3854 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3855 process_color_seq (op, Color_bg, str, resp);
3888 break; 3856 break;
3889#ifndef NO_CURSORCOLOR 3857#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3858 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3859 process_color_seq (op, Color_cursor, str, resp);
3892 break; 3860 break;
3893#endif 3861#endif
3894 case XTerm_Color_pointer_fg: 3862 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3863 process_color_seq (op, Color_pointer_fg, str, resp);
3896 break; 3864 break;
3897 case XTerm_Color_pointer_bg: 3865 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3866 process_color_seq (op, Color_pointer_bg, str, resp);
3899 break; 3867 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3868#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: 3869 case XTerm_Color_RV:
3908 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);
3909 break; 3879 break;
3910 case URxvt_Color_IT: 3880 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3881 process_color_seq (op, Color_IT, str, resp);
3912 break; 3882 break;
3913#endif 3883#endif
3914#if TRANSPARENT && TINTING 3884#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint: 3885 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3886 process_color_seq (op, Color_tint, str, resp);
3887
3917 check_our_parents (); 3888 check_our_parents ();
3889
3918 if (am_transparent) 3890 if (am_transparent)
3919 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3920 break;
3921#endif
3922 3892
3893 break;
3894#endif
3895
3923 case XTerm_Pixmap: 3896 case Rxvt_Pixmap:
3897 {
3924 if (*str != ';') 3898 if (*str != ';')
3925 { 3899 {
3926#if XPM_BACKGROUND 3900#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */ 3901 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */ 3902 set_bgPixmap (str); /* change pixmap */
3929#endif
3930 scr_touch (true); 3903 scr_touch (true);
3904#endif
3931 } 3905 }
3906
3907 int changed = 0;
3908
3932 while ((str = strchr (str, ';')) != NULL) 3909 while ((str = strchr (str, ';')) != NULL)
3933 { 3910 {
3934 str++; 3911 str++;
3935#if XPM_BACKGROUND 3912#if XPM_BACKGROUND
3936 changed += scale_pixmap (str); 3913 changed += scale_pixmap (str);
3937#endif 3914#endif
3938 } 3915 }
3939 3916
3940 if (changed) 3917 if (changed)
3941 { 3918 {
3942#ifdef XPM_BACKGROUND 3919#ifdef XPM_BACKGROUND
3943 resize_pixmap (); 3920 resize_pixmap ();
3944#endif
3945 scr_touch (true); 3921 scr_touch (true);
3922#endif
3946 } 3923 }
3924 }
3947 break; 3925 break;
3948 3926
3949 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3950 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3951 break; 3929 break;
3952 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3953 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3954 break; 3932 break;
3955 3933
3956 case XTerm_logfile: 3934 case XTerm_logfile:
3957 // TODO, when secure mode? 3935 // TODO, when secure mode?
3958 break; 3936 break;
3959 3937
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 3938#if 0
3967 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3968 { 3940 {
3969 int fd; 3941 int fd;
3970 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)
3971 { 3943 {
3972 scr_dump (fd); 3944 scr_dump (fd);
3996 allocated.push_back ((void *)res); 3968 allocated.push_back ((void *)res);
3997 set_fonts (); 3969 set_fonts ();
3998 } 3970 }
3999 break; 3971 break;
4000 3972
4001#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
4002 case URxvt_locale: 3982 case URxvt_locale:
4003 if (query) 3983 if (query)
4004 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);
4005 else 3985 else
4006 { 3986 {
4007 set_locale (str); 3987 set_locale (str);
4008 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
4009 init_xlocale (); 3989 init_xlocale ();
4010 } 3990 }
4011 break; 3991 break;
4012 3992
4013 case URxvt_view_up: 3993 case URxvt_view_up:
4024 break; 4004 break;
4025#endif 4005#endif
4026 4006
4027#if ENABLE_PERL 4007#if ENABLE_PERL
4028 case URxvt_perl: 4008 case URxvt_perl:
4029 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)))
4030 ; // no responses yet 4010 ; // no responses yet
4031 break; 4011 break;
4032#endif 4012#endif
4033 } 4013 }
4034} 4014}
4066 return state; 4046 return state;
4067} 4047}
4068 4048
4069/* we're not using priv _yet_ */ 4049/* we're not using priv _yet_ */
4070void 4050void
4071rxvt_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)
4072{ 4052{
4073 unsigned int i, j; 4053 unsigned int i, j;
4074 int state; 4054 int state;
4075 4055
4076 static const struct 4056 static const struct
4087 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
4088 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
4089 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
4090 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
4091 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
4092#ifdef menuBar_esc
4093 { menuBar_esc, PrivMode_menuBar },
4094#endif
4095 // 18, 19 printing-related 4072 // 18, 19 printing-related
4096 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
4097#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
4098 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
4099#endif 4076#endif
4194 /* 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 */
4195 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4196 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4198 break; 4175 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 4176#ifdef scrollBar_esc
4207 case scrollBar_esc: 4177 case scrollBar_esc:
4208 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4209 { 4179 {
4210 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
4380 scr_color (Color_bg, Color_bg); 4350 scr_color (Color_bg, Color_bg);
4381 break; 4351 break;
4382 4352
4383 //case 50: // not variable spacing 4353 //case 50: // not variable spacing
4384 4354
4385#if ENABLE_FRILLS 4355#if !ENABLE_MINIMAL
4386 case 90: 4356 case 90:
4387 case 91: /* set bright fg color */ 4357 case 91: /* set bright fg color */
4388 case 92: 4358 case 92:
4389 case 93: 4359 case 93:
4390 case 94: 4360 case 94:
4455rxvt_term::tt_write (const char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4456{ 4426{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return; 4428 return;
4459 4429
4460 if (pty.pty < 0) 4430 if (pty->pty < 0)
4461 return; 4431 return;
4462 4432
4463 if (v_buflen == 0) 4433 if (v_buflen == 0)
4464 { 4434 {
4465 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));
4466 4436
4467 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4468 return; 4438 return;
4469 4439
4470 data += written; 4440 data += written;
4479 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4480} 4450}
4481 4451
4482void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4483{ 4453{
4484 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));
4485 4455
4486 if (written > 0) 4456 if (written > 0)
4487 { 4457 {
4488 v_buflen -= written; 4458 v_buflen -= written;
4489 4459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines