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.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 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)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
716 727
717 case XK_Find: 728 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
719 break; 730 break;
720 731
721#ifdef XK_KP_End 732#ifdef XK_KP_Insert
722 case XK_KP_Insert: 733 case XK_KP_Insert:
723 /* allow shift to override */ 734 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 736 {
726 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
873 return; 884 return;
874 885
875 if (len <= 0) 886 if (len <= 0)
876 return; /* not mapped */ 887 return; /* not mapped */
877 888
878 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 890 if (view_start)
880 { 891 {
881 view_start = 0; 892 view_start = 0;
882 want_refresh = 1; 893 want_refresh = 1;
883 } 894 }
… …
905 { 916 {
906 const char ch = C0_ESC; 917 const char ch = C0_ESC;
907 tt_write (&ch, 1); 918 tt_write (&ch, 1);
908 } 919 }
909 920
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); 921 tt_write (kbuf, (unsigned int)len);
921} 922}
922/*}}} */ 923
924void
925rxvt_term::key_release (XKeyEvent &ev)
926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
923 1000
924#if defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
925unsigned int 1002unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1004{
… …
957void 1034void
958rxvt_term::flush () 1035rxvt_term::flush ()
959{ 1036{
960 flush_ev.stop (); 1037 flush_ev.stop ();
961 1038
962#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
963 if (want_full_refresh) 1040 if (want_full_refresh)
964 { 1041 {
965 want_full_refresh = 0; 1042 want_full_refresh = 0;
966 scr_clear (); 1043 scr_clear ();
967 scr_touch (false); 1044 scr_touch (false);
… …
1032void 1109void
1033rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1034{ 1111{
1035 make_current (); 1112 make_current ();
1036 1113
1037 refresh_limit = 1;
1038 refresh_count = 0; 1114 refresh_count = 0;
1039 flush (); 1115 flush ();
1040} 1116}
1041 1117
1042#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1121{
1046 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1123 want_refresh = 1;
1048 1124
1049 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1126}
1051#endif 1127#endif
1052 1128
1053#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1054void 1130void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1181 }
1106} 1182}
1107#endif 1183#endif
1108 1184
1109#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1110static struct event_handler 1186static struct event_handler
1111{ 1187{
1112 check_watcher cw_yield; 1188 check_watcher yield_ev;
1113 1189
1114 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1115 { 1191 {
1116 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1117 w.stop (); 1200 w.stop ();
1118 } 1201 }
1119 1202
1120 event_handler () 1203 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1122 { 1205 {
1123 } 1206 }
1124} event_handler; 1207} event_handler;
1125#endif 1208#endif
1126 1209
… …
1137 1220
1138 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1139 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1140 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1141 1224
1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143 1226
1144 if (r > 0) 1227 if (r > 0)
1145 { 1228 {
1146 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1147 return true; 1230 return true;
1148 } 1231 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1233 {
1151#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1152 if (display->is_local) 1235 if (display->is_local)
1153 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1154#endif 1237#endif
1155 } 1238 }
1156 else 1239 else
1157 { 1240 {
1158 pty_ev.stop (); 1241 pty_ev.stop ();
1159 1242
1160 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1161 destroy (); 1244 destroy ();
1162 } 1245 }
1163 1246
1164 return false; 1247 return false;
1165} 1248}
1166 1249
1167void 1250void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1263}
1181 1264
1182void 1265void
1183rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1184{ 1267{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1269 recolour_cursor ();
1187 1270
1188#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1272 hidden_pointer = 0;
1190 1273
1191 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1276#endif
1194} 1277}
1195 1278
1196#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1197void 1280void
1198rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1199{ 1282{
1200 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1201 return; 1284 return;
1202 1285
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1287 XFlush (dpy);
1205 1288
1206 hidden_pointer = 1; 1289 hidden_pointer = 1;
1207} 1290}
1208 1291
1209void 1292void
… …
1282 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1283 (32 + x + 1), 1366 (32 + x + 1),
1284 (32 + y + 1)); 1367 (32 + y + 1));
1285} 1368}
1286 1369
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1370/*{{{ process an X event */
1298void 1371void
1299rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1300{ 1373{
1301 make_current (); 1374 make_current ();
1302 1375
1303 dDisp; 1376 dLocal (Display *, dpy);
1304 1377
1305 if (ev.xany.window == vt 1378 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1381 return;
… …
1313 unsigned int unused_mask; 1386 unsigned int unused_mask;
1314 1387
1315 switch (ev.type) 1388 switch (ev.type)
1316 { 1389 {
1317 case KeyPress: 1390 case KeyPress:
1318#if ISO_14755 1391 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1392 break;
1324 1393
1325 case KeyRelease: 1394 case KeyRelease:
1326 { 1395 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1396 break;
1398 }
1399 1397
1400 case ButtonPress: 1398 case ButtonPress:
1401 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1402 break; 1400 break;
1403 1401
… …
1405 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1406 break; 1404 break;
1407 1405
1408 case ClientMessage: 1406 case ClientMessage:
1409 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1417 destroy ();
1418 }
1414#if ENABLE_EWMH 1419#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1419#endif 1435#endif
1420 } 1436 }
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 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1437 break;
1461 1438
1462 /* 1439 /*
1463 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1483 break; 1460 break;
1484 } 1461 }
1485 break; 1462 break;
1486 1463
1487 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1468 focus_in ();
1489 break; 1469 break;
1490 1470
1491 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1475 focus_out ();
1493 break; 1476 break;
1494 1477
1495 case ConfigureNotify: 1478 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent[0])
1497 { 1480 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1482 ;
1500 1483
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1485 {
1503 seen_resize = 1; 1486 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1488 }
1506 1489 else
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490 {
1491#ifdef ENABLE_TRANSPARENCY
1508 if (OPTION (Opt_transparent)) 1492 if (option (Opt_transparent))
1509 check_our_parents (); 1493 if (bgPixmap.render ())
1494 scr_touch (false);
1510#endif 1495#endif
1496 }
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1511 } 1498 }
1512 break; 1499 break;
1513 1500
1514 case PropertyNotify: 1501 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1504 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1506
1519 break; 1507 break;
1520 1508
1521 case SelectionClear: 1509 case SelectionClear:
1522 selection_clear (); 1510 selection_clear ();
… …
1545 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1546#endif 1534#endif
1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1548 break; 1536 break;
1549 1537
1550#ifdef TRANSPARENT 1538#ifdef ENABLE_TRANSPARENCY
1551 case ReparentNotify: 1539 case ReparentNotify:
1552 rootwin_cb (ev); 1540 rootwin_cb (ev);
1553 break; 1541 break;
1554#endif /* TRANSPARENT */ 1542#endif /* ENABLE_TRANSPARENCY */
1555 1543
1556 case GraphicsExpose: 1544 case GraphicsExpose:
1557 case Expose: 1545 case Expose:
1558 if (ev.xany.window == vt) 1546 if (ev.xany.window == vt)
1559 { 1547 {
1560 do 1548 do
1561 scr_expose (ev.xexpose.x, ev.xexpose.y, 1549 scr_expose (ev.xexpose.x, ev.xexpose.y,
1562 ev.xexpose.width, ev.xexpose.height, False); 1550 ev.xexpose.width, ev.xexpose.height, False);
1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564 1552
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566 1554
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1570 1558
1571 want_refresh = 1; 1559 want_refresh = 1;
1572 } 1560 }
1573 else 1561 else
1574 { 1562 {
1575 XEvent unused_event; 1563 XEvent unused_event;
1576 1564
1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578 ; 1566 ;
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580 ; 1568 ;
1581 1569
1582 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1583 { 1571 {
1584 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1585 scrollbar_show (0); 1573 scrollbar_show (0);
1586 } 1574 }
1587
1588#ifdef TRANSPARENT
1589 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window);
1591#endif
1592 } 1575 }
1593 break; 1576 break;
1594 1577
1595 case MotionNotify: 1578 case MotionNotify:
1596#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
… …
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop 1590 ; // nop
1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609 { 1592 {
1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611 ; 1594 ;
1612 1595
1613 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1614 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1615 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1616 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1617 &ev.xbutton.state); 1600 &ev.xbutton.state);
1618#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1682#endif 1665#endif
1683 } 1666 }
1684 } 1667 }
1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686 { 1669 {
1687 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1689 ; 1672 ;
1690 1673
1691 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1692 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1693 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1694 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1695 &unused_mask); 1678 &unused_mask);
1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1697 scrollbar_size ()); 1680 scrollbar_size ());
1698 want_refresh = 1; 1681 want_refresh = 1;
1699 refresh_limit = 0;
1700 scrollbar_show (1); 1682 scrollbar_show (1);
1701 } 1683 }
1702 break; 1684 break;
1703 } 1685 }
1704 1686
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1709 { 1689 {
1710 if (hidden_cursor) 1690 if (hidden_cursor)
1711 { 1691 {
1712 hidden_cursor = 0; 1692 hidden_cursor = 0;
1713 want_refresh = 1; 1693 want_refresh = 1;
1714 } 1694 }
1715 1695
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1697 }
1718#endif 1698#endif
1719 1699
1720#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 { 1702 {
1723 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1726 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1738 if (!focus) 1718 if (!focus)
1739 { 1719 {
1740 focus = 1; 1720 focus = 1;
1741 want_refresh = 1; 1721 want_refresh = 1;
1742 1722
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 1724
1745#if USE_XIM 1725#if USE_XIM
1746 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1747 { 1727 {
1748 IMSetStatusPosition (); 1728 IMSetPosition ();
1749 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1750 } 1730 }
1751#endif 1731#endif
1752#if CURSOR_BLINK 1732#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1733 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1735#endif
1756#if OFF_FOCUS_FADING 1736#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1737 if (rs[Rs_fade])
1758 { 1738 {
1759 pix_colors = pix_colors_focused; 1739 pix_colors = pix_colors_focused;
1760 scr_recolour (); 1740 scr_recolour ();
1761 } 1741 }
1762#endif 1742#endif
1743#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell))
1745 {
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif
1763 } 1756 }
1764} 1757}
1765 1758
1766void 1759void
1767rxvt_term::focus_out () 1760rxvt_term::focus_out ()
… …
1775 1768
1776#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf) 1770 if (iso14755buf)
1778 { 1771 {
1779 iso14755buf = 0; 1772 iso14755buf = 0;
1780# if ENABLE_OVERLAY 1773# if ISO_14755
1781 scr_overlay_off (); 1774 scr_overlay_off ();
1782# endif 1775# endif
1783 } 1776 }
1784#endif 1777#endif
1785#if USE_XIM 1778#if USE_XIM
1786 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context); 1780 XUnsetICFocus (Input_Context);
1788#endif 1781#endif
1789#if CURSOR_BLINK 1782#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink)) 1783 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop (); 1784 cursor_blink_ev.stop ();
1792 hidden_cursor = 0; 1785 hidden_cursor = 0;
1793#endif 1786#endif
1794#if OFF_FOCUS_FADING 1787#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1788 if (rs[Rs_fade])
… …
1799 } 1792 }
1800#endif 1793#endif
1801 } 1794 }
1802} 1795}
1803 1796
1804#if TRANSPARENT 1797void
1798rxvt_term::update_fade_color (unsigned int idx)
1799{
1800#if OFF_FOCUS_FADING
1801 if (rs[Rs_fade])
1802 {
1803 rgba c;
1804 pix_colors [Color_fade].get (c);
1805 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1806 }
1807#endif
1808}
1809
1810#if ENABLE_TRANSPARENCY || ENABLE_PERL
1805void 1811void
1806rxvt_term::rootwin_cb (XEvent &ev) 1812rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1813{
1808 make_current (); 1814 make_current ();
1809 1815
1816 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1817 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1820# if ENABLE_TRANSPARENCY
1810 switch (ev.type) 1821 switch (ev.type)
1811 { 1822 {
1812 case PropertyNotify: 1823 case PropertyNotify:
1813 /* 1824 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1825 * if user used some Esetroot compatible prog to set the root bg,
1815 * use the property to determine the pixmap. We use it later on. 1826 * use the property to determine the pixmap. We use it later on.
1816 */ 1827 */
1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 return; 1830 {
1820 1831 bgPixmap.set_root_pixmap ();
1821 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1822 case ReparentNotify: 1833 }
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1;
1825 break; 1834 break;
1826 } 1835 }
1836# endif
1827} 1837}
1828#endif 1838#endif
1829 1839
1830void 1840void
1831rxvt_term::button_press (XButtonEvent &ev) 1841rxvt_term::button_press (XButtonEvent &ev)
… …
1840 /* 1850 /*
1841 * VT window processing of button press 1851 * VT window processing of button press
1842 */ 1852 */
1843 if (ev.window == vt) 1853 if (ev.window == vt)
1844 { 1854 {
1855 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1856 return;
1857
1845#if ISO_14755 1858#if ISO_14755
1846 // 5.4 1859 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1861 {
1849 iso14755_54 (ev.x, ev.y); 1862 iso14755_54 (ev.x, ev.y);
… …
1891 else 1904 else
1892 { 1905 {
1893 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1895 1908
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1909 switch (ev.button)
1898 { 1910 {
1899 case Button1: 1911 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1916#else
1905 selection.rect = false; 1917 selection.rect = false;
1906#endif 1918#endif
1907 1919
1908 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1922 {
1911 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1913 else 1925 else
1914 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1915 } 1927 }
1916 else 1928 else
1917 { 1929 {
1918 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1931 MEvent.clicks++;
1920 else 1932 else
1921 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1922 1934
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1936 }
1925 1937
1926 MEvent.button = Button1; 1938 MEvent.button = Button1;
1927 break; 1939 break;
1928 1940
1929 case Button3: 1941 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1932 else 1944 else
1933 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1934 1946
1935 MEvent.button = Button3; 1947 MEvent.button = Button3;
1936 break; 1948 break;
1937 } 1949 }
1938 } 1950 }
1939 1951
1940 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1941 return; 1953 return;
1942 } 1954 }
1943 1955
… …
2106 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2107#endif 2119#endif
2108 2120
2109 if (ev.window == vt) 2121 if (ev.window == vt)
2110 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2111#if ISO_14755 2126#if ISO_14755
2112 // 5.4 2127 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2129 return;
2115#endif 2130#endif
2131
2116 if (reportmode) 2132 if (reportmode)
2117 { 2133 {
2118 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2144 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2161 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2148 2164
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2165 switch (ev.button)
2153 { 2166 {
2154 case Button1: 2167 case Button1:
2155 case Button3: 2168 case Button3:
2156 selection_make (ev.time); 2169 selection_make (ev.time);
2157 break; 2170 break;
2171
2158 case Button2: 2172 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2175 break;
2176
2161#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2162 case Button4: 2178 case Button4:
2163 case Button5: 2179 case Button5:
2164 { 2180 {
2165 int i; 2181 int i;
… …
2167 2183
2168 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2169 2185
2170 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2171 i = 1; 2187 i = 1;
2172 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2173 i = nrow - 1; 2189 i = nrow - 1;
2174 else 2190 else
2175 i = 5; 2191 i = 5;
2176 2192
2177# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2198 break; 2214 break;
2199#endif 2215#endif
2200 } 2216 }
2201 } 2217 }
2202} 2218}
2203
2204#ifdef TRANSPARENT
2205#if TINTING
2206/* taken from aterm-0.4.2 */
2207
2208typedef uint32_t RUINT32T;
2209
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{
2212 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i;
2218
2219 Visual *visual = display->visual;
2220
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222
2223 /* for convenience */
2224 mask_r = visual->red_mask;
2225 mask_g = visual->green_mask;
2226 mask_b = visual->blue_mask;
2227
2228 /* boring lookup table pre-initialization */
2229 switch (srcImage->bits_per_pixel) {
2230 case 15:
2231 if ((mask_r != 0x7c00) ||
2232 (mask_g != 0x03e0) ||
2233 (mask_b != 0x001f))
2234 return;
2235 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2236 lookup_r = lookup;
2237 lookup_g = lookup+32;
2238 lookup_b = lookup+32+32;
2239 sh_r = 10;
2240 sh_g = 5;
2241 sh_b = 0;
2242 break;
2243 case 16:
2244 if ((mask_r != 0xf800) ||
2245 (mask_g != 0x07e0) ||
2246 (mask_b != 0x001f))
2247 return;
2248 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2249 lookup_r = lookup;
2250 lookup_g = lookup+32;
2251 lookup_b = lookup+32+64;
2252 sh_r = 11;
2253 sh_g = 5;
2254 sh_b = 0;
2255 break;
2256 case 24:
2257 if ((mask_r != 0xff0000) ||
2258 (mask_g != 0x00ff00) ||
2259 (mask_b != 0x0000ff))
2260 return;
2261 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2262 lookup_r = lookup;
2263 lookup_g = lookup+256;
2264 lookup_b = lookup+256+256;
2265 sh_r = 16;
2266 sh_g = 8;
2267 sh_b = 0;
2268 break;
2269 case 32:
2270 if ((mask_r != 0xff0000) ||
2271 (mask_g != 0x00ff00) ||
2272 (mask_b != 0x0000ff))
2273 return;
2274 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2275 lookup_r = lookup;
2276 lookup_g = lookup+256;
2277 lookup_b = lookup+256+256;
2278 sh_r = 16;
2279 sh_g = 8;
2280 sh_b = 0;
2281 break;
2282 default:
2283 return; /* we do not support this color depth */
2284 }
2285
2286 /* prepare limits for color transformation (each channel is handled separately) */
2287 if (shade < 0) {
2288 shade = -shade;
2289 if (shade < 0) shade = 0;
2290 if (shade > 100) shade = 100;
2291
2292 lower_lim_r = 65535-rm;
2293 lower_lim_g = 65535-gm;
2294 lower_lim_b = 65535-bm;
2295
2296 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2297 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2298 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2299
2300 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2301 } else {
2302 if (shade < 0) shade = 0;
2303 if (shade > 100) shade = 100;
2304
2305 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2306
2307 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2308 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2309 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2310 }
2311
2312 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2313 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2314 {
2315 unsigned int tmp;
2316
2317 tmp = lower_lim_r;
2318 lower_lim_r = lower_lim_b;
2319 lower_lim_b = tmp;
2320
2321 tmp = upper_lim_r;
2322 upper_lim_r = upper_lim_b;
2323 upper_lim_b = tmp;
2324 }
2325
2326 /* fill our lookup tables */
2327 for (i = 0; i <= mask_r>>sh_r; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2331 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2332 lookup_r[i] = (tmp/65535)<<sh_r;
2333 }
2334 for (i = 0; i <= mask_g>>sh_g; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2338 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2339 lookup_g[i] = (tmp/65535)<<sh_g;
2340 }
2341 for (i = 0; i <= mask_b>>sh_b; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2345 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2346 lookup_b[i] = (tmp/65535)<<sh_b;
2347 }
2348
2349 /* apply table to input image (replacing colors by newly calculated ones) */
2350 switch (srcImage->bits_per_pixel)
2351 {
2352 case 15:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0x7c00)>>10] |
2364 lookup_g[(*p & 0x03e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 16:
2372 {
2373 unsigned short *p1, *pf, *p, *pl;
2374 p1 = (unsigned short *) srcImage->data;
2375 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width;
2380 for (; p < pl; p++)
2381 {
2382 *p = lookup_r[(*p & 0xf800)>>11] |
2383 lookup_g[(*p & 0x07e0)>> 5] |
2384 lookup_b[(*p & 0x001f)];
2385 }
2386 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 24:
2391 {
2392 unsigned char *p1, *pf, *p, *pl;
2393 p1 = (unsigned char *) srcImage->data;
2394 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width * 3;
2399 for (; p < pl; p += 3)
2400 {
2401 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2402 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2403 p[2] = lookup_r[(p[2] & 0x0000ff)];
2404 }
2405 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 32:
2410 {
2411 RUINT32T *p1, *pf, *p, *pl;
2412 p1 = (RUINT32T *) srcImage->data;
2413 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width;
2419 for (; p < pl; p++)
2420 {
2421 *p = lookup_r[(*p & 0xff0000)>>16] |
2422 lookup_g[(*p & 0x00ff00)>> 8] |
2423 lookup_b[(*p & 0x0000ff)] |
2424 (*p & ~0xffffff);
2425 }
2426 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 }
2431
2432 free (lookup);
2433}
2434#endif
2435
2436/*
2437 * Check our parents are still who we think they are.
2438 * Do transparency updates if required
2439 */
2440int
2441rxvt_term::check_our_parents ()
2442{
2443 int i, pchanged, aformat, have_pixmap, rootdepth;
2444 unsigned long nitems, bytes_after;
2445 Atom atype;
2446 unsigned char *prop = NULL;
2447 Window root, oldp, *list;
2448 Pixmap rootpixmap = None;
2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (disp, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (disp, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !rs[Rs_color + Color_tint]
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (disp, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
2542 allowedxerror = -1;
2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (disp, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (disp, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2575
2576 ShadeXImage (display, image, shade, rm, gm, bm);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (disp, vt,
2581 szHint.width, szHint.height, image->depth);
2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2584 nx, ny, image->width, image->height);
2585 XFreeGC (disp, gc);
2586 XDestroyImage (image);
2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2588 XClearWindow (disp, parent[0]);
2589
2590 if (!am_transparent || !am_pixmap_trans)
2591 pchanged = 1;
2592
2593 am_transparent = am_pixmap_trans = 1;
2594 }
2595 }
2596
2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
2600 {
2601 unsigned int n;
2602 /*
2603 * InheritPixmap transparency
2604 */
2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606 {
2607 oldp = parent[i];
2608 XQueryTree (disp, parent[i - 1], &root,
2609 &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 {
2628 for (; n < (unsigned int)i; n++)
2629 {
2630 XGetWindowAttributes (disp, parent[n], &wattr);
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637 }
2638
2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2640 {
2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2643 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */
2645 }
2646 else
2647 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++)
2654 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]);
2657 }
2658
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2660 am_transparent = 1;
2661 }
2662
2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664 parent[i] = None;
2665 }
2666
2667 if (scrollBar.win)
2668 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle ();
2671 scrollbar_show (0);
2672 }
2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2679 }
2680
2681 return pchanged;
2682}
2683#endif
2684 2219
2685/*}}} */ 2220/*}}} */
2686 2221
2687bool 2222bool
2688rxvt_term::cmd_parse () 2223rxvt_term::cmd_parse ()
… …
2737 if (ch == C0_LF) 2272 if (ch == C0_LF)
2738 nlines++; 2273 nlines++;
2739 2274
2740 refresh_count++; 2275 refresh_count++;
2741 2276
2742 if (!OPTION (Opt_jumpScroll) 2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2744 { 2278 {
2745 refreshnow = true;
2746 refresh_count = 0; 2279 refresh_count = 0;
2280
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2282 {
2283 refreshnow = true;
2747 ch = NOCHAR; 2284 ch = NOCHAR;
2748 break; 2285 break;
2286 }
2749 } 2287 }
2750 2288
2751 // scr_add_lines only works for nlines <= nrow - 1. 2289 // scr_add_lines only works for nlines <= nrow - 1.
2752 if (nlines >= nrow - 1) 2290 if (nlines >= nrow - 1)
2753 { 2291 {
… …
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2319 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2782 scr_add_lines (buf, str - buf, nlines); 2320 scr_add_lines (buf, str - buf, nlines);
2783 2321
2784 /* 2322 /*
2785 * If there have been a lot of new lines, then update the screen 2323 * If there have been a lot of new lines, then update the screen
2786 * What the heck I'll cheat and only refresh less than every page-full. 2324 * What the heck we'll cheat and only refresh less than every page-full.
2787 * the number of pages between refreshes is refresh_limit, which 2325 * if skipScroll is enabled.
2788 * is incremented here because we must be doing flat-out scrolling.
2789 */ 2326 */
2790 if (refreshnow) 2327 if (refreshnow)
2791 { 2328 {
2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793 refresh_limit++;
2794 else
2795 {
2796 flag = true; 2329 flag = true;
2797 scr_refresh (); 2330 scr_refresh ();
2798 want_refresh = 1; 2331 want_refresh = 1;
2799 }
2800 } 2332 }
2801 2333
2802 } 2334 }
2803 else 2335 else
2804 { 2336 {
… …
2820 return flag; 2352 return flag;
2821} 2353}
2822 2354
2823// read the next character 2355// read the next character
2824wchar_t 2356wchar_t
2825rxvt_term::next_char () 2357rxvt_term::next_char () NOTHROW
2826{ 2358{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2360 {
2829 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2383 return NOCHAR;
2852} 2384}
2853 2385
2854// read the next octet 2386// read the next octet
2855uint32_t 2387uint32_t
2856rxvt_term::next_octet () 2388rxvt_term::next_octet () NOTHROW
2857{ 2389{
2858 return cmdbuf_ptr < cmdbuf_endp 2390 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2391 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2392 : NOCHAR;
2861} 2393}
2394
2395static class out_of_input out_of_input;
2862 2396
2863/* rxvt_cmd_getc () - Return next input character */ 2397/* rxvt_cmd_getc () - Return next input character */
2864/* 2398/*
2865 * Return the next input character after first passing any keyboard input 2399 * Return the next input character after first passing any keyboard input
2866 * to the command. 2400 * to the command.
2867 */ 2401 */
2868wchar_t 2402wchar_t
2869rxvt_term::cmd_getc () 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2404{
2871 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2872 2406
2873 if (c == NOCHAR) 2407 if (c == NOCHAR)
2874 throw out_of_input; 2408 throw out_of_input;
2875 2409
2876 return c; 2410 return c;
2877} 2411}
2878 2412
2879uint32_t 2413uint32_t
2880rxvt_term::cmd_get8 () 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2415{
2882 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2883 2417
2884 if (c == NOCHAR) 2418 if (c == NOCHAR)
2885 throw out_of_input; 2419 throw out_of_input;
… …
2951 { 2485 {
2952 if ((buf[len++] = cmd_getc ()) == 'i') 2486 if ((buf[len++] = cmd_getc ()) == 'i')
2953 break; /* done = 1 */ 2487 break; /* done = 1 */
2954 } 2488 }
2955 } 2489 }
2956 2490
2957 for (i = 0; i < len; i++) 2491 for (i = 0; i < len; i++)
2958 if (putc (buf[i], fd) == EOF) 2492 if (putc (buf[i], fd) == EOF)
2959 { 2493 {
2960 done = 1; 2494 done = 1;
2961 break; 2495 break;
… …
3023 process_dcs_seq (); 2557 process_dcs_seq ();
3024 break; 2558 break;
3025 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
3026 process_csi_seq (); 2560 process_csi_seq ();
3027 break; 2561 break;
3028 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
3029 process_osc_seq (); 2563 process_osc_seq ();
3030 break; 2564 break;
3031#endif 2565#endif
3032 } 2566 }
3033} 2567}
… …
3123 scr_charset_set (2, (unsigned int)cmd_getc ()); 2657 scr_charset_set (2, (unsigned int)cmd_getc ());
3124 break; 2658 break;
3125 case '+': 2659 case '+':
3126 scr_charset_set (3, (unsigned int)cmd_getc ()); 2660 scr_charset_set (3, (unsigned int)cmd_getc ());
3127 break; 2661 break;
3128#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3129 case '6': 2663 case '6':
3130 scr_backindex (); 2664 scr_backindex ();
3131 break; 2665 break;
3132#endif 2666#endif
3133 case '7': 2667 case '7':
3134 scr_cursor (SAVE); 2668 scr_cursor (SAVE);
3135 break; 2669 break;
3136 case '8': 2670 case '8':
3137 scr_cursor (RESTORE); 2671 scr_cursor (RESTORE);
3138 break; 2672 break;
3139#if ENABLE_FRILLS 2673#if !ENABLE_MINIMAL
3140 case '9': 2674 case '9':
3141 scr_forwardindex (); 2675 scr_forwardindex ();
3142 break; 2676 break;
3143#endif 2677#endif
3144 case '=': 2678 case '=':
… …
3261 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
3262 unsigned int nargs, p; 2796 unsigned int nargs, p;
3263 int n, ndef; 2797 int n, ndef;
3264 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
3265 2799
3266 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
3267 arg[--nargs] = 0; 2801 nargs = 0;
3268 2802
3269 priv = 0; 2803 priv = 0;
3270 ch = cmd_getc (); 2804 ch = cmd_getc ();
3271 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
3272 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
3306 ndef = get_byte_array_bit (csi_defaults, i); 2840 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 2841 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 2842 if (arg[p] == -1)
3309 arg[p] = ndef; 2843 arg[p] = ndef;
3310 2844
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 2845 /*
3319 * private mode handling 2846 * private mode handling
3320 */ 2847 */
3321 if (priv) 2848 if (priv)
3322 { 2849 {
3323 switch (priv) 2850 switch (priv)
3324 { 2851 {
3325 case '>': 2852 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2854 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2860 // that we do not support xterm mouse reporting (should be 95 when we do).
2861 //
2862 tt_printf ("\033[>%d;94;0c", 'U');
2863 }
3328 break; 2864 break;
3329 case '?': 2865 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 2868 break;
… …
3458 break; 2994 break;
3459 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3460 scr_report_position (); 2996 scr_report_position ();
3461 break; 2997 break;
3462 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3463 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3464 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3465 break; 3001 break;
3466 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3468 break; 3004 break;
… …
3535 break; 3071 break;
3536 case CSI_75: 3072 case CSI_75:
3537 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3538 break; 3074 break;
3539 3075
3540#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3541 case CSI_74: 3077 case CSI_74:
3542 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3543 break; 3079 break;
3544#endif 3080#endif
3545 3081
… …
3552 break; 3088 break;
3553 } 3089 }
3554} 3090}
3555/*}}} */ 3091/*}}} */
3556 3092
3557#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3558/* ARGSUSED */ 3094/* ARGSUSED */
3559void 3095void
3560rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3096rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561{ 3097{
3562 int x, y; 3098 int x, y;
3563 XWindowAttributes wattr; 3099 XWindowAttributes wattr;
3564 Window wdummy; 3100 Window wdummy;
3565 dDisp; 3101
3102 dLocal (Display *, dpy);
3566 3103
3567 if (nargs == 0) 3104 if (nargs == 0)
3568 return; 3105 return;
3569 3106
3570 switch (args[0]) 3107 switch (args[0])
3571 { 3108 {
3572 /* 3109 /*
3573 * commands 3110 * commands
3574 */ 3111 */
3575 case 1: /* deiconify window */ 3112 case 1: /* deiconify window */
3576 XMapWindow (disp, parent[0]); 3113 XMapWindow (dpy, parent[0]);
3577 break; 3114 break;
3578 case 2: /* iconify window */ 3115 case 2: /* iconify window */
3579 XIconifyWindow (disp, parent[0], display->screen); 3116 XIconifyWindow (dpy, parent[0], display->screen);
3580 break; 3117 break;
3581 case 3: /* set position (pixels) */ 3118 case 3: /* set position (pixels) */
3582 XMoveWindow (disp, parent[0], args[1], args[2]); 3119 XMoveWindow (dpy, parent[0], args[1], args[2]);
3583 break; 3120 break;
3584 case 4: /* set size (pixels) */ 3121 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3123 break;
3587 case 5: /* raise window */ 3124 case 5: /* raise window */
3588 XRaiseWindow (disp, parent[0]); 3125 XRaiseWindow (dpy, parent[0]);
3589 break; 3126 break;
3590 case 6: /* lower window */ 3127 case 6: /* lower window */
3591 XLowerWindow (disp, parent[0]); 3128 XLowerWindow (dpy, parent[0]);
3592 break; 3129 break;
3593 case 7: /* refresh window */ 3130 case 7: /* refresh window */
3594 scr_touch (true); 3131 scr_touch (true);
3595 break; 3132 break;
3596 case 8: /* set size (chars) */ 3133 case 8: /* set size (chars) */
… …
3603 if (args[0] >= 24) /* set height (chars) */ 3140 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3141 set_widthheight ((unsigned int)width,
3605 (unsigned int) (args[1] * fheight)); 3142 (unsigned int) (args[1] * fheight));
3606 break; 3143 break;
3607 3144
3608
3609 /* 3145 /*
3610 * reports - some output format copied from XTerm 3146 * reports - some output format copied from XTerm
3611 */ 3147 */
3612 case 11: /* report window state */ 3148 case 11: /* report window state */
3613 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615 break; 3151 break;
3616 case 13: /* report window position */ 3152 case 13: /* report window position */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3153 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 XTranslateCoordinates (disp, parent[0], wattr.root, 3154 XTranslateCoordinates (dpy, parent[0], wattr.root,
3619 -wattr.border_width, -wattr.border_width, 3155 -wattr.border_width, -wattr.border_width,
3620 &x, &y, &wdummy); 3156 &x, &y, &wdummy);
3621 tt_printf ("\033[3;%d;%dt", x, y); 3157 tt_printf ("\033[3;%d;%dt", x, y);
3622 break; 3158 break;
3623 case 14: /* report window size (pixels) */ 3159 case 14: /* report window size (pixels) */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626 break; 3162 break;
3627 case 18: /* report text area size (chars) */ 3163 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break; 3165 break;
… …
3631 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3167 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632 break; 3168 break;
3633 case 20: /* report icon label */ 3169 case 20: /* report icon label */
3634 { 3170 {
3635 char *s; 3171 char *s;
3636 XGetIconName (disp, parent[0], &s); 3172 XGetIconName (dpy, parent[0], &s);
3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3173 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s); 3174 XFree (s);
3639 } 3175 }
3640 break; 3176 break;
3641 case 21: /* report window title */ 3177 case 21: /* report window title */
3642 { 3178 {
3643 char *s; 3179 char *s;
3644 XFetchName (disp, parent[0], &s); 3180 XFetchName (dpy, parent[0], &s);
3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3181 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s); 3182 XFree (s);
3647 } 3183 }
3648 break; 3184 break;
3649 } 3185 }
3650} 3186}
… …
3677 seen_esc = true; 3213 seen_esc = true;
3678 continue; 3214 continue;
3679 } 3215 }
3680 else if (ch == C0_BEL || ch == CHAR_ST) 3216 else if (ch == C0_BEL || ch == CHAR_ST)
3681 break; 3217 break;
3218 else if (ch == C0_SYN)
3219 ch = cmd_get8 ();
3682 else if (ch < 0x20) 3220 else if (ch < 0x20)
3683 return NULL; /* other control character - exit */ 3221 return NULL; /* other control character - exit */
3684 3222
3685 seen_esc = false; 3223 seen_esc = false;
3686 3224
3687 if (n >= STRING_MAX - 1) 3225 if (n >= STRING_MAX - 1)
3688 // stop at some sane length 3226 // stop at some sane length
3689 return NULL; 3227 return NULL;
3690 3228
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
3694 string[n++] = ch; 3229 string[n++] = ch;
3695 } 3230 }
3696 3231
3697 string[n++] = '\0'; 3232 string[n++] = '\0';
3698 3233
3699 ends_how = (ch == 0x5c ? C0_ESC : ch); 3234 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3750void 3285void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3286rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{ 3287{
3753 if (str[0] == '?' && !str[1]) 3288 if (str[0] == '?' && !str[1])
3754 { 3289 {
3755 unsigned short r, g, b; 3290 rgba c;
3756 pix_colors_focused[color].get (display, r, g, b); 3291 pix_colors_focused[color].get (c);
3292
3293#if XFT
3294 if (c.a != rgba::MAX_CC)
3295 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3296 else
3297#endif
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3298 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758 } 3299 }
3759 else 3300 else
3760 set_window_color (color, str); 3301 set_window_color (color, str);
3761} 3302}
3762 3303
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3306 */
3766void 3307void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3308rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3309{
3769 int changed = 0;
3770 int color; 3310 int color;
3771 char *buf, *name; 3311 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3312 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3313 int saveop = op;
3774 dDisp; 3314
3315 dLocal (Display *, dpy);
3775 3316
3776 assert (str != NULL); 3317 assert (str != NULL);
3318
3319 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3320 return;
3321
3777 switch (op) 3322 switch (op)
3778 { 3323 {
3779 case XTerm_name: 3324 case XTerm_name:
3780 set_title (str); 3325 set_title (str);
3781 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
… …
3795 unsigned long bytes_after; 3340 unsigned long bytes_after;
3796 unsigned char *value = 0; 3341 unsigned char *value = 0;
3797 const char *str = ""; 3342 const char *str = "";
3798 3343
3799 if (prop 3344 if (prop
3800 && XGetWindowProperty (disp, parent[0], 3345 && XGetWindowProperty (dpy, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType, 3346 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format, 3347 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success 3348 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None 3349 && actual_type != None
3805 && actual_format == 8) 3350 && actual_format == 8)
3806 str = (const char *)(value); 3351 str = (const char *)(value);
3807 3352
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3353 tt_printf ("\033]%d;%s%c", op, str, resp);
3809 3354
3810 XFree (value); 3355 XFree (value);
3811 } 3356 }
3812 else 3357 else
3813 { 3358 {
… …
3817 { 3362 {
3818 *eq = 0; 3363 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1); 3364 set_utf8_property (display->atom (str), eq + 1);
3820 } 3365 }
3821 else 3366 else
3822 XDeleteProperty (disp, parent[0], 3367 XDeleteProperty (dpy, parent[0],
3823 display->atom (str)); 3368 display->atom (str));
3824 } 3369 }
3825 break; 3370 break;
3826 3371
3827 case XTerm_Color: 3372 case XTerm_Color:
… …
3837 break; 3382 break;
3838 3383
3839 if ((buf = strchr (name, ';')) != NULL) 3384 if ((buf = strchr (name, ';')) != NULL)
3840 *buf++ = '\0'; 3385 *buf++ = '\0';
3841 3386
3842 if (name[0] == '?' && !name[1]) 3387 process_color_seq (op, color, name, resp);
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
3849 set_window_color (color, name);
3850 } 3388 }
3851 break; 3389 break;
3852 case XTerm_Color00: 3390 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3391 process_color_seq (op, Color_fg, str, resp);
3854 break; 3392 break;
3855 case XTerm_Color01: 3393 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3857 break; 3395 break;
3858#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3398 process_color_seq (op, Color_cursor, str, resp);
3861 break; 3399 break;
3862#endif 3400#endif
3863 case XTerm_Color_pointer_fg: 3401 case XTerm_Color_pointer_fg:
3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3403 break;
3866 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3406 break;
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV: 3408 case XTerm_Color_RV:
3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3409 process_color_seq (op, Color_RV, str, resp);
3872 break; 3410 break;
3873 case Rxvt_Color_BD: 3411 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3412 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3413 process_color_seq (op, Color_BD, str, resp);
3876 break; 3414 break;
3877 case Rxvt_Color_UL: 3415 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3880 break; 3418 break;
3881 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3883 break; 3421 break;
3884#endif 3422#endif
3885#if TRANSPARENT && TINTING 3423#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3888 check_our_parents (); 3426 {
3889 if (am_transparent) 3427 bool changed = false;
3890 want_full_refresh = want_refresh = 1; 3428 if (ISSET_PIXCOLOR (Color_tint))
3891 break; 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3892#endif 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3893 3435
3436 break;
3437#endif
3438
3439#if XPM_BACKGROUND
3894 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3895 if (*str != ';') 3441 if (!strcmp (str, "?"))
3896 { 3442 {
3897#if XPM_BACKGROUND 3443 char str[256];
3898 scale_pixmap (""); /* reset to default scaling */ 3444
3899 set_bgPixmap (str); /* change pixmap */ 3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3900 scr_touch (true); 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3901#endif 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3902 } 3449 }
3903 3450 else
3904 while ((str = strchr (str, ';')) != NULL)
3905 { 3451 {
3452 int changed = 0;
3453
3454 if (*str != ';')
3455 {
3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3458 if (bgPixmap.set_file (str)) /* change pixmap */
3459 changed++;
3460 str = strchr (str, ';');
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 }
3464 while (str)
3465 {
3906 str++; 3466 str++;
3907#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3908 changed += scale_pixmap (str); 3468 changed++;
3909#endif 3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3910 } 3476 }
3911
3912 if (changed)
3913 {
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap ();
3916 scr_touch (true);
3917#endif
3918 }
3919 break; 3477 break;
3478#endif
3920 3479
3921 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3923 break; 3482 break;
3924 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3949 case URxvt_italicFont: 3508 case URxvt_italicFont:
3950 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3951#endif 3510#endif
3952 if (query) 3511 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp); 3515 resp);
3957 else 3516 else
3958 { 3517 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3962 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
3963 set_fonts (); 3522 set_fonts ();
3964 } 3523 }
3965 break; 3524 break;
3966 3525
3967#if ENABLE_FRILLS 3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
3968 case URxvt_locale: 3535 case URxvt_locale:
3969 if (query) 3536 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3971 else 3538 else
3972 { 3539 {
3973 set_locale (str); 3540 set_locale (str);
3974 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3542 init_xlocale ();
3976 } 3543 }
3977 break; 3544 break;
3978 3545
3979 case URxvt_view_up: 3546 case URxvt_view_up:
… …
3990 break; 3557 break;
3991#endif 3558#endif
3992 3559
3993#if ENABLE_PERL 3560#if ENABLE_PERL
3994 case URxvt_perl: 3561 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3996 ; // no responses yet 3563 ; // no responses yet
3997 break; 3564 break;
3998#endif 3565#endif
3999 } 3566 }
4000} 3567}
… …
4032 return state; 3599 return state;
4033} 3600}
4034 3601
4035/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4036void 3603void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 3605{
4039 unsigned int i, j; 3606 unsigned int i, j;
4040 int state; 3607 int state;
4041 3608
4042 static const struct 3609 static const struct
4043 { 3610 {
4044 const int argval; 3611 const int argval;
4045 const unsigned long bit; 3612 const unsigned long bit;
4046 }
4047
4048 argtopriv[] = { 3613 } argtopriv[] = {
4049 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
4050 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
4051 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
4052 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
4053 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },
… …
4116 scr_touch (true); 3681 scr_touch (true);
4117 break; 3682 break;
4118#endif 3683#endif
4119 case 1048: /* alternative cursor save */ 3684 case 1048: /* alternative cursor save */
4120 case 1049: 3685 case 1049:
4121 if (OPTION (Opt_secondaryScreen)) 3686 if (option (Opt_secondaryScreen))
4122 if (mode == 0) 3687 if (mode == 0)
4123 scr_cursor (RESTORE); 3688 scr_cursor (RESTORE);
4124 else if (mode == 1) 3689 else if (mode == 1)
4125 scr_cursor (SAVE); 3690 scr_cursor (SAVE);
4126 break; 3691 break;
… …
4191 break; 3756 break;
4192 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4193 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
4194 break; 3759 break;
4195 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 3762 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 3763 scr_erase_screen (2);
4199 scr_change_screen (state); 3764 scr_change_screen (state);
4200 break; 3765 break;
4201 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
4202 scr_change_screen (state); 3767 scr_change_screen (state);
4203 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3770 scr_erase_screen (2);
4206 break; 3771 break;
4207 default: 3772 default:
4208 break; 3773 break;
… …
4336 scr_color (Color_bg, Color_bg); 3901 scr_color (Color_bg, Color_bg);
4337 break; 3902 break;
4338 3903
4339 //case 50: // not variable spacing 3904 //case 50: // not variable spacing
4340 3905
4341#if ENABLE_FRILLS 3906#if !ENABLE_MINIMAL
4342 case 90: 3907 case 90:
4343 case 91: /* set bright fg color */ 3908 case 91: /* set bright fg color */
4344 case 92: 3909 case 92:
4345 case 93: 3910 case 93:
4346 case 94: 3911 case 94:
… …
4411rxvt_term::tt_write (const char *data, unsigned int len) 3976rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 3977{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return; 3979 return;
4415 3980
4416 if (pty.pty < 0) 3981 if (pty->pty < 0)
4417 return; 3982 return;
4418 3983
4419 if (v_buflen == 0) 3984 if (v_buflen == 0)
4420 { 3985 {
4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422 3987
4423 if ((unsigned int)written == len) 3988 if ((unsigned int)written == len)
4424 return; 3989 return;
4425 3990
4426 data += written; 3991 data += written;
… …
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436} 4001}
4437 4002
4438void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4439{ 4004{
4440 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441 4006
4442 if (written > 0) 4007 if (written > 0)
4443 { 4008 {
4444 v_buflen -= written; 4009 v_buflen -= written;
4445 4010

Diff Legend

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