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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.331 by root, Mon Jun 18 13:38:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
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 *
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);
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
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); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
923 1001
924#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925unsigned int 1003unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1005{
1006 while (l->is_longer () && row < end_row); 1084 while (l->is_longer () && row < end_row);
1007 } 1085 }
1008 while (row < end_row); 1086 while (row < end_row);
1009 } 1087 }
1010 1088
1011 scr_refresh (refresh_type); 1089 scr_refresh ();
1012 scrollbar_show (1); 1090 scrollbar_show (1);
1013#ifdef USE_XIM 1091#ifdef USE_XIM
1014 IMSendSpot (); 1092 IMSendSpot ();
1015#endif 1093#endif
1016 } 1094 }
1032void 1110void
1033rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1034{ 1112{
1035 make_current (); 1113 make_current ();
1036 1114
1037 refresh_limit = 1;
1038 refresh_count = 0; 1115 refresh_count = 0;
1039 flush (); 1116 flush ();
1040} 1117}
1041 1118
1042#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1122{
1046 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1124 want_refresh = 1;
1048 1125
1049 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1127}
1051#endif 1128#endif
1052 1129
1053#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1054void 1131void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1146{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1149 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1150 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1152 }
1077} 1153}
1078#endif 1154#endif
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1159{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1161 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1163 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1165 }
1091} 1166}
1092#endif 1167#endif
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1176 {
1102 if (view_start == top_row || view_start == 0) 1177 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1104 1179
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1180 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1182 }
1109} 1183}
1110#endif 1184#endif
1111 1185
1112#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1113static struct event_handler 1187static struct event_handler
1114{ 1188{
1115 check_watcher cw_yield; 1189 check_watcher yield_ev;
1116 1190
1117 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1118 { 1192 {
1119 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1120 w.stop (); 1201 w.stop ();
1121 } 1202 }
1122 1203
1123 event_handler () 1204 event_handler ()
1124 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1125 { 1206 {
1126 } 1207 }
1127} event_handler; 1208} event_handler;
1128#endif 1209#endif
1129 1210
1140 1221
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1144 1225
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1227
1147 if (r > 0) 1228 if (r > 0)
1148 { 1229 {
1149 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1150 return true; 1231 return true;
1151 } 1232 }
1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 { 1234 {
1154#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1155 if (display->is_local) 1236 if (display->is_local)
1156 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1157#endif 1238#endif
1158 } 1239 }
1159 else 1240 else
1160 { 1241 {
1161 pty_ev.stop (); 1242 pty_ev.stop ();
1162 1243
1163 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1164 destroy (); 1245 destroy ();
1165 } 1246 }
1166 1247
1167 return false; 1248 return false;
1168} 1249}
1169 1250
1170void 1251void
1171rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1183} 1264}
1184 1265
1185void 1266void
1186rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1187{ 1268{
1188 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1189 recolour_cursor (); 1270 recolour_cursor ();
1190 1271
1191#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1192 hidden_pointer = 0; 1273 hidden_pointer = 0;
1193 1274
1194 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1195 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1196#endif 1277#endif
1197} 1278}
1198 1279
1199#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1200void 1281void
1201rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1202{ 1283{
1203 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1204 return; 1285 return;
1205 1286
1206 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1207 XFlush (display->display); 1288 XFlush (dpy);
1208 1289
1209 hidden_pointer = 1; 1290 hidden_pointer = 1;
1210} 1291}
1211 1292
1212void 1293void
1285 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1286 (32 + x + 1), 1367 (32 + x + 1),
1287 (32 + y + 1)); 1368 (32 + y + 1));
1288} 1369}
1289 1370
1290#ifdef USING_W11LIB
1291void
1292rxvt_W11_process_x_event (XEvent *ev)
1293{
1294 rxvt_t *r = rxvt_get_r ();
1295
1296 x_cb (*ev);
1297}
1298#endif
1299
1300/*{{{ process an X event */ 1371/*{{{ process an X event */
1301void 1372void
1302rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1303{ 1374{
1304 make_current (); 1375 make_current ();
1305 1376
1306 dDisp; 1377 dLocal (Display *, dpy);
1307 1378
1308 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return; 1382 return;
1316 unsigned int unused_mask; 1387 unsigned int unused_mask;
1317 1388
1318 switch (ev.type) 1389 switch (ev.type)
1319 { 1390 {
1320 case KeyPress: 1391 case KeyPress:
1321#if ISO_14755 1392 key_press (ev.xkey);
1322 if (!(iso14755buf & ISO_14755_52))
1323#endif
1324 lookup_key (ev.xkey);
1325
1326 break; 1393 break;
1327 1394
1328 case KeyRelease: 1395 case KeyRelease:
1329 { 1396 key_release (ev.xkey);
1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1331 KeySym keysym;
1332
1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1334#endif
1335
1336#if ENABLE_FRILLS || ISO_14755
1337 // ISO 14755 support
1338 if (iso14755buf)
1339 if (iso14755buf & ISO_14755_52)
1340 {
1341# if ENABLE_OVERLAY
1342 scr_overlay_off ();
1343# endif
1344# if ISO_14755
1345 // iso14755 part 5.2 handling: release time
1346 // first: controls
1347 if ((ev.xkey.state & ControlMask)
1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1350 {
1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1352 commit_iso14755 ();
1353 goto skip_switch;
1354 }
1355
1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1357 if (i[0] == keysym)
1358 {
1359 iso14755buf = ISO_14755_51 | i[1];
1360 commit_iso14755 ();
1361 goto skip_switch;
1362 }
1363
1364 scr_bell ();
1365# endif
1366 iso14755buf = 0;
1367 break;
1368 }
1369 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374 if (iso14755buf & ISO_14755_51)
1375 commit_iso14755 ();
1376#if ISO_14755
1377 else if (iso14755buf & ISO_14755_STARTED)
1378 {
1379 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1380
1381 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1382 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1383 }
1384# endif
1385 else
1386 iso14755buf = 0;
1387 }
1388#endif
1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1395 if (!(ev.xkey.state & ControlMask))
1396 slip_wheel_ev.stop ();
1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1398 mouse_slip_wheel_speed = 0;
1399#endif
1400 break; 1397 break;
1401 }
1402 1398
1403 case ButtonPress: 1399 case ButtonPress:
1404 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1405 break; 1401 break;
1406 1402
1408 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1409 break; 1405 break;
1410 1406
1411 case ClientMessage: 1407 case ClientMessage:
1412 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1418 destroy ();
1419 }
1417#if ENABLE_EWMH 1420#if ENABLE_EWMH
1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
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 }
1422#endif 1436#endif
1423 } 1437 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1433#ifdef OFFIX_DND
1434 /* OffiX Dnd (drag 'n' drop) protocol */
1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436 && (ev.xclient.data.l[0] == DndFile
1437 || ev.xclient.data.l[0] == DndDir
1438 || ev.xclient.data.l[0] == DndLink))
1439 {
1440 /* Get Dnd data */
1441 Atom ActualType;
1442 int ActualFormat;
1443 unsigned char *data;
1444 unsigned long Size, RemainingBytes;
1445
1446 XGetWindowProperty (disp, display->root,
1447 xa[XA_DNDSELECTION],
1448 0L, 1000000L,
1449 False, AnyPropertyType,
1450 &ActualType, &ActualFormat,
1451 &Size, &RemainingBytes,
1452 &data);
1453 set_string_property (XA_CUT_BUFFER0, data);
1454 XFree (data);
1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457 }
1458#endif /* OFFIX_DND */
1459 break; 1438 break;
1460 1439
1461 case MappingNotify: 1440 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1442 break;
1486 break; 1465 break;
1487 } 1466 }
1488 break; 1467 break;
1489 1468
1490 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1491 focus_in (); 1473 focus_in ();
1492 break; 1474 break;
1493 1475
1494 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1495 focus_out (); 1480 focus_out ();
1496 break; 1481 break;
1497 1482
1498 case ConfigureNotify: 1483 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1500 { 1485 {
1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ; 1487 ;
1503 1488
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1490 {
1506 seen_resize = 1; 1491 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1508 } 1500 }
1509 1501
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef TRANSPARENT
1511 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1512 check_our_parents (); 1506 check_our_parents ();
1513#endif 1507#endif
1514 } 1508 }
1515 break; 1509 break;
1516 1510
1517 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1516
1522 break; 1517 break;
1523 1518
1524 case SelectionClear: 1519 case SelectionClear:
1525 selection_clear (); 1520 selection_clear ();
1561 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1562 { 1557 {
1563 do 1558 do
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567 1562
1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569 1564
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1573 1568
1574 want_refresh = 1; 1569 want_refresh = 1;
1575 } 1570 }
1576 else 1571 else
1577 { 1572 {
1578 XEvent unused_event; 1573 XEvent unused_event;
1579 1574
1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581 ; 1576 ;
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583 ; 1578 ;
1584 1579
1585 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1586 { 1581 {
1587 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1588 scrollbar_show (0); 1583 scrollbar_show (0);
1589 } 1584 }
1590 1585
1591#ifdef TRANSPARENT 1586#ifdef TRANSPARENT
1592 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1593 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1594#endif 1589#endif
1595 } 1590 }
1596 break; 1591 break;
1597 1592
1598 case MotionNotify: 1593 case MotionNotify:
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop 1605 ; // nop
1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612 { 1607 {
1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614 ; 1609 ;
1615 1610
1616 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1617 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1618 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1619 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1620 &ev.xbutton.state); 1615 &ev.xbutton.state);
1621#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
1685#endif 1680#endif
1686 } 1681 }
1687 } 1682 }
1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689 { 1684 {
1690 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1692 ; 1687 ;
1693 1688
1694 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1695 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1696 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1697 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1698 &unused_mask); 1693 &unused_mask);
1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1700 scrollbar_size ()); 1695 scrollbar_size ());
1701 want_refresh = 1; 1696 want_refresh = 1;
1702 refresh_limit = 0;
1703 scrollbar_show (1); 1697 scrollbar_show (1);
1704 } 1698 }
1705 break; 1699 break;
1706 } 1700 }
1707 1701
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1712 { 1704 {
1713 if (hidden_cursor) 1705 if (hidden_cursor)
1714 { 1706 {
1715 hidden_cursor = 0; 1707 hidden_cursor = 0;
1716 want_refresh = 1; 1708 want_refresh = 1;
1717 } 1709 }
1718 1710
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1712 }
1721#endif 1713#endif
1722 1714
1723#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 { 1717 {
1726 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1729 if (hidden_pointer) 1721 if (hidden_pointer)
1741 if (!focus) 1733 if (!focus)
1742 { 1734 {
1743 focus = 1; 1735 focus = 1;
1744 want_refresh = 1; 1736 want_refresh = 1;
1745 1737
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1739
1748#if USE_XIM 1740#if USE_XIM
1749 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1750 { 1742 {
1751 IMSetStatusPosition (); 1743 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1753 } 1745 }
1754#endif 1746#endif
1755#if CURSOR_BLINK 1747#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1750#endif
1759#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1761 { 1753 {
1762 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1763 scr_recolour (); 1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1764 } 1769 }
1765#endif 1770#endif
1766 } 1771 }
1767} 1772}
1768 1773
1788#if USE_XIM 1793#if USE_XIM
1789 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1791#endif 1796#endif
1792#if CURSOR_BLINK 1797#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1795 hidden_cursor = 0; 1800 hidden_cursor = 0;
1796#endif 1801#endif
1797#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
1802 } 1807 }
1803#endif 1808#endif
1804 } 1809 }
1805} 1810}
1806 1811
1807#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if TRANSPARENT || ENABLE_PERL
1808void 1826void
1809rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1828{
1811 make_current (); 1829 make_current ();
1812 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if TRANSPARENT
1813 switch (ev.type) 1836 switch (ev.type)
1814 { 1837 {
1815 case PropertyNotify: 1838 case PropertyNotify:
1816 /* 1839 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1821 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1822 return; 1845 return;
1823 1846
1824 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1825 case ReparentNotify: 1848 case ReparentNotify:
1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1827 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1828 break; 1851 break;
1829 } 1852 }
1853# endif
1830} 1854}
1831#endif 1855#endif
1832 1856
1833void 1857void
1834rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1843 /* 1867 /*
1844 * VT window processing of button press 1868 * VT window processing of button press
1845 */ 1869 */
1846 if (ev.window == vt) 1870 if (ev.window == vt)
1847 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1848#if ISO_14755 1875#if ISO_14755
1849 // 5.4 1876 // 5.4
1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 { 1878 {
1852 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
1894 else 1921 else
1895 { 1922 {
1896 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1898 1925
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1926 switch (ev.button)
1901 { 1927 {
1902 case Button1: 1928 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1929 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1930 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1931#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1932 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1933#else
1908 selection.rect = false; 1934 selection.rect = false;
1909#endif 1935#endif
1910 1936
1911 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1939 {
1914 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1916 else 1942 else
1917 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1918 } 1944 }
1919 else 1945 else
1920 { 1946 {
1921 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1948 MEvent.clicks++;
1923 else 1949 else
1924 MEvent.clicks = 1; 1950 MEvent.clicks = 1;
1925 1951
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1952 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1953 }
1928 1954
1929 MEvent.button = Button1; 1955 MEvent.button = Button1;
1930 break; 1956 break;
1931 1957
1932 case Button3: 1958 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1935 else 1961 else
1936 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1937 1963
1938 MEvent.button = Button3; 1964 MEvent.button = Button3;
1939 break; 1965 break;
1940 } 1966 }
1941 } 1967 }
1942 1968
1943 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1944 return; 1970 return;
1945 } 1971 }
1946 1972
2100 2126
2101 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
2102 { 2128 {
2103 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
2104 scrollbar_show (0); 2130 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2131 }
2109 2132
2110#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2134 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
2113#endif 2136#endif
2114 2137
2115 if (ev.window == vt) 2138 if (ev.window == vt)
2116 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2117#if ISO_14755 2143#if ISO_14755
2118 // 5.4 2144 // 5.4
2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120 return; 2146 return;
2121#endif 2147#endif
2148
2122 if (reportmode) 2149 if (reportmode)
2123 { 2150 {
2124 /* mouse report from vt window */ 2151 /* mouse report from vt window */
2125 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
2126 if (ev.button >= 4) 2153 if (ev.button >= 4)
2150 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2151 && bypass_keystate 2178 && bypass_keystate
2152 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2153 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2154 2181
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2158 switch (ev.button) 2182 switch (ev.button)
2159 { 2183 {
2160 case Button1: 2184 case Button1:
2161 case Button3: 2185 case Button3:
2162 selection_make (ev.time); 2186 selection_make (ev.time);
2163 break; 2187 break;
2188
2164 case Button2: 2189 case Button2:
2165 selection_request (ev.time, ev.x, ev.y); 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2166 break; 2192 break;
2193
2167#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2168 case Button4: 2195 case Button4:
2169 case Button5: 2196 case Button5:
2170 { 2197 {
2171 int i; 2198 int i;
2173 2200
2174 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2175 2202
2176 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2177 i = 1; 2204 i = 1;
2178 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2179 i = nrow - 1; 2206 i = nrow - 1;
2180 else 2207 else
2181 i = 5; 2208 i = 5;
2182 2209
2183# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2204 break; 2231 break;
2205#endif 2232#endif
2206 } 2233 }
2207 } 2234 }
2208} 2235}
2209
2210#ifdef TRANSPARENT
2211#if TINTING
2212/* taken from aterm-0.4.2 */
2213
2214typedef uint32_t RUINT32T;
2215
2216void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2217{
2218 int sh_r, sh_g, sh_b;
2219 RUINT32T mask_r, mask_g, mask_b;
2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223 int i;
2224
2225 Visual *visual = display->visual;
2226
2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228
2229 /* for convenience */
2230 mask_r = visual->red_mask;
2231 mask_g = visual->green_mask;
2232 mask_b = visual->blue_mask;
2233
2234 /* boring lookup table pre-initialization */
2235 switch (srcImage->bits_per_pixel) {
2236 case 15:
2237 if ((mask_r != 0x7c00) ||
2238 (mask_g != 0x03e0) ||
2239 (mask_b != 0x001f))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2242 lookup_r = lookup;
2243 lookup_g = lookup+32;
2244 lookup_b = lookup+32+32;
2245 sh_r = 10;
2246 sh_g = 5;
2247 sh_b = 0;
2248 break;
2249 case 16:
2250 if ((mask_r != 0xf800) ||
2251 (mask_g != 0x07e0) ||
2252 (mask_b != 0x001f))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2255 lookup_r = lookup;
2256 lookup_g = lookup+32;
2257 lookup_b = lookup+32+64;
2258 sh_r = 11;
2259 sh_g = 5;
2260 sh_b = 0;
2261 break;
2262 case 24:
2263 if ((mask_r != 0xff0000) ||
2264 (mask_g != 0x00ff00) ||
2265 (mask_b != 0x0000ff))
2266 return;
2267 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2268 lookup_r = lookup;
2269 lookup_g = lookup+256;
2270 lookup_b = lookup+256+256;
2271 sh_r = 16;
2272 sh_g = 8;
2273 sh_b = 0;
2274 break;
2275 case 32:
2276 if ((mask_r != 0xff0000) ||
2277 (mask_g != 0x00ff00) ||
2278 (mask_b != 0x0000ff))
2279 return;
2280 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2281 lookup_r = lookup;
2282 lookup_g = lookup+256;
2283 lookup_b = lookup+256+256;
2284 sh_r = 16;
2285 sh_g = 8;
2286 sh_b = 0;
2287 break;
2288 default:
2289 return; /* we do not support this color depth */
2290 }
2291
2292 /* prepare limits for color transformation (each channel is handled separately) */
2293 if (shade < 0) {
2294 shade = -shade;
2295 if (shade < 0) shade = 0;
2296 if (shade > 100) shade = 100;
2297
2298 lower_lim_r = 65535-rm;
2299 lower_lim_g = 65535-gm;
2300 lower_lim_b = 65535-bm;
2301
2302 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2303 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2304 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2305
2306 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2307 } else {
2308 if (shade < 0) shade = 0;
2309 if (shade > 100) shade = 100;
2310
2311 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2312
2313 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2314 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2315 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2316 }
2317
2318 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2319 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2320 {
2321 unsigned int tmp;
2322
2323 tmp = lower_lim_r;
2324 lower_lim_r = lower_lim_b;
2325 lower_lim_b = tmp;
2326
2327 tmp = upper_lim_r;
2328 upper_lim_r = upper_lim_b;
2329 upper_lim_b = tmp;
2330 }
2331
2332 /* fill our lookup tables */
2333 for (i = 0; i <= mask_r>>sh_r; i++)
2334 {
2335 RUINT32T tmp;
2336 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2337 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2338 lookup_r[i] = (tmp/65535)<<sh_r;
2339 }
2340 for (i = 0; i <= mask_g>>sh_g; i++)
2341 {
2342 RUINT32T tmp;
2343 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2344 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2345 lookup_g[i] = (tmp/65535)<<sh_g;
2346 }
2347 for (i = 0; i <= mask_b>>sh_b; i++)
2348 {
2349 RUINT32T tmp;
2350 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2351 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2352 lookup_b[i] = (tmp/65535)<<sh_b;
2353 }
2354
2355 /* apply table to input image (replacing colors by newly calculated ones) */
2356 switch (srcImage->bits_per_pixel)
2357 {
2358 case 15:
2359 {
2360 unsigned short *p1, *pf, *p, *pl;
2361 p1 = (unsigned short *) srcImage->data;
2362 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width;
2367 for (; p < pl; p++)
2368 {
2369 *p = lookup_r[(*p & 0x7c00)>>10] |
2370 lookup_g[(*p & 0x03e0)>> 5] |
2371 lookup_b[(*p & 0x001f)];
2372 }
2373 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 16:
2378 {
2379 unsigned short *p1, *pf, *p, *pl;
2380 p1 = (unsigned short *) srcImage->data;
2381 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382 while (p1 < pf)
2383 {
2384 p = p1;
2385 pl = p1 + srcImage->width;
2386 for (; p < pl; p++)
2387 {
2388 *p = lookup_r[(*p & 0xf800)>>11] |
2389 lookup_g[(*p & 0x07e0)>> 5] |
2390 lookup_b[(*p & 0x001f)];
2391 }
2392 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 case 24:
2397 {
2398 unsigned char *p1, *pf, *p, *pl;
2399 p1 = (unsigned char *) srcImage->data;
2400 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width * 3;
2405 for (; p < pl; p += 3)
2406 {
2407 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2408 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2409 p[2] = lookup_r[(p[2] & 0x0000ff)];
2410 }
2411 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 case 32:
2416 {
2417 RUINT32T *p1, *pf, *p, *pl;
2418 p1 = (RUINT32T *) srcImage->data;
2419 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2420
2421 while (p1 < pf)
2422 {
2423 p = p1;
2424 pl = p1 + srcImage->width;
2425 for (; p < pl; p++)
2426 {
2427 *p = lookup_r[(*p & 0xff0000)>>16] |
2428 lookup_g[(*p & 0x00ff00)>> 8] |
2429 lookup_b[(*p & 0x0000ff)] |
2430 (*p & ~0xffffff);
2431 }
2432 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2433 }
2434 break;
2435 }
2436 }
2437
2438 free (lookup);
2439}
2440#endif
2441
2442/*
2443 * Check our parents are still who we think they are.
2444 * Do transparency updates if required
2445 */
2446int
2447rxvt_term::check_our_parents ()
2448{
2449 int i, pchanged, aformat, have_pixmap, rootdepth;
2450 unsigned long nitems, bytes_after;
2451 Atom atype;
2452 unsigned char *prop = NULL;
2453 Window root, oldp, *list;
2454 Pixmap rootpixmap = None;
2455 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2457
2458 pchanged = 0;
2459
2460 if (!OPTION (Opt_transparent))
2461 return pchanged; /* Don't try any more */
2462
2463 XGetWindowAttributes (disp, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth;
2465
2466 XGetWindowAttributes (disp, parent[0], &wattr);
2467
2468 if (rootdepth != wattr.depth)
2469 {
2470 if (am_transparent)
2471 {
2472 pchanged = 1;
2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0;
2475 }
2476
2477 return pchanged; /* Don't try any more */
2478 }
2479
2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (disp, False);
2482
2483 /*
2484 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that.
2487 */
2488 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success);
2498
2499 if (!i || prop == NULL
2500#if TINTING
2501 || !rs[Rs_color + Color_tint]
2502#endif
2503 )
2504 have_pixmap = 0;
2505 else
2506 {
2507 have_pixmap = 1;
2508 rootpixmap = *(Pixmap *)prop;
2509 XFree (prop);
2510 }
2511
2512 if (have_pixmap)
2513 {
2514 /*
2515 * Copy display->root pixmap transparency
2516 */
2517 int sx, sy, nx, ny;
2518 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523
2524 XTranslateCoordinates (disp, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height;
2528 nx = ny = 0;
2529
2530 if (sx < 0)
2531 {
2532 nw += sx;
2533 nx = -sx;
2534 sx = 0;
2535 }
2536
2537 if (sy < 0)
2538 {
2539 nh += sy;
2540 ny = -sy;
2541 sy = 0;
2542 }
2543
2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546
2547 XSync (disp, False);
2548 allowedxerror = -1;
2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */
2553 allowedxerror = 0;
2554
2555 if (image == NULL)
2556 {
2557 if (am_transparent && am_pixmap_trans)
2558 {
2559 pchanged = 1;
2560 if (pixmap != None)
2561 {
2562 XFreePixmap (disp, pixmap);
2563 pixmap = None;
2564 }
2565 }
2566
2567 am_pixmap_trans = 0;
2568 }
2569 else
2570 {
2571 if (pixmap != None)
2572 XFreePixmap (disp, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 unsigned short rm, gm, bm;
2578 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579
2580 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2581
2582 ShadeXImage (display, image, shade, rm, gm, bm);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (disp, vt,
2587 szHint.width, szHint.height, image->depth);
2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2589 XPutImage (disp, pixmap, gc, image, 0, 0,
2590 nx, ny, image->width, image->height);
2591 XFreeGC (disp, gc);
2592 XDestroyImage (image);
2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2594 XClearWindow (disp, parent[0]);
2595
2596 if (!am_transparent || !am_pixmap_trans)
2597 pchanged = 1;
2598
2599 am_transparent = am_pixmap_trans = 1;
2600 }
2601 }
2602
2603 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2605 else
2606 {
2607 unsigned int n;
2608 /*
2609 * InheritPixmap transparency
2610 */
2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612 {
2613 oldp = parent[i];
2614 XQueryTree (disp, parent[i - 1], &root,
2615 &parent[i], &list, &n);
2616 XFree (list);
2617
2618 if (parent[i] == display->root)
2619 {
2620 if (oldp != None)
2621 pchanged = 1;
2622
2623 break;
2624 }
2625
2626 if (oldp != parent[i])
2627 pchanged = 1;
2628 }
2629
2630 n = 0;
2631
2632 if (pchanged)
2633 {
2634 for (; n < (unsigned int)i; n++)
2635 {
2636 XGetWindowAttributes (disp, parent[n], &wattr);
2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638 {
2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640 break;
2641 }
2642 }
2643 }
2644
2645 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2646 {
2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2649 am_transparent = 0;
2650 /* XXX: also turn off Opt_transparent? */
2651 }
2652 else
2653 {
2654#if WAIT_FOR_WM
2655 /* wait (an arbitrary period) for the WM to do its thing
2656 * needed for fvwm2.2.2 (and before?) */
2657 sleep (1);
2658#endif
2659 for (n = 0; n < (unsigned int)i; n++)
2660 {
2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2662 XClearWindow (disp, parent[n]);
2663 }
2664
2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2666 am_transparent = 1;
2667 }
2668
2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670 parent[i] = None;
2671 }
2672
2673 if (scrollBar.win)
2674 {
2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2676 scrollBar.setIdle ();
2677 scrollbar_show (0);
2678 }
2679
2680 if (am_transparent)
2681 {
2682 want_refresh = want_full_refresh = 1;
2683 if (am_pixmap_trans)
2684 flush ();
2685 }
2686
2687 return pchanged;
2688}
2689#endif
2690 2236
2691/*}}} */ 2237/*}}} */
2692 2238
2693bool 2239bool
2694rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2743 if (ch == C0_LF) 2289 if (ch == C0_LF)
2744 nlines++; 2290 nlines++;
2745 2291
2746 refresh_count++; 2292 refresh_count++;
2747 2293
2748 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2750 { 2295 {
2751 refreshnow = true;
2752 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2753 ch = NOCHAR; 2301 ch = NOCHAR;
2754 break; 2302 break;
2303 }
2755 } 2304 }
2756 2305
2757 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2758 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2759 { 2308 {
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2789 2338
2790 /* 2339 /*
2791 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2792 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2793 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2794 * is incremented here because we must be doing flat-out scrolling.
2795 */ 2343 */
2796 if (refreshnow) 2344 if (refreshnow)
2797 { 2345 {
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++;
2800 else
2801 {
2802 flag = true; 2346 flag = true;
2803 scr_refresh (refresh_type); 2347 scr_refresh ();
2804 want_refresh = 1; 2348 want_refresh = 1;
2805 }
2806 } 2349 }
2807 2350
2808 } 2351 }
2809 else 2352 else
2810 { 2353 {
2826 return flag; 2369 return flag;
2827} 2370}
2828 2371
2829// read the next character 2372// read the next character
2830wchar_t 2373wchar_t
2831rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2832{ 2375{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2377 {
2835 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2857 return NOCHAR; 2400 return NOCHAR;
2858} 2401}
2859 2402
2860// read the next octet 2403// read the next octet
2861uint32_t 2404uint32_t
2862rxvt_term::next_octet () 2405rxvt_term::next_octet () NOTHROW
2863{ 2406{
2864 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2409 : NOCHAR;
2867} 2410}
2411
2412static class out_of_input out_of_input;
2868 2413
2869/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2870/* 2415/*
2871 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2872 * to the command. 2417 * to the command.
2873 */ 2418 */
2874wchar_t 2419wchar_t
2875rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2421{
2877 wchar_t c = next_char (); 2422 wchar_t c = next_char ();
2878 2423
2879 if (c == NOCHAR) 2424 if (c == NOCHAR)
2880 throw out_of_input; 2425 throw out_of_input;
2881 2426
2882 return c; 2427 return c;
2883} 2428}
2884 2429
2885uint32_t 2430uint32_t
2886rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2432{
2888 uint32_t c = next_octet (); 2433 uint32_t c = next_octet ();
2889 2434
2890 if (c == NOCHAR) 2435 if (c == NOCHAR)
2891 throw out_of_input; 2436 throw out_of_input;
2957 { 2502 {
2958 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2959 break; /* done = 1 */ 2504 break; /* done = 1 */
2960 } 2505 }
2961 } 2506 }
2962 2507
2963 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2964 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2965 { 2510 {
2966 done = 1; 2511 done = 1;
2967 break; 2512 break;
3129 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3130 break; 2675 break;
3131 case '+': 2676 case '+':
3132 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3133 break; 2678 break;
3134#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3135 case '6': 2680 case '6':
3136 scr_backindex (); 2681 scr_backindex ();
3137 break; 2682 break;
3138#endif 2683#endif
3139 case '7': 2684 case '7':
3140 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3141 break; 2686 break;
3142 case '8': 2687 case '8':
3143 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3144 break; 2689 break;
3145#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3146 case '9': 2691 case '9':
3147 scr_forwardindex (); 2692 scr_forwardindex ();
3148 break; 2693 break;
3149#endif 2694#endif
3150 case '=': 2695 case '=':
3312 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3313 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3314 if (arg[p] == -1) 2859 if (arg[p] == -1)
3315 arg[p] = ndef; 2860 arg[p] = ndef;
3316 2861
3317#ifdef DEBUG_CMD
3318 fprintf (stderr, "CSI ");
3319 for (p = 0; p < nargs; p++)
3320 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321 fprintf (stderr, "%c\n", ch);
3322#endif
3323
3324 /* 2862 /*
3325 * private mode handling 2863 * private mode handling
3326 */ 2864 */
3327 if (priv) 2865 if (priv)
3328 { 2866 {
3329 switch (priv) 2867 switch (priv)
3330 { 2868 {
3331 case '>': 2869 case '>':
3332 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2871 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do).
2878 //
2879 tt_printf ("\033[>%d;94;0c", 'U');
2880 }
3334 break; 2881 break;
3335 case '?': 2882 case '?':
3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3338 break; 2885 break;
3464 break; 3011 break;
3465 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3466 scr_report_position (); 3013 scr_report_position ();
3467 break; 3014 break;
3468 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3469 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3470 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3471 break; 3018 break;
3472 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3473 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3474 break; 3021 break;
3541 break; 3088 break;
3542 case CSI_75: 3089 case CSI_75:
3543 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3544 break; 3091 break;
3545 3092
3546#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3547 case CSI_74: 3094 case CSI_74:
3548 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3549 break; 3096 break;
3550#endif 3097#endif
3551 3098
3558 break; 3105 break;
3559 } 3106 }
3560} 3107}
3561/*}}} */ 3108/*}}} */
3562 3109
3563#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3564/* ARGSUSED */ 3111/* ARGSUSED */
3565void 3112void
3566rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567{ 3114{
3568 int x, y; 3115 int x, y;
3569 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3570 Window wdummy; 3117 Window wdummy;
3571 dDisp; 3118
3119 dLocal (Display *, dpy);
3572 3120
3573 if (nargs == 0) 3121 if (nargs == 0)
3574 return; 3122 return;
3575 3123
3576 switch (args[0]) 3124 switch (args[0])
3577 { 3125 {
3578 /* 3126 /*
3579 * commands 3127 * commands
3580 */ 3128 */
3581 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3582 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3583 break; 3131 break;
3584 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3585 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3586 break; 3134 break;
3587 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3588 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3589 break; 3137 break;
3590 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592 break; 3140 break;
3593 case 5: /* raise window */ 3141 case 5: /* raise window */
3594 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3595 break; 3143 break;
3596 case 6: /* lower window */ 3144 case 6: /* lower window */
3597 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3598 break; 3146 break;
3599 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3600 scr_touch (true); 3148 scr_touch (true);
3601 break; 3149 break;
3602 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3609 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3610 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3611 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3612 break; 3160 break;
3613 3161
3614
3615 /* 3162 /*
3616 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3617 */ 3164 */
3618 case 11: /* report window state */ 3165 case 11: /* report window state */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621 break; 3168 break;
3622 case 13: /* report window position */ 3169 case 13: /* report window position */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3625 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3626 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3627 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3628 break; 3175 break;
3629 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3630 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632 break; 3179 break;
3633 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3634 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635 break; 3182 break;
3637 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638 break; 3185 break;
3639 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3640 { 3187 {
3641 char *s; 3188 char *s;
3642 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644 XFree (s); 3191 XFree (s);
3645 } 3192 }
3646 break; 3193 break;
3647 case 21: /* report window title */ 3194 case 21: /* report window title */
3648 { 3195 {
3649 char *s; 3196 char *s;
3650 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652 XFree (s); 3199 XFree (s);
3653 } 3200 }
3654 break; 3201 break;
3655 } 3202 }
3656} 3203}
3683 seen_esc = true; 3230 seen_esc = true;
3684 continue; 3231 continue;
3685 } 3232 }
3686 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3687 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3688 else if (ch < 0x20) 3237 else if (ch < 0x20)
3689 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3690 3239
3691 seen_esc = false; 3240 seen_esc = false;
3692 3241
3693 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3694 // stop at some sane length 3243 // stop at some sane length
3695 return NULL; 3244 return NULL;
3696 3245
3697 if (ch == C0_SYN)
3698 string[n++] = cmd_get8 ();
3699 else
3700 string[n++] = ch; 3246 string[n++] = ch;
3701 } 3247 }
3702 3248
3703 string[n++] = '\0'; 3249 string[n++] = '\0';
3704 3250
3705 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3756void 3302void
3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758{ 3304{
3759 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3760 { 3306 {
3761 unsigned short r, g, b; 3307 rgba c;
3762 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 } 3316 }
3765 else 3317 else
3766 set_window_color (color, str); 3318 set_window_color (color, str);
3767} 3319}
3768 3320
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3323 */
3772void 3324void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3326{
3775 int changed = 0;
3776 int color; 3327 int color;
3777 char *buf, *name; 3328 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3330 int saveop = op;
3780 dDisp; 3331
3332 dLocal (Display *, dpy);
3781 3333
3782 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3783 switch (op) 3339 switch (op)
3784 { 3340 {
3785 case XTerm_name: 3341 case XTerm_name:
3786 set_title (str); 3342 set_title (str);
3787 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
3801 unsigned long bytes_after; 3357 unsigned long bytes_after;
3802 unsigned char *value = 0; 3358 unsigned char *value = 0;
3803 const char *str = ""; 3359 const char *str = "";
3804 3360
3805 if (prop 3361 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3366 && actual_type != None
3811 && actual_format == 8) 3367 && actual_format == 8)
3812 str = (const char *)(value); 3368 str = (const char *)(value);
3813 3369
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3371
3816 XFree (value); 3372 XFree (value);
3817 } 3373 }
3818 else 3374 else
3819 { 3375 {
3823 { 3379 {
3824 *eq = 0; 3380 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3826 } 3382 }
3827 else 3383 else
3828 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3385 display->atom (str));
3830 } 3386 }
3831 break; 3387 break;
3832 3388
3833 case XTerm_Color: 3389 case XTerm_Color:
3843 break; 3399 break;
3844 3400
3845 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3402 *buf++ = '\0';
3847 3403
3848 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3405 }
3857 break; 3406 break;
3858 case XTerm_Color00: 3407 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3860 break; 3409 break;
3861 case XTerm_Color01: 3410 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3863 break; 3412 break;
3864#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3416 break;
3868#endif 3417#endif
3869 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3420 break;
3872 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3423 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3878 break; 3427 break;
3879 case Rxvt_Color_BD: 3428 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3882 break; 3431 break;
3883 case Rxvt_Color_UL: 3432 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3433 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3434 process_color_seq (op, Color_UL, str, resp);
3886 break; 3435 break;
3887 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3889 break; 3438 break;
3890#endif 3439#endif
3891#if TRANSPARENT && TINTING 3440#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3894 check_our_parents (); 3444 check_our_parents ();
3445
3895 if (am_transparent) 3446 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3897 break; 3449 break;
3898#endif 3450#endif
3899 3451
3900 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3901 if (*str != ';') 3454 if (*str != ';')
3902 { 3455 {
3903#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3459 scr_touch (true);
3907#endif 3460#endif
3908 } 3461 }
3909 3462
3463 int changed = 0;
3464
3910 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3911 { 3466 {
3912 str++; 3467 str++;
3913#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3915#endif 3470#endif
3916 } 3471 }
3917 3472
3918 if (changed) 3473 if (changed)
3919 { 3474 {
3920#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3476 resize_pixmap ();
3922 scr_touch (true); 3477 scr_touch (true);
3923#endif 3478#endif
3924 } 3479 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3925 break; 3485 break;
3926 3486
3927 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3929 break; 3489 break;
3955 case URxvt_italicFont: 3515 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3957#endif 3517#endif
3958 if (query) 3518 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3522 resp);
3963 else 3523 else
3964 { 3524 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3968 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3969 set_fonts (); 3529 set_fonts ();
3970 } 3530 }
3971 break; 3531 break;
3972 3532
3973#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3974 case URxvt_locale: 3542 case URxvt_locale:
3975 if (query) 3543 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3977 else 3545 else
3978 { 3546 {
3979 set_locale (str); 3547 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3549 init_xlocale ();
3982 } 3550 }
3983 break; 3551 break;
3984 3552
3985 case URxvt_view_up: 3553 case URxvt_view_up:
3996 break; 3564 break;
3997#endif 3565#endif
3998 3566
3999#if ENABLE_PERL 3567#if ENABLE_PERL
4000 case URxvt_perl: 3568 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002 ; // no responses yet 3570 ; // no responses yet
4003 break; 3571 break;
4004#endif 3572#endif
4005 } 3573 }
4006} 3574}
4038 return state; 3606 return state;
4039} 3607}
4040 3608
4041/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4042void 3610void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 3612{
4045 unsigned int i, j; 3613 unsigned int i, j;
4046 int state; 3614 int state;
4047 3615
4048 static const struct 3616 static const struct
4122 scr_touch (true); 3690 scr_touch (true);
4123 break; 3691 break;
4124#endif 3692#endif
4125 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4126 case 1049: 3694 case 1049:
4127 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4128 if (mode == 0) 3696 if (mode == 0)
4129 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4130 else if (mode == 1) 3698 else if (mode == 1)
4131 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4132 break; 3700 break;
4197 break; 3765 break;
4198 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4199 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4200 break; 3768 break;
4201 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4202 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4203 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4204 scr_erase_screen (2); 3772 scr_erase_screen (2);
4205 scr_change_screen (state); 3773 scr_change_screen (state);
4206 break; 3774 break;
4207 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4208 scr_change_screen (state); 3776 scr_change_screen (state);
4209 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4211 scr_erase_screen (2); 3779 scr_erase_screen (2);
4212 break; 3780 break;
4213 default: 3781 default:
4214 break; 3782 break;
4342 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4343 break; 3911 break;
4344 3912
4345 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4346 3914
4347#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4348 case 90: 3916 case 90:
4349 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4350 case 92: 3918 case 92:
4351 case 93: 3919 case 93:
4352 case 94: 3920 case 94:
4417rxvt_term::tt_write (const char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 3986{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 3988 return;
4421 3989
4422 if (pty.pty < 0) 3990 if (pty->pty < 0)
4423 return; 3991 return;
4424 3992
4425 if (v_buflen == 0) 3993 if (v_buflen == 0)
4426 { 3994 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 3996
4429 if ((unsigned int)written == len) 3997 if ((unsigned int)written == len)
4430 return; 3998 return;
4431 3999
4432 data += written; 4000 data += written;
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4010}
4443 4011
4444void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4445{ 4013{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4015
4448 if (written > 0) 4016 if (written > 0)
4449 { 4017 {
4450 v_buflen -= written; 4018 v_buflen -= written;
4451 4019

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines