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.302 by root, Tue Jan 31 21:35:39 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 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>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * 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
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
489 { 497 {
490 commit_iso14755 (); 498 commit_iso14755 ();
491 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
492# if ISO_14755 500# if ISO_14755
493 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
494# endif 510# endif
495 return; 511 return;
496 } 512 }
497 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
498 { 514 {
… …
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 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 (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}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
… …
1097{ 1189{
1098 check_watcher yield_ev; 1190 check_watcher yield_ev;
1099 1191
1100 void yield_cb (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1101 { 1193 {
1102 usleep (0); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1103 w.stop (); 1202 w.stop ();
1104 } 1203 }
1105 1204
1106 event_handler () 1205 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb) 1206 : yield_ev (this, &event_handler::yield_cb)
… …
1141 } 1240 }
1142 else 1241 else
1143 { 1242 {
1144 pty_ev.stop (); 1243 pty_ev.stop ();
1145 1244
1146 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1147 destroy (); 1246 destroy ();
1148 } 1247 }
1149 1248
1150 return false; 1249 return false;
1151} 1250}
… …
1166} 1265}
1167 1266
1168void 1267void
1169rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1170{ 1269{
1171 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1172 recolour_cursor (); 1271 recolour_cursor ();
1173 1272
1174#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1175 hidden_pointer = 0; 1274 hidden_pointer = 0;
1176 1275
1177 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1178 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1179#endif 1278#endif
1180} 1279}
1181 1280
1182#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1183void 1282void
1184rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1185{ 1284{
1186 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1187 return; 1286 return;
1188 1287
1189 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1190 XFlush (xdisp); 1289 XFlush (dpy);
1191 1290
1192 hidden_pointer = 1; 1291 hidden_pointer = 1;
1193} 1292}
1194 1293
1195void 1294void
… …
1274void 1373void
1275rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1276{ 1375{
1277 make_current (); 1376 make_current ();
1278 1377
1279 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1280 1379
1281 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1282 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1284 return; 1383 return;
… …
1289 unsigned int unused_mask; 1388 unsigned int unused_mask;
1290 1389
1291 switch (ev.type) 1390 switch (ev.type)
1292 { 1391 {
1293 case KeyPress: 1392 case KeyPress:
1294#if ISO_14755 1393 key_press (ev.xkey);
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1297 lookup_key (ev.xkey);
1298
1299 break; 1394 break;
1300 1395
1301 case KeyRelease: 1396 case KeyRelease:
1302 { 1397 key_release (ev.xkey);
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1368 if (!(ev.xkey.state & ControlMask))
1369 slip_wheel_ev.stop ();
1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1371 mouse_slip_wheel_speed = 0;
1372#endif
1373 break; 1398 break;
1374 }
1375 1399
1376 case ButtonPress: 1400 case ButtonPress:
1377 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1378 break; 1402 break;
1379 1403
… …
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1395 destroy (); 1419 destroy ();
1396 } 1420 }
1397#if ENABLE_EWMH 1421#if ENABLE_EWMH
1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1399 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1401 &ev); 1425 &ev);
1402#endif 1426#endif
1403 } 1427 }
1404 } 1428 }
… …
1442 break; 1466 break;
1443 } 1467 }
1444 break; 1468 break;
1445 1469
1446 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1447 focus_in (); 1474 focus_in ();
1448 break; 1475 break;
1449 1476
1450 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1451 focus_out (); 1481 focus_out ();
1452 break; 1482 break;
1453 1483
1454 case ConfigureNotify: 1484 case ConfigureNotify:
1455 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1456 { 1486 {
1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1458 ; 1488 ;
1459 1489
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1491 {
1462 seen_resize = 1; 1492 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1494 }
1465 1495
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 1497
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1469 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1470 check_our_parents (); 1500 check_our_parents ();
1471#endif 1501#endif
1472 } 1502 }
1473 break; 1503 break;
1474 1504
… …
1520 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1521 { 1551 {
1522 do 1552 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1556
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1558
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1532 1562
1533 want_refresh = 1; 1563 want_refresh = 1;
1534 } 1564 }
1535 else 1565 else
1536 { 1566 {
1537 XEvent unused_event; 1567 XEvent unused_event;
1538 1568
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1570 ;
1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1572 ;
1543 1573
1544 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1545 { 1575 {
1546 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1547 scrollbar_show (0); 1577 scrollbar_show (0);
1548 } 1578 }
1549 1579
1550#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1551 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1553#endif 1583#endif
1554 } 1584 }
1555 break; 1585 break;
1556 1586
1557 case MotionNotify: 1587 case MotionNotify:
… …
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop 1599 ; // nop
1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1601 {
1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1603 ;
1574 1604
1575 XQueryPointer (xdisp, vt, 1605 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1609 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1644#endif 1674#endif
1645 } 1675 }
1646 } 1676 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1678 {
1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1651 ; 1681 ;
1652 1682
1653 XQueryPointer (xdisp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1687 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1662 scrollbar_show (1); 1692 scrollbar_show (1);
1663 } 1693 }
1664 break; 1694 break;
1665 } 1695 }
1666 1696
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1671 { 1699 {
1672 if (hidden_cursor) 1700 if (hidden_cursor)
1673 { 1701 {
1674 hidden_cursor = 0; 1702 hidden_cursor = 0;
1675 want_refresh = 1; 1703 want_refresh = 1;
… …
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 } 1707 }
1680#endif 1708#endif
1681 1709
1682#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1712 {
1685 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1688 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1700 if (!focus) 1728 if (!focus)
1701 { 1729 {
1702 focus = 1; 1730 focus = 1;
1703 want_refresh = 1; 1731 want_refresh = 1;
1704 1732
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1706 1734
1707#if USE_XIM 1735#if USE_XIM
1708 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1709 { 1737 {
1710 IMSetStatusPosition (); 1738 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1712 } 1740 }
1713#endif 1741#endif
1714#if CURSOR_BLINK 1742#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif 1745#endif
1718#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1720 { 1748 {
1721 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1723 } 1764 }
1724#endif 1765#endif
1725 } 1766 }
1726} 1767}
1727 1768
… …
1747#if USE_XIM 1788#if USE_XIM
1748 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1750#endif 1791#endif
1751#if CURSOR_BLINK 1792#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1754 hidden_cursor = 0; 1795 hidden_cursor = 0;
1755#endif 1796#endif
1756#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1761 } 1802 }
1762#endif 1803#endif
1763 } 1804 }
1764} 1805}
1765 1806
1766#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1767void 1821void
1768rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1823{
1770 make_current (); 1824 make_current ();
1771 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1772 switch (ev.type) 1831 switch (ev.type)
1773 { 1832 {
1774 case PropertyNotify: 1833 case PropertyNotify:
1775 /* 1834 /*
1776 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1781 return; 1840 return;
1782 1841
1783 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1784 case ReparentNotify: 1843 case ReparentNotify:
1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1786 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1787 break; 1846 break;
1788 } 1847 }
1848# endif
1789} 1849}
1790#endif 1850#endif
1791 1851
1792void 1852void
1793rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
2121 selection_make (ev.time); 2181 selection_make (ev.time);
2122 break; 2182 break;
2123 2183
2124 case Button2: 2184 case Button2:
2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2187 break;
2128 2188
2129#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2130 case Button4: 2190 case Button4:
2131 case Button5: 2191 case Button5:
… …
2135 2195
2136 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2137 2197
2138 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2139 i = 1; 2199 i = 1;
2140 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2141 i = nrow - 1; 2201 i = nrow - 1;
2142 else 2202 else
2143 i = 5; 2203 i = 5;
2144 2204
2145# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2416 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2417 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2418 2478
2419 pchanged = 0; 2479 pchanged = 0;
2420 2480
2421 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2422 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2423 2483
2424 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2425 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2426 2486
2427 XGetWindowAttributes (xdisp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2428 2488
2429 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2430 { 2490 {
2431 if (am_transparent) 2491 if (am_transparent)
2432 { 2492 {
2433 pchanged = 1; 2493 pchanged = 1;
2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2435 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2436 } 2496 }
2437 2497
2438 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2439 } 2499 }
2440 2500
2441 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2442 XSync (xdisp, False); 2502 XSync (dpy, False);
2443 2503
2444 /* 2504 /*
2445 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2446 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2447 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2448 */ 2508 */
2449 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2452 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2453 2513
2454 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2459 2519
2460 if (!i || prop == NULL 2520 if (!i || prop == NULL
2461#if TINTING 2521#if TINTING
… …
2480 Window cr; 2540 Window cr;
2481 XImage *image; 2541 XImage *image;
2482 GC gc; 2542 GC gc;
2483 XGCValues gcvalue; 2543 XGCValues gcvalue;
2484 2544
2485 XTranslateCoordinates (xdisp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2486 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2487 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2488 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2489 nx = ny = 0; 2549 nx = ny = 0;
2490 2550
… …
2503 } 2563 }
2504 2564
2505 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2506 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507 2567
2508 XSync (xdisp, False); 2568 XSync (dpy, False);
2509 allowedxerror = -1; 2569 allowedxerror = -1;
2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2511 2571
2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2513 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2514 allowedxerror = 0; 2574 allowedxerror = 0;
2515 2575
… …
2518 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2519 { 2579 {
2520 pchanged = 1; 2580 pchanged = 1;
2521 if (pixmap != None) 2581 if (pixmap != None)
2522 { 2582 {
2523 XFreePixmap (xdisp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2524 pixmap = None; 2584 pixmap = None;
2525 } 2585 }
2526 } 2586 }
2527 2587
2528 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2529 } 2589 }
2530 else 2590 else
2531 { 2591 {
2532 if (pixmap != None) 2592 if (pixmap != None)
2533 XFreePixmap (xdisp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2534 2594
2535#if TINTING 2595#if TINTING
2536 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2537 { 2597 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2542 2602
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 } 2604 }
2545#endif 2605#endif
2546 2606
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2549 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2551 XFreeGC (xdisp, gc); 2611 XFreeGC (dpy, gc);
2552 XDestroyImage (image); 2612 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2554 XClearWindow (xdisp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2555 2615
2556 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1; 2617 pchanged = 1;
2558 2618
2559 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2560 } 2620 }
2561 } 2621 }
2562 2622
2563 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2565 else 2625 else
2566 { 2626 {
2567 unsigned int n; 2627 unsigned int n;
2568 /* 2628 /*
2569 * InheritPixmap transparency 2629 * InheritPixmap transparency
2570 */ 2630 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 { 2632 {
2573 oldp = parent[i]; 2633 oldp = parent[i];
2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2575 XFree (list); 2635 XFree (list);
2576 2636
2577 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2578 { 2638 {
2579 if (oldp != None) 2639 if (oldp != None)
… …
2589 n = 0; 2649 n = 0;
2590 2650
2591 if (pchanged) 2651 if (pchanged)
2592 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2593 { 2653 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2595 2655
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 { 2657 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break; 2659 break;
2600 } 2660 }
2601 } 2661 }
2602 2662
2603 if (n > (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2664 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2667 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2609 } 2669 }
2610 else 2670 else
2611 { 2671 {
2612 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2613 { 2673 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2616 } 2676 }
2617 2677
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2679 am_transparent = 1;
2620 } 2680 }
2621 2681
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2683 parent[i] = None;
2624 } 2684 }
2625 2685
2626 if (scrollBar.win) 2686 if (scrollBar.win)
2627 { 2687 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2630 scrollbar_show (0); 2690 scrollbar_show (0);
2631 } 2691 }
2632 2692
2633 if (am_transparent) 2693 if (am_transparent)
… …
2696 if (ch == C0_LF) 2756 if (ch == C0_LF)
2697 nlines++; 2757 nlines++;
2698 2758
2699 refresh_count++; 2759 refresh_count++;
2700 2760
2701 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2763 {
2704 refreshnow = true; 2764 refreshnow = true;
2705 refresh_count = 0; 2765 refresh_count = 0;
2706 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2746 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2808 */
2749 if (refreshnow) 2809 if (refreshnow)
2750 { 2810 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2812 refresh_limit++;
2753 else 2813 else
2754 { 2814 {
2755 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2817 scr_refresh ();
2757 want_refresh = 1; 2818 want_refresh = 1;
2758 } 2819 }
2759 } 2820 }
2760 2821
… …
3421 break; 3482 break;
3422 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3423 scr_report_position (); 3484 scr_report_position ();
3424 break; 3485 break;
3425 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3489 break;
3429 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3492 break;
… …
3524{ 3585{
3525 int x, y; 3586 int x, y;
3526 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3527 Window wdummy; 3588 Window wdummy;
3528 3589
3529 dLocal (Display *, xdisp); 3590 dLocal (Display *, dpy);
3530 3591
3531 if (nargs == 0) 3592 if (nargs == 0)
3532 return; 3593 return;
3533 3594
3534 switch (args[0]) 3595 switch (args[0])
3535 { 3596 {
3536 /* 3597 /*
3537 * commands 3598 * commands
3538 */ 3599 */
3539 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3541 break; 3602 break;
3542 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3605 break;
3545 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3608 break;
3548 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3611 break;
3551 case 5: /* raise window */ 3612 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3553 break; 3614 break;
3554 case 6: /* lower window */ 3615 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3556 break; 3617 break;
3557 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3558 scr_touch (true); 3619 scr_touch (true);
3559 break; 3620 break;
3560 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3571 3632
3572 /* 3633 /*
3573 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3574 */ 3635 */
3575 case 11: /* report window state */ 3636 case 11: /* report window state */
3576 XGetWindowAttributes (xdisp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3578 break; 3639 break;
3579 case 13: /* report window position */ 3640 case 13: /* report window position */
3580 XGetWindowAttributes (xdisp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3581 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3582 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3583 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3584 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3585 break; 3646 break;
3586 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3589 break; 3650 break;
3590 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break; 3653 break;
… …
3594 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3595 break; 3656 break;
3596 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3597 { 3658 {
3598 char *s; 3659 char *s;
3599 XGetIconName (xdisp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s); 3662 XFree (s);
3602 } 3663 }
3603 break; 3664 break;
3604 case 21: /* report window title */ 3665 case 21: /* report window title */
3605 { 3666 {
3606 char *s; 3667 char *s;
3607 XFetchName (xdisp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3670 XFree (s);
3610 } 3671 }
3611 break; 3672 break;
3612 } 3673 }
3613} 3674}
… …
3640 seen_esc = true; 3701 seen_esc = true;
3641 continue; 3702 continue;
3642 } 3703 }
3643 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3644 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3645 else if (ch < 0x20) 3708 else if (ch < 0x20)
3646 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3647 3710
3648 seen_esc = false; 3711 seen_esc = false;
3649 3712
3650 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3651 // stop at some sane length 3714 // stop at some sane length
3652 return NULL; 3715 return NULL;
3653 3716
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
3657 string[n++] = ch; 3717 string[n++] = ch;
3658 } 3718 }
3659 3719
3660 string[n++] = '\0'; 3720 string[n++] = '\0';
3661 3721
3662 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738 int color; 3798 int color;
3739 char *buf, *name; 3799 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3741 int saveop = op; 3801 int saveop = op;
3742 3802
3743 dLocal (Display *, xdisp); 3803 dLocal (Display *, dpy);
3744 3804
3745 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3746 switch (op) 3810 switch (op)
3747 { 3811 {
3748 case XTerm_name: 3812 case XTerm_name:
3749 set_title (str); 3813 set_title (str);
3750 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3764 unsigned long bytes_after; 3828 unsigned long bytes_after;
3765 unsigned char *value = 0; 3829 unsigned char *value = 0;
3766 const char *str = ""; 3830 const char *str = "";
3767 3831
3768 if (prop 3832 if (prop
3769 && XGetWindowProperty (xdisp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3770 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None 3837 && actual_type != None
3774 && actual_format == 8) 3838 && actual_format == 8)
… …
3786 { 3850 {
3787 *eq = 0; 3851 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3789 } 3853 }
3790 else 3854 else
3791 XDeleteProperty (xdisp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3792 display->atom (str)); 3856 display->atom (str));
3793 } 3857 }
3794 break; 3858 break;
3795 3859
3796 case XTerm_Color: 3860 case XTerm_Color:
… …
3918 case URxvt_italicFont: 3982 case URxvt_italicFont:
3919 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3920#endif 3984#endif
3921 if (query) 3985 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp); 3989 resp);
3926 else 3990 else
3927 { 3991 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3942 break; 4006 break;
3943 4007
3944#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
3945 case URxvt_locale: 4009 case URxvt_locale:
3946 if (query) 4010 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 4012 else
3949 { 4013 {
3950 set_locale (str); 4014 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 4016 init_xlocale ();
… …
3967 break; 4031 break;
3968#endif 4032#endif
3969 4033
3970#if ENABLE_PERL 4034#if ENABLE_PERL
3971 case URxvt_perl: 4035 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3973 ; // no responses yet 4037 ; // no responses yet
3974 break; 4038 break;
3975#endif 4039#endif
3976 } 4040 }
3977} 4041}
… …
4093 scr_touch (true); 4157 scr_touch (true);
4094 break; 4158 break;
4095#endif 4159#endif
4096 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4097 case 1049: 4161 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 4163 if (mode == 0)
4100 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4101 else if (mode == 1) 4165 else if (mode == 1)
4102 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4103 break; 4167 break;
… …
4168 break; 4232 break;
4169 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4171 break; 4235 break;
4172 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 4239 scr_erase_screen (2);
4176 scr_change_screen (state); 4240 scr_change_screen (state);
4177 break; 4241 break;
4178 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 4243 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 4246 scr_erase_screen (2);
4183 break; 4247 break;
4184 default: 4248 default:
4185 break; 4249 break;

Diff Legend

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