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.322 by ayin, Wed May 2 23:06:32 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 *
… …
869 return; 877 return;
870 878
871 if (len <= 0) 879 if (len <= 0)
872 return; /* not mapped */ 880 return; /* not mapped */
873 881
874 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 883 if (view_start)
876 { 884 {
877 view_start = 0; 885 view_start = 0;
878 want_refresh = 1; 886 want_refresh = 1;
879 } 887 }
… …
903 tt_write (&ch, 1); 911 tt_write (&ch, 1);
904 } 912 }
905 913
906 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
907} 915}
908/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
909 993
910#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
911unsigned int 995unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 997{
… …
1097{ 1181{
1098 check_watcher yield_ev; 1182 check_watcher yield_ev;
1099 1183
1100 void yield_cb (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1101 { 1185 {
1102 usleep (0); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1103 w.stop (); 1194 w.stop ();
1104 } 1195 }
1105 1196
1106 event_handler () 1197 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb) 1198 : yield_ev (this, &event_handler::yield_cb)
… …
1141 } 1232 }
1142 else 1233 else
1143 { 1234 {
1144 pty_ev.stop (); 1235 pty_ev.stop ();
1145 1236
1146 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1147 destroy (); 1238 destroy ();
1148 } 1239 }
1149 1240
1150 return false; 1241 return false;
1151} 1242}
… …
1166} 1257}
1167 1258
1168void 1259void
1169rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1170{ 1261{
1171 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1172 recolour_cursor (); 1263 recolour_cursor ();
1173 1264
1174#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1175 hidden_pointer = 0; 1266 hidden_pointer = 0;
1176 1267
1177 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1178 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1179#endif 1270#endif
1180} 1271}
1181 1272
1182#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1183void 1274void
1184rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1185{ 1276{
1186 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1187 return; 1278 return;
1188 1279
1189 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1190 XFlush (xdisp); 1281 XFlush (dpy);
1191 1282
1192 hidden_pointer = 1; 1283 hidden_pointer = 1;
1193} 1284}
1194 1285
1195void 1286void
… …
1274void 1365void
1275rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1276{ 1367{
1277 make_current (); 1368 make_current ();
1278 1369
1279 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1280 1371
1281 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1282 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1284 return; 1375 return;
… …
1289 unsigned int unused_mask; 1380 unsigned int unused_mask;
1290 1381
1291 switch (ev.type) 1382 switch (ev.type)
1292 { 1383 {
1293 case KeyPress: 1384 case KeyPress:
1294#if ISO_14755 1385 key_press (ev.xkey);
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1297 lookup_key (ev.xkey);
1298
1299 break; 1386 break;
1300 1387
1301 case KeyRelease: 1388 case KeyRelease:
1302 { 1389 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; 1390 break;
1374 }
1375 1391
1376 case ButtonPress: 1392 case ButtonPress:
1377 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1378 break; 1394 break;
1379 1395
… …
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1395 destroy (); 1411 destroy ();
1396 } 1412 }
1397#if ENABLE_EWMH 1413#if ENABLE_EWMH
1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1399 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1401 &ev); 1417 &ev);
1402#endif 1418#endif
1403 } 1419 }
1404 } 1420 }
… …
1442 break; 1458 break;
1443 } 1459 }
1444 break; 1460 break;
1445 1461
1446 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1447 focus_in (); 1466 focus_in ();
1448 break; 1467 break;
1449 1468
1450 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1451 focus_out (); 1473 focus_out ();
1452 break; 1474 break;
1453 1475
1454 case ConfigureNotify: 1476 case ConfigureNotify:
1455 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1456 { 1478 {
1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1458 ; 1480 ;
1459 1481
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1483 {
1462 seen_resize = 1; 1484 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1486 }
1465 1487
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 1489
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1469 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1470 check_our_parents (); 1492 check_our_parents ();
1471#endif 1493#endif
1472 } 1494 }
1473 break; 1495 break;
1474 1496
… …
1520 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1521 { 1543 {
1522 do 1544 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1548
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1550
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1532 1554
1533 want_refresh = 1; 1555 want_refresh = 1;
1534 } 1556 }
1535 else 1557 else
1536 { 1558 {
1537 XEvent unused_event; 1559 XEvent unused_event;
1538 1560
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1562 ;
1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1564 ;
1543 1565
1544 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1545 { 1567 {
1546 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1547 scrollbar_show (0); 1569 scrollbar_show (0);
1548 } 1570 }
1549 1571
1550#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1551 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1553#endif 1575#endif
1554 } 1576 }
1555 break; 1577 break;
1556 1578
1557 case MotionNotify: 1579 case MotionNotify:
… …
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop 1591 ; // nop
1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1593 {
1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1595 ;
1574 1596
1575 XQueryPointer (xdisp, vt, 1597 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1601 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1644#endif 1666#endif
1645 } 1667 }
1646 } 1668 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1670 {
1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1651 ; 1673 ;
1652 1674
1653 XQueryPointer (xdisp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1679 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1662 scrollbar_show (1); 1684 scrollbar_show (1);
1663 } 1685 }
1664 break; 1686 break;
1665 } 1687 }
1666 1688
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1671 { 1691 {
1672 if (hidden_cursor) 1692 if (hidden_cursor)
1673 { 1693 {
1674 hidden_cursor = 0; 1694 hidden_cursor = 0;
1675 want_refresh = 1; 1695 want_refresh = 1;
… …
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 } 1699 }
1680#endif 1700#endif
1681 1701
1682#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1704 {
1685 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1688 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1700 if (!focus) 1720 if (!focus)
1701 { 1721 {
1702 focus = 1; 1722 focus = 1;
1703 want_refresh = 1; 1723 want_refresh = 1;
1704 1724
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1706 1726
1707#if USE_XIM 1727#if USE_XIM
1708 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1709 { 1729 {
1710 IMSetStatusPosition (); 1730 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1712 } 1732 }
1713#endif 1733#endif
1714#if CURSOR_BLINK 1734#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif 1737#endif
1718#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1720 { 1740 {
1721 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1723 } 1756 }
1724#endif 1757#endif
1725 } 1758 }
1726} 1759}
1727 1760
… …
1747#if USE_XIM 1780#if USE_XIM
1748 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1750#endif 1783#endif
1751#if CURSOR_BLINK 1784#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1754 hidden_cursor = 0; 1787 hidden_cursor = 0;
1755#endif 1788#endif
1756#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1761 } 1794 }
1762#endif 1795#endif
1763 } 1796 }
1764} 1797}
1765 1798
1766#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1767void 1813void
1768rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1815{
1770 make_current (); 1816 make_current ();
1771 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1772 switch (ev.type) 1823 switch (ev.type)
1773 { 1824 {
1774 case PropertyNotify: 1825 case PropertyNotify:
1775 /* 1826 /*
1776 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
… …
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1781 return; 1832 return;
1782 1833
1783 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1784 case ReparentNotify: 1835 case ReparentNotify:
1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1786 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1787 break; 1838 break;
1788 } 1839 }
1840# endif
1789} 1841}
1790#endif 1842#endif
1791 1843
1792void 1844void
1793rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
… …
2121 selection_make (ev.time); 2173 selection_make (ev.time);
2122 break; 2174 break;
2123 2175
2124 case Button2: 2176 case Button2:
2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2177 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); 2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2179 break;
2128 2180
2129#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2130 case Button4: 2182 case Button4:
2131 case Button5: 2183 case Button5:
… …
2135 2187
2136 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2137 2189
2138 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2139 i = 1; 2191 i = 1;
2140 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2141 i = nrow - 1; 2193 i = nrow - 1;
2142 else 2194 else
2143 i = 5; 2195 i = 5;
2144 2196
2145# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2416 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2417 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2418 2470
2419 pchanged = 0; 2471 pchanged = 0;
2420 2472
2421 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2422 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2423 2475
2424 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2425 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2426 2478
2427 XGetWindowAttributes (xdisp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2428 2480
2429 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2430 { 2482 {
2431 if (am_transparent) 2483 if (am_transparent)
2432 { 2484 {
2433 pchanged = 1; 2485 pchanged = 1;
2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2435 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2436 } 2488 }
2437 2489
2438 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2439 } 2491 }
2440 2492
2441 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2442 XSync (xdisp, False); 2494 XSync (dpy, False);
2443 2495
2444 /* 2496 /*
2445 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2446 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2447 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2448 */ 2500 */
2449 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2452 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2453 2505
2454 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2459 2511
2460 if (!i || prop == NULL 2512 if (!i || prop == NULL
2461#if TINTING 2513#if TINTING
… …
2480 Window cr; 2532 Window cr;
2481 XImage *image; 2533 XImage *image;
2482 GC gc; 2534 GC gc;
2483 XGCValues gcvalue; 2535 XGCValues gcvalue;
2484 2536
2485 XTranslateCoordinates (xdisp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2486 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2487 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2488 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2489 nx = ny = 0; 2541 nx = ny = 0;
2490 2542
… …
2503 } 2555 }
2504 2556
2505 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2506 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507 2559
2508 XSync (xdisp, False); 2560 XSync (dpy, False);
2509 allowedxerror = -1; 2561 allowedxerror = -1;
2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2511 2563
2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2513 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2514 allowedxerror = 0; 2566 allowedxerror = 0;
2515 2567
… …
2518 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2519 { 2571 {
2520 pchanged = 1; 2572 pchanged = 1;
2521 if (pixmap != None) 2573 if (pixmap != None)
2522 { 2574 {
2523 XFreePixmap (xdisp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2524 pixmap = None; 2576 pixmap = None;
2525 } 2577 }
2526 } 2578 }
2527 2579
2528 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2529 } 2581 }
2530 else 2582 else
2531 { 2583 {
2532 if (pixmap != None) 2584 if (pixmap != None)
2533 XFreePixmap (xdisp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2534 2586
2535#if TINTING 2587#if TINTING
2536 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2537 { 2589 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2542 2594
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 } 2596 }
2545#endif 2597#endif
2546 2598
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2549 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2551 XFreeGC (xdisp, gc); 2603 XFreeGC (dpy, gc);
2552 XDestroyImage (image); 2604 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2554 XClearWindow (xdisp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2555 2607
2556 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1; 2609 pchanged = 1;
2558 2610
2559 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2560 } 2612 }
2561 } 2613 }
2562 2614
2563 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2565 else 2617 else
2566 { 2618 {
2567 unsigned int n; 2619 unsigned int n;
2568 /* 2620 /*
2569 * InheritPixmap transparency 2621 * InheritPixmap transparency
2570 */ 2622 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 { 2624 {
2573 oldp = parent[i]; 2625 oldp = parent[i];
2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2575 XFree (list); 2627 XFree (list);
2576 2628
2577 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2578 { 2630 {
2579 if (oldp != None) 2631 if (oldp != None)
… …
2589 n = 0; 2641 n = 0;
2590 2642
2591 if (pchanged) 2643 if (pchanged)
2592 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2593 { 2645 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2595 2647
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 { 2649 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break; 2651 break;
2600 } 2652 }
2601 } 2653 }
2602 2654
2603 if (n > (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2656 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2659 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2609 } 2661 }
2610 else 2662 else
2611 { 2663 {
2612 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2613 { 2665 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2616 } 2668 }
2617 2669
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2671 am_transparent = 1;
2620 } 2672 }
2621 2673
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2675 parent[i] = None;
2624 } 2676 }
2625 2677
2626 if (scrollBar.win) 2678 if (scrollBar.win)
2627 { 2679 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2630 scrollbar_show (0); 2682 scrollbar_show (0);
2631 } 2683 }
2632 2684
2633 if (am_transparent) 2685 if (am_transparent)
… …
2696 if (ch == C0_LF) 2748 if (ch == C0_LF)
2697 nlines++; 2749 nlines++;
2698 2750
2699 refresh_count++; 2751 refresh_count++;
2700 2752
2701 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2755 {
2704 refreshnow = true; 2756 refreshnow = true;
2705 refresh_count = 0; 2757 refresh_count = 0;
2706 ch = NOCHAR; 2758 ch = NOCHAR;
… …
2746 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2800 */
2749 if (refreshnow) 2801 if (refreshnow)
2750 { 2802 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2804 refresh_limit++;
2753 else 2805 else
2754 { 2806 {
2755 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2809 scr_refresh ();
2757 want_refresh = 1; 2810 want_refresh = 1;
2758 } 2811 }
2759 } 2812 }
2760 2813
… …
3421 break; 3474 break;
3422 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3423 scr_report_position (); 3476 scr_report_position ();
3424 break; 3477 break;
3425 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3481 break;
3429 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3484 break;
… …
3524{ 3577{
3525 int x, y; 3578 int x, y;
3526 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3527 Window wdummy; 3580 Window wdummy;
3528 3581
3529 dLocal (Display *, xdisp); 3582 dLocal (Display *, dpy);
3530 3583
3531 if (nargs == 0) 3584 if (nargs == 0)
3532 return; 3585 return;
3533 3586
3534 switch (args[0]) 3587 switch (args[0])
3535 { 3588 {
3536 /* 3589 /*
3537 * commands 3590 * commands
3538 */ 3591 */
3539 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3541 break; 3594 break;
3542 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3597 break;
3545 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3600 break;
3548 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3603 break;
3551 case 5: /* raise window */ 3604 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3553 break; 3606 break;
3554 case 6: /* lower window */ 3607 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3556 break; 3609 break;
3557 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3558 scr_touch (true); 3611 scr_touch (true);
3559 break; 3612 break;
3560 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3571 3624
3572 /* 3625 /*
3573 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3574 */ 3627 */
3575 case 11: /* report window state */ 3628 case 11: /* report window state */
3576 XGetWindowAttributes (xdisp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3578 break; 3631 break;
3579 case 13: /* report window position */ 3632 case 13: /* report window position */
3580 XGetWindowAttributes (xdisp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3581 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3582 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3583 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3584 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3585 break; 3638 break;
3586 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3589 break; 3642 break;
3590 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break; 3645 break;
… …
3594 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3595 break; 3648 break;
3596 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3597 { 3650 {
3598 char *s; 3651 char *s;
3599 XGetIconName (xdisp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s); 3654 XFree (s);
3602 } 3655 }
3603 break; 3656 break;
3604 case 21: /* report window title */ 3657 case 21: /* report window title */
3605 { 3658 {
3606 char *s; 3659 char *s;
3607 XFetchName (xdisp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3608 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 */
3609 XFree (s); 3662 XFree (s);
3610 } 3663 }
3611 break; 3664 break;
3612 } 3665 }
3613} 3666}
… …
3640 seen_esc = true; 3693 seen_esc = true;
3641 continue; 3694 continue;
3642 } 3695 }
3643 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3644 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3645 else if (ch < 0x20) 3700 else if (ch < 0x20)
3646 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3647 3702
3648 seen_esc = false; 3703 seen_esc = false;
3649 3704
3650 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3651 // stop at some sane length 3706 // stop at some sane length
3652 return NULL; 3707 return NULL;
3653 3708
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
3657 string[n++] = ch; 3709 string[n++] = ch;
3658 } 3710 }
3659 3711
3660 string[n++] = '\0'; 3712 string[n++] = '\0';
3661 3713
3662 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738 int color; 3790 int color;
3739 char *buf, *name; 3791 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3741 int saveop = op; 3793 int saveop = op;
3742 3794
3743 dLocal (Display *, xdisp); 3795 dLocal (Display *, dpy);
3744 3796
3745 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3746 switch (op) 3802 switch (op)
3747 { 3803 {
3748 case XTerm_name: 3804 case XTerm_name:
3749 set_title (str); 3805 set_title (str);
3750 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3764 unsigned long bytes_after; 3820 unsigned long bytes_after;
3765 unsigned char *value = 0; 3821 unsigned char *value = 0;
3766 const char *str = ""; 3822 const char *str = "";
3767 3823
3768 if (prop 3824 if (prop
3769 && XGetWindowProperty (xdisp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3770 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None 3829 && actual_type != None
3774 && actual_format == 8) 3830 && actual_format == 8)
… …
3786 { 3842 {
3787 *eq = 0; 3843 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3789 } 3845 }
3790 else 3846 else
3791 XDeleteProperty (xdisp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3792 display->atom (str)); 3848 display->atom (str));
3793 } 3849 }
3794 break; 3850 break;
3795 3851
3796 case XTerm_Color: 3852 case XTerm_Color:
… …
3918 case URxvt_italicFont: 3974 case URxvt_italicFont:
3919 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3920#endif 3976#endif
3921 if (query) 3977 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp); 3981 resp);
3926 else 3982 else
3927 { 3983 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3942 break; 3998 break;
3943 3999
3944#if !ENABLE_MINIMAL 4000#if !ENABLE_MINIMAL
3945 case URxvt_locale: 4001 case URxvt_locale:
3946 if (query) 4002 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 4004 else
3949 { 4005 {
3950 set_locale (str); 4006 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 4008 init_xlocale ();
… …
3967 break; 4023 break;
3968#endif 4024#endif
3969 4025
3970#if ENABLE_PERL 4026#if ENABLE_PERL
3971 case URxvt_perl: 4027 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3973 ; // no responses yet 4029 ; // no responses yet
3974 break; 4030 break;
3975#endif 4031#endif
3976 } 4032 }
3977} 4033}
… …
4093 scr_touch (true); 4149 scr_touch (true);
4094 break; 4150 break;
4095#endif 4151#endif
4096 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4097 case 1049: 4153 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 4155 if (mode == 0)
4100 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4101 else if (mode == 1) 4157 else if (mode == 1)
4102 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4103 break; 4159 break;
… …
4168 break; 4224 break;
4169 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4171 break; 4227 break;
4172 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 4231 scr_erase_screen (2);
4176 scr_change_screen (state); 4232 scr_change_screen (state);
4177 break; 4233 break;
4178 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 4235 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 4238 scr_erase_screen (2);
4183 break; 4239 break;
4184 default: 4240 default:
4185 break; 4241 break;

Diff Legend

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