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.271 by root, Wed Jan 18 17:49:46 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
… …
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
1490 {
1491#ifdef ENABLE_TRANSPARENCY
1492 if (option (Opt_transparent))
1493 if (bgPixmap.render ())
1494 scr_touch (false);
1495#endif
1496 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1498 }
1514 break; 1499 break;
1515 1500
1516 case PropertyNotify: 1501 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1504 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1506
1521 break; 1507 break;
1522 1508
1523 case SelectionClear: 1509 case SelectionClear:
1524 selection_clear (); 1510 selection_clear ();
… …
1547 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1548#endif 1534#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1536 break;
1551 1537
1552#ifdef TRANSPARENT 1538#ifdef ENABLE_TRANSPARENCY
1553 case ReparentNotify: 1539 case ReparentNotify:
1554 rootwin_cb (ev); 1540 rootwin_cb (ev);
1555 break; 1541 break;
1556#endif /* TRANSPARENT */ 1542#endif /* ENABLE_TRANSPARENCY */
1557 1543
1558 case GraphicsExpose: 1544 case GraphicsExpose:
1559 case Expose: 1545 case Expose:
1560 if (ev.xany.window == vt) 1546 if (ev.xany.window == vt)
1561 { 1547 {
1562 do 1548 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1549 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1550 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1552
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1554
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1572 1558
1573 want_refresh = 1; 1559 want_refresh = 1;
1574 } 1560 }
1575 else 1561 else
1576 { 1562 {
1577 XEvent unused_event; 1563 XEvent unused_event;
1578 1564
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1566 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1568 ;
1583 1569
1584 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1585 { 1571 {
1586 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1587 scrollbar_show (0); 1573 scrollbar_show (0);
1588 } 1574 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1575 }
1595 break; 1576 break;
1596 1577
1597 case MotionNotify: 1578 case MotionNotify:
1598#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1590 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1592 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1594 ;
1614 1595
1615 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1600 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1684#endif 1665#endif
1685 } 1666 }
1686 } 1667 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1669 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1691 ; 1672 ;
1692 1673
1693 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1678 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1680 scrollbar_size ());
1700 want_refresh = 1; 1681 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1682 scrollbar_show (1);
1703 } 1683 }
1704 break; 1684 break;
1705 } 1685 }
1706 1686
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1689 {
1712 if (hidden_cursor) 1690 if (hidden_cursor)
1713 { 1691 {
1714 hidden_cursor = 0; 1692 hidden_cursor = 0;
1715 want_refresh = 1; 1693 want_refresh = 1;
1716 } 1694 }
1717 1695
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1697 }
1720#endif 1698#endif
1721 1699
1722#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1702 {
1725 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1740 if (!focus) 1718 if (!focus)
1741 { 1719 {
1742 focus = 1; 1720 focus = 1;
1743 want_refresh = 1; 1721 want_refresh = 1;
1744 1722
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1724
1747#if USE_XIM 1725#if USE_XIM
1748 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1749 { 1727 {
1750 IMSetStatusPosition (); 1728 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1752 } 1730 }
1753#endif 1731#endif
1754#if CURSOR_BLINK 1732#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1733 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1735#endif
1758#if OFF_FOCUS_FADING 1736#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1737 if (rs[Rs_fade])
1760 { 1738 {
1761 pix_colors = pix_colors_focused; 1739 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1740 scr_recolour ();
1763 } 1741 }
1764#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
1765 } 1756 }
1766} 1757}
1767 1758
1768void 1759void
1769rxvt_term::focus_out () 1760rxvt_term::focus_out ()
… …
1777 1768
1778#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1770 if (iso14755buf)
1780 { 1771 {
1781 iso14755buf = 0; 1772 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1773# if ISO_14755
1783 scr_overlay_off (); 1774 scr_overlay_off ();
1784# endif 1775# endif
1785 } 1776 }
1786#endif 1777#endif
1787#if USE_XIM 1778#if USE_XIM
1788 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1780 XUnsetICFocus (Input_Context);
1790#endif 1781#endif
1791#if CURSOR_BLINK 1782#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1783 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1784 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1785 hidden_cursor = 0;
1795#endif 1786#endif
1796#if OFF_FOCUS_FADING 1787#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1788 if (rs[Rs_fade])
… …
1801 } 1792 }
1802#endif 1793#endif
1803 } 1794 }
1804} 1795}
1805 1796
1806#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
1807void 1811void
1808rxvt_term::rootwin_cb (XEvent &ev) 1812rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1813{
1810 make_current (); 1814 make_current ();
1811 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
1812 switch (ev.type) 1821 switch (ev.type)
1813 { 1822 {
1814 case PropertyNotify: 1823 case PropertyNotify:
1815 /* 1824 /*
1816 * 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,
1817 * 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.
1818 */ 1827 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1830 {
1822 1831 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1824 case ReparentNotify: 1833 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1834 break;
1828 } 1835 }
1836# endif
1829} 1837}
1830#endif 1838#endif
1831 1839
1832void 1840void
1833rxvt_term::button_press (XButtonEvent &ev) 1841rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1850 /*
1843 * VT window processing of button press 1851 * VT window processing of button press
1844 */ 1852 */
1845 if (ev.window == vt) 1853 if (ev.window == vt)
1846 { 1854 {
1855 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1856 return;
1857
1847#if ISO_14755 1858#if ISO_14755
1848 // 5.4 1859 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1861 {
1851 iso14755_54 (ev.x, ev.y); 1862 iso14755_54 (ev.x, ev.y);
… …
1893 else 1904 else
1894 { 1905 {
1895 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1897 1908
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1909 switch (ev.button)
1900 { 1910 {
1901 case Button1: 1911 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1916#else
1907 selection.rect = false; 1917 selection.rect = false;
1908#endif 1918#endif
1909 1919
1910 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1922 {
1913 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1915 else 1925 else
1916 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1917 } 1927 }
1918 else 1928 else
1919 { 1929 {
1920 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1931 MEvent.clicks++;
1922 else 1932 else
1923 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1924 1934
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1936 }
1927 1937
1928 MEvent.button = Button1; 1938 MEvent.button = Button1;
1929 break; 1939 break;
1930 1940
1931 case Button3: 1941 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1934 else 1944 else
1935 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1936 1946
1937 MEvent.button = Button3; 1947 MEvent.button = Button3;
1938 break; 1948 break;
1939 } 1949 }
1940 } 1950 }
1941 1951
1942 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1943 return; 1953 return;
1944 } 1954 }
1945 1955
… …
2108 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2109#endif 2119#endif
2110 2120
2111 if (ev.window == vt) 2121 if (ev.window == vt)
2112 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2113#if ISO_14755 2126#if ISO_14755
2114 // 5.4 2127 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2129 return;
2117#endif 2130#endif
2131
2118 if (reportmode) 2132 if (reportmode)
2119 { 2133 {
2120 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2161 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2150 2164
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2165 switch (ev.button)
2155 { 2166 {
2156 case Button1: 2167 case Button1:
2157 case Button3: 2168 case Button3:
2158 selection_make (ev.time); 2169 selection_make (ev.time);
2159 break; 2170 break;
2171
2160 case Button2: 2172 case Button2:
2161 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);
2162 break; 2175 break;
2176
2163#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2164 case Button4: 2178 case Button4:
2165 case Button5: 2179 case Button5:
2166 { 2180 {
2167 int i; 2181 int i;
… …
2169 2183
2170 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2171 2185
2172 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2173 i = 1; 2187 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2189 i = nrow - 1;
2176 else 2190 else
2177 i = 5; 2191 i = 5;
2178 2192
2179# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2200 break; 2214 break;
2201#endif 2215#endif
2202 } 2216 }
2203 } 2217 }
2204} 2218}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2219
2687/*}}} */ 2220/*}}} */
2688 2221
2689bool 2222bool
2690rxvt_term::cmd_parse () 2223rxvt_term::cmd_parse ()
… …
2739 if (ch == C0_LF) 2272 if (ch == C0_LF)
2740 nlines++; 2273 nlines++;
2741 2274
2742 refresh_count++; 2275 refresh_count++;
2743 2276
2744 if (!OPTION (Opt_jumpScroll) 2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2278 {
2747 refreshnow = true;
2748 refresh_count = 0; 2279 refresh_count = 0;
2280
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2282 {
2283 refreshnow = true;
2749 ch = NOCHAR; 2284 ch = NOCHAR;
2750 break; 2285 break;
2286 }
2751 } 2287 }
2752 2288
2753 // scr_add_lines only works for nlines <= nrow - 1. 2289 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2290 if (nlines >= nrow - 1)
2755 { 2291 {
… …
2783 && 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2320 scr_add_lines (buf, str - buf, nlines);
2785 2321
2786 /* 2322 /*
2787 * 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
2788 * 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.
2789 * the number of pages between refreshes is refresh_limit, which 2325 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2326 */
2792 if (refreshnow) 2327 if (refreshnow)
2793 { 2328 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2329 flag = true;
2799 scr_refresh (); 2330 scr_refresh ();
2800 want_refresh = 1; 2331 want_refresh = 1;
2801 }
2802 } 2332 }
2803 2333
2804 } 2334 }
2805 else 2335 else
2806 { 2336 {
… …
2822 return flag; 2352 return flag;
2823} 2353}
2824 2354
2825// read the next character 2355// read the next character
2826wchar_t 2356wchar_t
2827rxvt_term::next_char () 2357rxvt_term::next_char () NOTHROW
2828{ 2358{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2360 {
2831 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2853 return NOCHAR; 2383 return NOCHAR;
2854} 2384}
2855 2385
2856// read the next octet 2386// read the next octet
2857uint32_t 2387uint32_t
2858rxvt_term::next_octet () 2388rxvt_term::next_octet () NOTHROW
2859{ 2389{
2860 return cmdbuf_ptr < cmdbuf_endp 2390 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2391 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2392 : NOCHAR;
2863} 2393}
2394
2395static class out_of_input out_of_input;
2864 2396
2865/* rxvt_cmd_getc () - Return next input character */ 2397/* rxvt_cmd_getc () - Return next input character */
2866/* 2398/*
2867 * Return the next input character after first passing any keyboard input 2399 * Return the next input character after first passing any keyboard input
2868 * to the command. 2400 * to the command.
2869 */ 2401 */
2870wchar_t 2402wchar_t
2871rxvt_term::cmd_getc () 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2872{ 2404{
2873 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2874 2406
2875 if (c == NOCHAR) 2407 if (c == NOCHAR)
2876 throw out_of_input; 2408 throw out_of_input;
2877 2409
2878 return c; 2410 return c;
2879} 2411}
2880 2412
2881uint32_t 2413uint32_t
2882rxvt_term::cmd_get8 () 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2415{
2884 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2885 2417
2886 if (c == NOCHAR) 2418 if (c == NOCHAR)
2887 throw out_of_input; 2419 throw out_of_input;
… …
2953 { 2485 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2486 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2487 break; /* done = 1 */
2956 } 2488 }
2957 } 2489 }
2958 2490
2959 for (i = 0; i < len; i++) 2491 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2492 if (putc (buf[i], fd) == EOF)
2961 { 2493 {
2962 done = 1; 2494 done = 1;
2963 break; 2495 break;
… …
3025 process_dcs_seq (); 2557 process_dcs_seq ();
3026 break; 2558 break;
3027 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
3028 process_csi_seq (); 2560 process_csi_seq ();
3029 break; 2561 break;
3030 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
3031 process_osc_seq (); 2563 process_osc_seq ();
3032 break; 2564 break;
3033#endif 2565#endif
3034 } 2566 }
3035} 2567}
… …
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2657 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2658 break;
3127 case '+': 2659 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2660 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2661 break;
3130#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3131 case '6': 2663 case '6':
3132 scr_backindex (); 2664 scr_backindex ();
3133 break; 2665 break;
3134#endif 2666#endif
3135 case '7': 2667 case '7':
3136 scr_cursor (SAVE); 2668 scr_cursor (SAVE);
3137 break; 2669 break;
3138 case '8': 2670 case '8':
3139 scr_cursor (RESTORE); 2671 scr_cursor (RESTORE);
3140 break; 2672 break;
3141#if ENABLE_FRILLS 2673#if !ENABLE_MINIMAL
3142 case '9': 2674 case '9':
3143 scr_forwardindex (); 2675 scr_forwardindex ();
3144 break; 2676 break;
3145#endif 2677#endif
3146 case '=': 2678 case '=':
… …
3263 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
3264 unsigned int nargs, p; 2796 unsigned int nargs, p;
3265 int n, ndef; 2797 int n, ndef;
3266 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
3267 2799
3268 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
3269 arg[--nargs] = 0; 2801 nargs = 0;
3270 2802
3271 priv = 0; 2803 priv = 0;
3272 ch = cmd_getc (); 2804 ch = cmd_getc ();
3273 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
3274 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
3308 ndef = get_byte_array_bit (csi_defaults, i); 2840 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2841 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2842 if (arg[p] == -1)
3311 arg[p] = ndef; 2843 arg[p] = ndef;
3312 2844
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2845 /*
3321 * private mode handling 2846 * private mode handling
3322 */ 2847 */
3323 if (priv) 2848 if (priv)
3324 { 2849 {
3325 switch (priv) 2850 switch (priv)
3326 { 2851 {
3327 case '>': 2852 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
3329 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 }
3330 break; 2864 break;
3331 case '?': 2865 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2868 break;
… …
3460 break; 2994 break;
3461 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3462 scr_report_position (); 2996 scr_report_position ();
3463 break; 2997 break;
3464 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 3001 break;
3468 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 3004 break;
… …
3537 break; 3071 break;
3538 case CSI_75: 3072 case CSI_75:
3539 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3540 break; 3074 break;
3541 3075
3542#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3543 case CSI_74: 3077 case CSI_74:
3544 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3545 break; 3079 break;
3546#endif 3080#endif
3547 3081
… …
3554 break; 3088 break;
3555 } 3089 }
3556} 3090}
3557/*}}} */ 3091/*}}} */
3558 3092
3559#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3560/* ARGSUSED */ 3094/* ARGSUSED */
3561void 3095void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3096rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3097{
3564 int x, y; 3098 int x, y;
3565 XWindowAttributes wattr; 3099 XWindowAttributes wattr;
3566 Window wdummy; 3100 Window wdummy;
3567 dDisp; 3101
3102 dLocal (Display *, dpy);
3568 3103
3569 if (nargs == 0) 3104 if (nargs == 0)
3570 return; 3105 return;
3571 3106
3572 switch (args[0]) 3107 switch (args[0])
3573 { 3108 {
3574 /* 3109 /*
3575 * commands 3110 * commands
3576 */ 3111 */
3577 case 1: /* deiconify window */ 3112 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3113 XMapWindow (dpy, parent[0]);
3579 break; 3114 break;
3580 case 2: /* iconify window */ 3115 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3116 XIconifyWindow (dpy, parent[0], display->screen);
3582 break; 3117 break;
3583 case 3: /* set position (pixels) */ 3118 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3119 XMoveWindow (dpy, parent[0], args[1], args[2]);
3585 break; 3120 break;
3586 case 4: /* set size (pixels) */ 3121 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3123 break;
3589 case 5: /* raise window */ 3124 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3125 XRaiseWindow (dpy, parent[0]);
3591 break; 3126 break;
3592 case 6: /* lower window */ 3127 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3128 XLowerWindow (dpy, parent[0]);
3594 break; 3129 break;
3595 case 7: /* refresh window */ 3130 case 7: /* refresh window */
3596 scr_touch (true); 3131 scr_touch (true);
3597 break; 3132 break;
3598 case 8: /* set size (chars) */ 3133 case 8: /* set size (chars) */
… …
3605 if (args[0] >= 24) /* set height (chars) */ 3140 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3141 set_widthheight ((unsigned int)width,
3607 (unsigned int) (args[1] * fheight)); 3142 (unsigned int) (args[1] * fheight));
3608 break; 3143 break;
3609 3144
3610
3611 /* 3145 /*
3612 * reports - some output format copied from XTerm 3146 * reports - some output format copied from XTerm
3613 */ 3147 */
3614 case 11: /* report window state */ 3148 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3151 break;
3618 case 13: /* report window position */ 3152 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3153 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3154 XTranslateCoordinates (dpy, parent[0], wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3155 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3156 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3157 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3158 break;
3625 case 14: /* report window size (pixels) */ 3159 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3162 break;
3629 case 18: /* report text area size (chars) */ 3163 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3165 break;
… …
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3167 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3168 break;
3635 case 20: /* report icon label */ 3169 case 20: /* report icon label */
3636 { 3170 {
3637 char *s; 3171 char *s;
3638 XGetIconName (disp, parent[0], &s); 3172 XGetIconName (dpy, parent[0], &s);
3639 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 */
3640 XFree (s); 3174 XFree (s);
3641 } 3175 }
3642 break; 3176 break;
3643 case 21: /* report window title */ 3177 case 21: /* report window title */
3644 { 3178 {
3645 char *s; 3179 char *s;
3646 XFetchName (disp, parent[0], &s); 3180 XFetchName (dpy, parent[0], &s);
3647 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 */
3648 XFree (s); 3182 XFree (s);
3649 } 3183 }
3650 break; 3184 break;
3651 } 3185 }
3652} 3186}
… …
3679 seen_esc = true; 3213 seen_esc = true;
3680 continue; 3214 continue;
3681 } 3215 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3216 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3217 break;
3218 else if (ch == C0_SYN)
3219 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3220 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3221 return NULL; /* other control character - exit */
3686 3222
3687 seen_esc = false; 3223 seen_esc = false;
3688 3224
3689 if (n >= STRING_MAX - 1) 3225 if (n >= STRING_MAX - 1)
3690 // stop at some sane length 3226 // stop at some sane length
3691 return NULL; 3227 return NULL;
3692 3228
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3229 string[n++] = ch;
3697 } 3230 }
3698 3231
3699 string[n++] = '\0'; 3232 string[n++] = '\0';
3700 3233
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3234 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3752void 3285void
3753rxvt_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)
3754{ 3287{
3755 if (str[0] == '?' && !str[1]) 3288 if (str[0] == '?' && !str[1])
3756 { 3289 {
3757 unsigned short r, g, b; 3290 rgba c;
3758 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
3759 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);
3760 } 3299 }
3761 else 3300 else
3762 set_window_color (color, str); 3301 set_window_color (color, str);
3763} 3302}
3764 3303
… …
3770{ 3309{
3771 int color; 3310 int color;
3772 char *buf, *name; 3311 char *buf, *name;
3773 bool query = str[0] == '?' && !str[1]; 3312 bool query = str[0] == '?' && !str[1];
3774 int saveop = op; 3313 int saveop = op;
3775 dDisp; 3314
3315 dLocal (Display *, dpy);
3776 3316
3777 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
3778 switch (op) 3322 switch (op)
3779 { 3323 {
3780 case XTerm_name: 3324 case XTerm_name:
3781 set_title (str); 3325 set_title (str);
3782 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
… …
3796 unsigned long bytes_after; 3340 unsigned long bytes_after;
3797 unsigned char *value = 0; 3341 unsigned char *value = 0;
3798 const char *str = ""; 3342 const char *str = "";
3799 3343
3800 if (prop 3344 if (prop
3801 && XGetWindowProperty (disp, parent[0], 3345 && XGetWindowProperty (dpy, parent[0],
3802 prop, 0, 1<<16, 0, AnyPropertyType, 3346 prop, 0, 1<<16, 0, AnyPropertyType,
3803 &actual_type, &actual_format, 3347 &actual_type, &actual_format,
3804 &nitems, &bytes_after, &value) == Success 3348 &nitems, &bytes_after, &value) == Success
3805 && actual_type != None 3349 && actual_type != None
3806 && actual_format == 8) 3350 && actual_format == 8)
3807 str = (const char *)(value); 3351 str = (const char *)(value);
3808 3352
3809 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3353 tt_printf ("\033]%d;%s%c", op, str, resp);
3810 3354
3811 XFree (value); 3355 XFree (value);
3812 } 3356 }
3813 else 3357 else
3814 { 3358 {
… …
3818 { 3362 {
3819 *eq = 0; 3363 *eq = 0;
3820 set_utf8_property (display->atom (str), eq + 1); 3364 set_utf8_property (display->atom (str), eq + 1);
3821 } 3365 }
3822 else 3366 else
3823 XDeleteProperty (disp, parent[0], 3367 XDeleteProperty (dpy, parent[0],
3824 display->atom (str)); 3368 display->atom (str));
3825 } 3369 }
3826 break; 3370 break;
3827 3371
3828 case XTerm_Color: 3372 case XTerm_Color:
… …
3838 break; 3382 break;
3839 3383
3840 if ((buf = strchr (name, ';')) != NULL) 3384 if ((buf = strchr (name, ';')) != NULL)
3841 *buf++ = '\0'; 3385 *buf++ = '\0';
3842 3386
3843 if (name[0] == '?' && !name[1]) 3387 process_color_seq (op, color, name, resp);
3844 {
3845 unsigned short r, g, b;
3846 pix_colors_focused[color].get (display, r, g, b);
3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3848 }
3849 else
3850 set_window_color (color, name);
3851 } 3388 }
3852 break; 3389 break;
3853 case XTerm_Color00: 3390 case XTerm_Color00:
3854 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3391 process_color_seq (op, Color_fg, str, resp);
3855 break; 3392 break;
3856 case XTerm_Color01: 3393 case XTerm_Color01:
3857 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3858 break; 3395 break;
3859#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3398 process_color_seq (op, Color_cursor, str, resp);
3862 break; 3399 break;
3863#endif 3400#endif
3864 case XTerm_Color_pointer_fg: 3401 case XTerm_Color_pointer_fg:
3865 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break; 3403 break;
3867 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3869 break; 3406 break;
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV: 3408 case XTerm_Color_RV:
3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3409 process_color_seq (op, Color_RV, str, resp);
3873 break; 3410 break;
3874 case Rxvt_Color_BD: 3411 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3412 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3413 process_color_seq (op, Color_BD, str, resp);
3877 break; 3414 break;
3878 case Rxvt_Color_UL: 3415 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3881 break; 3418 break;
3882 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3884 break; 3421 break;
3885#endif 3422#endif
3886#if TRANSPARENT && TINTING 3423#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3888 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3889 check_our_parents (); 3426 {
3890 if (am_transparent) 3427 bool changed = false;
3891 want_full_refresh = want_refresh = 1; 3428 if (ISSET_PIXCOLOR (Color_tint))
3892 break; 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3893#endif 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3894 3435
3436 break;
3437#endif
3438
3439#if XPM_BACKGROUND
3895 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?"))
3896 { 3442 {
3443 char str[256];
3444
3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 }
3450 else
3451 {
3452 int changed = 0;
3453
3897 if (*str != ';') 3454 if (*str != ';')
3898 { 3455 {
3899#if XPM_BACKGROUND
3900 scale_pixmap (""); /* reset to default scaling */ 3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3901 set_bgPixmap (str); /* change pixmap */ 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 {
3466 str++;
3467 if (bgPixmap.set_geometry (str))
3468 changed++;
3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3902 scr_touch (true); 3474 scr_touch (true);
3903#endif
3904 } 3475 }
3905
3906 int changed = 0;
3907
3908 while ((str = strchr (str, ';')) != NULL)
3909 {
3910 str++;
3911#if XPM_BACKGROUND
3912 changed += scale_pixmap (str);
3913#endif
3914 } 3476 }
3915
3916 if (changed)
3917 {
3918#ifdef XPM_BACKGROUND
3919 resize_pixmap ();
3920 scr_touch (true);
3921#endif
3922 }
3923 }
3924 break; 3477 break;
3478#endif
3925 3479
3926 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3927 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3928 break; 3482 break;
3929 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3954 case URxvt_italicFont: 3508 case URxvt_italicFont:
3955 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3956#endif 3510#endif
3957 if (query) 3511 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3959 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3960 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3961 resp); 3515 resp);
3962 else 3516 else
3963 { 3517 {
3964 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3967 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
3968 set_fonts (); 3522 set_fonts ();
3969 } 3523 }
3970 break; 3524 break;
3971 3525
3972#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
3973 case URxvt_locale: 3535 case URxvt_locale:
3974 if (query) 3536 if (query)
3975 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);
3976 else 3538 else
3977 { 3539 {
3978 set_locale (str); 3540 set_locale (str);
3979 pty->set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
3980 init_xlocale (); 3542 init_xlocale ();
… …
3995 break; 3557 break;
3996#endif 3558#endif
3997 3559
3998#if ENABLE_PERL 3560#if ENABLE_PERL
3999 case URxvt_perl: 3561 case URxvt_perl:
4000 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)))
4001 ; // no responses yet 3563 ; // no responses yet
4002 break; 3564 break;
4003#endif 3565#endif
4004 } 3566 }
4005} 3567}
… …
4037 return state; 3599 return state;
4038} 3600}
4039 3601
4040/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4041void 3603void
4042rxvt_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)
4043{ 3605{
4044 unsigned int i, j; 3606 unsigned int i, j;
4045 int state; 3607 int state;
4046 3608
4047 static const struct 3609 static const struct
4048 { 3610 {
4049 const int argval; 3611 const int argval;
4050 const unsigned long bit; 3612 const unsigned long bit;
4051 }
4052
4053 argtopriv[] = { 3613 } argtopriv[] = {
4054 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
4055 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
4056 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
4057 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
4058 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },
… …
4121 scr_touch (true); 3681 scr_touch (true);
4122 break; 3682 break;
4123#endif 3683#endif
4124 case 1048: /* alternative cursor save */ 3684 case 1048: /* alternative cursor save */
4125 case 1049: 3685 case 1049:
4126 if (OPTION (Opt_secondaryScreen)) 3686 if (option (Opt_secondaryScreen))
4127 if (mode == 0) 3687 if (mode == 0)
4128 scr_cursor (RESTORE); 3688 scr_cursor (RESTORE);
4129 else if (mode == 1) 3689 else if (mode == 1)
4130 scr_cursor (SAVE); 3690 scr_cursor (SAVE);
4131 break; 3691 break;
… …
4196 break; 3756 break;
4197 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4198 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
4199 break; 3759 break;
4200 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4201 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3762 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3763 scr_erase_screen (2);
4204 scr_change_screen (state); 3764 scr_change_screen (state);
4205 break; 3765 break;
4206 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
4207 scr_change_screen (state); 3767 scr_change_screen (state);
4208 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4209 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4210 scr_erase_screen (2); 3770 scr_erase_screen (2);
4211 break; 3771 break;
4212 default: 3772 default:
4213 break; 3773 break;
… …
4341 scr_color (Color_bg, Color_bg); 3901 scr_color (Color_bg, Color_bg);
4342 break; 3902 break;
4343 3903
4344 //case 50: // not variable spacing 3904 //case 50: // not variable spacing
4345 3905
4346#if ENABLE_FRILLS 3906#if !ENABLE_MINIMAL
4347 case 90: 3907 case 90:
4348 case 91: /* set bright fg color */ 3908 case 91: /* set bright fg color */
4349 case 92: 3909 case 92:
4350 case 93: 3910 case 93:
4351 case 94: 3911 case 94:

Diff Legend

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