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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.331 by root, Mon Jun 18 13:38:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
492# endif 502# endif
493 return; 503 return;
494 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
499# if ISO_14755 517# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 538# endif
521 } 539 }
522#endif 540#endif
523 541
524#ifdef PRINTPIPE 542#ifdef PRINTPIPE
525 if (keysym == XK_Print) 543 if (keysym == XK_Print)
526 { 544 {
527 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
528 return; 546 return;
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
1016void 1110void
1017rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1018{ 1112{
1019 make_current (); 1113 make_current ();
1020 1114
1021 refresh_limit = 1;
1022 refresh_count = 0; 1115 refresh_count = 0;
1023 flush (); 1116 flush ();
1024} 1117}
1025 1118
1026#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1182 }
1090} 1183}
1091#endif 1184#endif
1092 1185
1093#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1094static struct event_handler 1187static struct event_handler
1095{ 1188{
1096 check_watcher cw_yield; 1189 check_watcher yield_ev;
1097 1190
1098 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1099 { 1192 {
1100 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1101 w.stop (); 1201 w.stop ();
1102 } 1202 }
1103 1203
1104 event_handler () 1204 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1106 { 1206 {
1107 } 1207 }
1108} event_handler; 1208} event_handler;
1109#endif 1209#endif
1110 1210
1130 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1131 return true; 1231 return true;
1132 } 1232 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1234 {
1135#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1136 if (display->is_local) 1236 if (display->is_local)
1137 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1138#endif 1238#endif
1139 } 1239 }
1140 else 1240 else
1141 { 1241 {
1142 pty_ev.stop (); 1242 pty_ev.stop ();
1143 1243
1144 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1145 destroy (); 1245 destroy ();
1146 } 1246 }
1147 1247
1148 return false; 1248 return false;
1149} 1249}
1150 1250
1151void 1251void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1164} 1264}
1165 1265
1166void 1266void
1167rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1168{ 1268{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1270 recolour_cursor ();
1171 1271
1172#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1273 hidden_pointer = 0;
1174 1274
1175 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1277#endif
1178} 1278}
1179 1279
1180#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1181void 1281void
1182rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1183{ 1283{
1184 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1185 return; 1285 return;
1186 1286
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1288 XFlush (dpy);
1189 1289
1190 hidden_pointer = 1; 1290 hidden_pointer = 1;
1191} 1291}
1192 1292
1193void 1293void
1266 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1267 (32 + x + 1), 1367 (32 + x + 1),
1268 (32 + y + 1)); 1368 (32 + y + 1));
1269} 1369}
1270 1370
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1371/*{{{ process an X event */
1282void 1372void
1283rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1284{ 1374{
1285 make_current (); 1375 make_current ();
1286 1376
1287 dDisp; 1377 dLocal (Display *, dpy);
1288 1378
1289 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1382 return;
1297 unsigned int unused_mask; 1387 unsigned int unused_mask;
1298 1388
1299 switch (ev.type) 1389 switch (ev.type)
1300 { 1390 {
1301 case KeyPress: 1391 case KeyPress:
1302#if ISO_14755 1392 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1393 break;
1308 1394
1309 case KeyRelease: 1395 case KeyRelease:
1310 { 1396 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1397 break;
1382 }
1383 1398
1384 case ButtonPress: 1399 case ButtonPress:
1385 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1386 break; 1401 break;
1387 1402
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1418 destroy ();
1404 } 1419 }
1405#if ENABLE_EWMH 1420#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1424 &ev);
1410#endif 1425#endif
1411 } 1426 }
1412 } 1427 }
1450 break; 1465 break;
1451 } 1466 }
1452 break; 1467 break;
1453 1468
1454 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1473 focus_in ();
1456 break; 1474 break;
1457 1475
1458 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1480 focus_out ();
1460 break; 1481 break;
1461 1482
1462 case ConfigureNotify: 1483 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1464 { 1485 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1487 ;
1467 1488
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1490 {
1470 seen_resize = 1; 1491 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1472 } 1500 }
1473 1501
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 1503
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1504#ifdef TRANSPARENT
1477 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1478 check_our_parents (); 1506 check_our_parents ();
1479#endif 1507#endif
1480 } 1508 }
1481 break; 1509 break;
1482 1510
1528 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1529 { 1557 {
1530 do 1558 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1562
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1564
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1540 1568
1541 want_refresh = 1; 1569 want_refresh = 1;
1542 } 1570 }
1543 else 1571 else
1544 { 1572 {
1545 XEvent unused_event; 1573 XEvent unused_event;
1546 1574
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1576 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1578 ;
1551 1579
1552 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1553 { 1581 {
1554 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1555 scrollbar_show (0); 1583 scrollbar_show (0);
1556 } 1584 }
1557 1585
1558#ifdef TRANSPARENT 1586#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1561#endif 1589#endif
1562 } 1590 }
1563 break; 1591 break;
1564 1592
1565 case MotionNotify: 1593 case MotionNotify:
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1605 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1607 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1609 ;
1582 1610
1583 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1615 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
1652#endif 1680#endif
1653 } 1681 }
1654 } 1682 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1684 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1659 ; 1687 ;
1660 1688
1661 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1693 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1695 scrollbar_size ());
1668 want_refresh = 1; 1696 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1697 scrollbar_show (1);
1671 } 1698 }
1672 break; 1699 break;
1673 } 1700 }
1674 1701
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1704 {
1680 if (hidden_cursor) 1705 if (hidden_cursor)
1681 { 1706 {
1682 hidden_cursor = 0; 1707 hidden_cursor = 0;
1683 want_refresh = 1; 1708 want_refresh = 1;
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 } 1712 }
1688#endif 1713#endif
1689 1714
1690#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1717 {
1693 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1721 if (hidden_pointer)
1708 if (!focus) 1733 if (!focus)
1709 { 1734 {
1710 focus = 1; 1735 focus = 1;
1711 want_refresh = 1; 1736 want_refresh = 1;
1712 1737
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1739
1715#if USE_XIM 1740#if USE_XIM
1716 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1717 { 1742 {
1718 IMSetStatusPosition (); 1743 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1720 } 1745 }
1721#endif 1746#endif
1722#if CURSOR_BLINK 1747#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725#endif 1750#endif
1726#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1728 { 1753 {
1729 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1731 } 1769 }
1732#endif 1770#endif
1733 } 1771 }
1734} 1772}
1735 1773
1755#if USE_XIM 1793#if USE_XIM
1756 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1758#endif 1796#endif
1759#if CURSOR_BLINK 1797#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1762 hidden_cursor = 0; 1800 hidden_cursor = 0;
1763#endif 1801#endif
1764#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
1769 } 1807 }
1770#endif 1808#endif
1771 } 1809 }
1772} 1810}
1773 1811
1774#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if TRANSPARENT || ENABLE_PERL
1775void 1826void
1776rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1828{
1778 make_current (); 1829 make_current ();
1779 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if TRANSPARENT
1780 switch (ev.type) 1836 switch (ev.type)
1781 { 1837 {
1782 case PropertyNotify: 1838 case PropertyNotify:
1783 /* 1839 /*
1784 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1789 return; 1845 return;
1790 1846
1791 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1792 case ReparentNotify: 1848 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1794 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1795 break; 1851 break;
1796 } 1852 }
1853# endif
1797} 1854}
1798#endif 1855#endif
1799 1856
1800void 1857void
1801rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
2129 selection_make (ev.time); 2186 selection_make (ev.time);
2130 break; 2187 break;
2131 2188
2132 case Button2: 2189 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2192 break;
2136 2193
2137#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2138 case Button4: 2195 case Button4:
2139 case Button5: 2196 case Button5:
2143 2200
2144 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2145 2202
2146 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2147 i = 1; 2204 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2206 i = nrow - 1;
2150 else 2207 else
2151 i = 5; 2208 i = 5;
2152 2209
2153# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2174 break; 2231 break;
2175#endif 2232#endif
2176 } 2233 }
2177 } 2234 }
2178} 2235}
2179
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655 2236
2656/*}}} */ 2237/*}}} */
2657 2238
2658bool 2239bool
2659rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2708 if (ch == C0_LF) 2289 if (ch == C0_LF)
2709 nlines++; 2290 nlines++;
2710 2291
2711 refresh_count++; 2292 refresh_count++;
2712 2293
2713 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2295 {
2716 refreshnow = true;
2717 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2718 ch = NOCHAR; 2301 ch = NOCHAR;
2719 break; 2302 break;
2303 }
2720 } 2304 }
2721 2305
2722 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2724 { 2308 {
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2754 2338
2755 /* 2339 /*
2756 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2343 */
2761 if (refreshnow) 2344 if (refreshnow)
2762 { 2345 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true; 2346 flag = true;
2768 scr_refresh (); 2347 scr_refresh ();
2769 want_refresh = 1; 2348 want_refresh = 1;
2770 }
2771 } 2349 }
2772 2350
2773 } 2351 }
2774 else 2352 else
2775 { 2353 {
2924 { 2502 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2504 break; /* done = 1 */
2927 } 2505 }
2928 } 2506 }
2929 2507
2930 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2932 { 2510 {
2933 done = 1; 2511 done = 1;
2934 break; 2512 break;
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2675 break;
3098 case '+': 2676 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2678 break;
3101#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3102 case '6': 2680 case '6':
3103 scr_backindex (); 2681 scr_backindex ();
3104 break; 2682 break;
3105#endif 2683#endif
3106 case '7': 2684 case '7':
3107 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3108 break; 2686 break;
3109 case '8': 2687 case '8':
3110 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3111 break; 2689 break;
3112#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3113 case '9': 2691 case '9':
3114 scr_forwardindex (); 2692 scr_forwardindex ();
3115 break; 2693 break;
3116#endif 2694#endif
3117 case '=': 2695 case '=':
3290 { 2868 {
3291 case '>': 2869 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2871 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2874 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2877 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 // 2878 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2879 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 2880 }
3303 break; 2881 break;
3304 case '?': 2882 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3433 break; 3011 break;
3434 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3435 scr_report_position (); 3013 scr_report_position ();
3436 break; 3014 break;
3437 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 3018 break;
3441 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 3021 break;
3510 break; 3088 break;
3511 case CSI_75: 3089 case CSI_75:
3512 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3513 break; 3091 break;
3514 3092
3515#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3516 case CSI_74: 3094 case CSI_74:
3517 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3518 break; 3096 break;
3519#endif 3097#endif
3520 3098
3527 break; 3105 break;
3528 } 3106 }
3529} 3107}
3530/*}}} */ 3108/*}}} */
3531 3109
3532#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3111/* ARGSUSED */
3534void 3112void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3114{
3537 int x, y; 3115 int x, y;
3538 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3539 Window wdummy; 3117 Window wdummy;
3540 dDisp; 3118
3119 dLocal (Display *, dpy);
3541 3120
3542 if (nargs == 0) 3121 if (nargs == 0)
3543 return; 3122 return;
3544 3123
3545 switch (args[0]) 3124 switch (args[0])
3546 { 3125 {
3547 /* 3126 /*
3548 * commands 3127 * commands
3549 */ 3128 */
3550 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3552 break; 3131 break;
3553 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3134 break;
3556 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3137 break;
3559 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3140 break;
3562 case 5: /* raise window */ 3141 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3564 break; 3143 break;
3565 case 6: /* lower window */ 3144 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3567 break; 3146 break;
3568 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3569 scr_touch (true); 3148 scr_touch (true);
3570 break; 3149 break;
3571 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3578 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3581 break; 3160 break;
3582 3161
3583
3584 /* 3162 /*
3585 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3586 */ 3164 */
3587 case 11: /* report window state */ 3165 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3168 break;
3591 case 13: /* report window position */ 3169 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3175 break;
3598 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3179 break;
3602 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3182 break;
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3185 break;
3608 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3609 { 3187 {
3610 char *s; 3188 char *s;
3611 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3191 XFree (s);
3614 } 3192 }
3615 break; 3193 break;
3616 case 21: /* report window title */ 3194 case 21: /* report window title */
3617 { 3195 {
3618 char *s; 3196 char *s;
3619 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3199 XFree (s);
3622 } 3200 }
3623 break; 3201 break;
3624 } 3202 }
3625} 3203}
3652 seen_esc = true; 3230 seen_esc = true;
3653 continue; 3231 continue;
3654 } 3232 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3237 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3659 3239
3660 seen_esc = false; 3240 seen_esc = false;
3661 3241
3662 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3243 // stop at some sane length
3664 return NULL; 3244 return NULL;
3665 3245
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3246 string[n++] = ch;
3670 } 3247 }
3671 3248
3672 string[n++] = '\0'; 3249 string[n++] = '\0';
3673 3250
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3725void 3302void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3304{
3728 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3729 { 3306 {
3730 unsigned short r, g, b; 3307 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3316 }
3734 else 3317 else
3735 set_window_color (color, str); 3318 set_window_color (color, str);
3736} 3319}
3737 3320
3743{ 3326{
3744 int color; 3327 int color;
3745 char *buf, *name; 3328 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3330 int saveop = op;
3748 dDisp; 3331
3332 dLocal (Display *, dpy);
3749 3333
3750 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3751 switch (op) 3339 switch (op)
3752 { 3340 {
3753 case XTerm_name: 3341 case XTerm_name:
3754 set_title (str); 3342 set_title (str);
3755 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
3769 unsigned long bytes_after; 3357 unsigned long bytes_after;
3770 unsigned char *value = 0; 3358 unsigned char *value = 0;
3771 const char *str = ""; 3359 const char *str = "";
3772 3360
3773 if (prop 3361 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3366 && actual_type != None
3779 && actual_format == 8) 3367 && actual_format == 8)
3780 str = (const char *)(value); 3368 str = (const char *)(value);
3781 3369
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3371
3784 XFree (value); 3372 XFree (value);
3785 } 3373 }
3786 else 3374 else
3787 { 3375 {
3791 { 3379 {
3792 *eq = 0; 3380 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3794 } 3382 }
3795 else 3383 else
3796 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3385 display->atom (str));
3798 } 3386 }
3799 break; 3387 break;
3800 3388
3801 case XTerm_Color: 3389 case XTerm_Color:
3811 break; 3399 break;
3812 3400
3813 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3402 *buf++ = '\0';
3815 3403
3816 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3405 }
3825 break; 3406 break;
3826 case XTerm_Color00: 3407 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3828 break; 3409 break;
3829 case XTerm_Color01: 3410 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3831 break; 3412 break;
3832#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3416 break;
3836#endif 3417#endif
3837 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3420 break;
3840 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3423 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3846 break; 3427 break;
3847 case Rxvt_Color_BD: 3428 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3850 break; 3431 break;
3851 case Rxvt_Color_UL: 3432 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3433 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3434 process_color_seq (op, Color_UL, str, resp);
3854 break; 3435 break;
3855 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3857 break; 3438 break;
3858#endif 3439#endif
3859#if TRANSPARENT && TINTING 3440#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3862 check_our_parents (); 3444 check_our_parents ();
3445
3863 if (am_transparent) 3446 if (am_transparent)
3864 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3865 break; 3449 break;
3866#endif 3450#endif
3867 3451
3868 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3869 { 3453 {
3891#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3892 resize_pixmap (); 3476 resize_pixmap ();
3893 scr_touch (true); 3477 scr_touch (true);
3894#endif 3478#endif
3895 } 3479 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3896 } 3484 }
3897 break; 3485 break;
3898 3486
3899 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3927 case URxvt_italicFont: 3515 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3929#endif 3517#endif
3930 if (query) 3518 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3522 resp);
3935 else 3523 else
3936 { 3524 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3940 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3941 set_fonts (); 3529 set_fonts ();
3942 } 3530 }
3943 break; 3531 break;
3944 3532
3945#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3542 case URxvt_locale:
3947 if (query) 3543 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3545 else
3950 { 3546 {
3951 set_locale (str); 3547 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3549 init_xlocale ();
3968 break; 3564 break;
3969#endif 3565#endif
3970 3566
3971#if ENABLE_PERL 3567#if ENABLE_PERL
3972 case URxvt_perl: 3568 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 3570 ; // no responses yet
3975 break; 3571 break;
3976#endif 3572#endif
3977 } 3573 }
3978} 3574}
4094 scr_touch (true); 3690 scr_touch (true);
4095 break; 3691 break;
4096#endif 3692#endif
4097 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4098 case 1049: 3694 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3696 if (mode == 0)
4101 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4102 else if (mode == 1) 3698 else if (mode == 1)
4103 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4104 break; 3700 break;
4169 break; 3765 break;
4170 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3768 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 3772 scr_erase_screen (2);
4177 scr_change_screen (state); 3773 scr_change_screen (state);
4178 break; 3774 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 3776 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 3779 scr_erase_screen (2);
4184 break; 3780 break;
4185 default: 3781 default:
4186 break; 3782 break;
4314 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4315 break; 3911 break;
4316 3912
4317 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4318 3914
4319#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4320 case 90: 3916 case 90:
4321 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4322 case 92: 3918 case 92:
4323 case 93: 3919 case 93:
4324 case 94: 3920 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines