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.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 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>
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */
304void 303void
305rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
306{ 305{
307 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
308 unsigned int newlen; 307 unsigned int newlen;
309 KeySym keysym; 308 KeySym keysym;
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
878 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 883 if (view_start)
880 { 884 {
881 view_start = 0; 885 view_start = 0;
882 want_refresh = 1; 886 want_refresh = 1;
883 } 887 }
… …
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
910 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
911} 915}
912/*}}} */ 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}
913 993
914#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
915unsigned int 995unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 997{
… …
1103 1183
1104 void yield_cb (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1105 { 1185 {
1106 // this should really be sched_yield(), but the linux guys thought 1186 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1187 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 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.
1109 1190
1110 struct timespec ts = { 0, 0 }; 1191 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1192 nanosleep (&ts, 0);
1112 1193
1113 w.stop (); 1194 w.stop ();
… …
1151 } 1232 }
1152 else 1233 else
1153 { 1234 {
1154 pty_ev.stop (); 1235 pty_ev.stop ();
1155 1236
1156 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1157 destroy (); 1238 destroy ();
1158 } 1239 }
1159 1240
1160 return false; 1241 return false;
1161} 1242}
… …
1176} 1257}
1177 1258
1178void 1259void
1179rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1180{ 1261{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1263 recolour_cursor ();
1183 1264
1184#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1266 hidden_pointer = 0;
1186 1267
1187 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1189#endif 1270#endif
1190} 1271}
1191 1272
1192#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1193void 1274void
1194rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1195{ 1276{
1196 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1197 return; 1278 return;
1198 1279
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1281 XFlush (dpy);
1201 1282
1202 hidden_pointer = 1; 1283 hidden_pointer = 1;
1203} 1284}
1204 1285
1205void 1286void
… …
1284void 1365void
1285rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1286{ 1367{
1287 make_current (); 1368 make_current ();
1288 1369
1289 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1290 1371
1291 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1375 return;
… …
1299 unsigned int unused_mask; 1380 unsigned int unused_mask;
1300 1381
1301 switch (ev.type) 1382 switch (ev.type)
1302 { 1383 {
1303 case KeyPress: 1384 case KeyPress:
1304#if ISO_14755 1385 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1386 break;
1310 1387
1311 case KeyRelease: 1388 case KeyRelease:
1312 { 1389 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1390 break;
1384 }
1385 1391
1386 case ButtonPress: 1392 case ButtonPress:
1387 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1388 break; 1394 break;
1389 1395
… …
1404 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)))
1405 destroy (); 1411 destroy ();
1406 } 1412 }
1407#if ENABLE_EWMH 1413#if ENABLE_EWMH
1408 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])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1417 &ev);
1412#endif 1418#endif
1413 } 1419 }
1414 } 1420 }
… …
1452 break; 1458 break;
1453 } 1459 }
1454 break; 1460 break;
1455 1461
1456 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1466 focus_in ();
1458 break; 1467 break;
1459 1468
1460 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1473 focus_out ();
1462 break; 1474 break;
1463 1475
1464 case ConfigureNotify: 1476 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1466 { 1478 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1480 ;
1469 1481
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1483 {
1472 seen_resize = 1; 1484 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1486 }
1475 1487
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 1489
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1479 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1480 check_our_parents (); 1492 check_our_parents ();
1481#endif 1493#endif
1482 } 1494 }
1483 break; 1495 break;
1484 1496
… …
1530 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1531 { 1543 {
1532 do 1544 do
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1548
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1550
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1542 1554
1543 want_refresh = 1; 1555 want_refresh = 1;
1544 } 1556 }
1545 else 1557 else
1546 { 1558 {
1547 XEvent unused_event; 1559 XEvent unused_event;
1548 1560
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1562 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1564 ;
1553 1565
1554 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1555 { 1567 {
1556 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1557 scrollbar_show (0); 1569 scrollbar_show (0);
1558 } 1570 }
1559 1571
1560#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1563#endif 1575#endif
1564 } 1576 }
1565 break; 1577 break;
1566 1578
1567 case MotionNotify: 1579 case MotionNotify:
… …
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1591 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1593 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1595 ;
1584 1596
1585 XQueryPointer (xdisp, vt, 1597 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1601 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1654#endif 1666#endif
1655 } 1667 }
1656 } 1668 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658 { 1670 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1661 ; 1673 ;
1662 1674
1663 XQueryPointer (xdisp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1679 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1672 scrollbar_show (1); 1684 scrollbar_show (1);
1673 } 1685 }
1674 break; 1686 break;
1675 } 1687 }
1676 1688
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1691 {
1682 if (hidden_cursor) 1692 if (hidden_cursor)
1683 { 1693 {
1684 hidden_cursor = 0; 1694 hidden_cursor = 0;
1685 want_refresh = 1; 1695 want_refresh = 1;
… …
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 } 1699 }
1690#endif 1700#endif
1691 1701
1692#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1704 {
1695 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1710 if (!focus) 1720 if (!focus)
1711 { 1721 {
1712 focus = 1; 1722 focus = 1;
1713 want_refresh = 1; 1723 want_refresh = 1;
1714 1724
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1726
1717#if USE_XIM 1727#if USE_XIM
1718 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1719 { 1729 {
1720 IMSetStatusPosition (); 1730 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1722 } 1732 }
1723#endif 1733#endif
1724#if CURSOR_BLINK 1734#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1727#endif 1737#endif
1728#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1730 { 1740 {
… …
1757#if USE_XIM 1767#if USE_XIM
1758 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1760#endif 1770#endif
1761#if CURSOR_BLINK 1771#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1764 hidden_cursor = 0; 1774 hidden_cursor = 0;
1765#endif 1775#endif
1766#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1771 } 1781 }
1772#endif 1782#endif
1773 } 1783 }
1774} 1784}
1775 1785
1776#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1777void 1800void
1778rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1802{
1780 make_current (); 1803 make_current ();
1781 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1782 switch (ev.type) 1810 switch (ev.type)
1783 { 1811 {
1784 case PropertyNotify: 1812 case PropertyNotify:
1785 /* 1813 /*
1786 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1791 return; 1819 return;
1792 1820
1793 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1794 case ReparentNotify: 1822 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1797 break; 1825 break;
1798 } 1826 }
1827# endif
1799} 1828}
1800#endif 1829#endif
1801 1830
1802void 1831void
1803rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
2131 selection_make (ev.time); 2160 selection_make (ev.time);
2132 break; 2161 break;
2133 2162
2134 case Button2: 2163 case Button2:
2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2166 break;
2138 2167
2139#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2140 case Button4: 2169 case Button4:
2141 case Button5: 2170 case Button5:
… …
2145 2174
2146 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2147 2176
2148 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2149 i = 1; 2178 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2180 i = nrow - 1;
2152 else 2181 else
2153 i = 5; 2182 i = 5;
2154 2183
2155# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2426 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2428 2457
2429 pchanged = 0; 2458 pchanged = 0;
2430 2459
2431 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2432 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2433 2462
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2436 2465
2437 XGetWindowAttributes (xdisp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2438 2467
2439 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2440 { 2469 {
2441 if (am_transparent) 2470 if (am_transparent)
2442 { 2471 {
2443 pchanged = 1; 2472 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2446 } 2475 }
2447 2476
2448 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2449 } 2478 }
2450 2479
2451 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2452 XSync (xdisp, False); 2481 XSync (dpy, False);
2453 2482
2454 /* 2483 /*
2455 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2457 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2458 */ 2487 */
2459 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2463 2492
2464 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2469 2498
2470 if (!i || prop == NULL 2499 if (!i || prop == NULL
2471#if TINTING 2500#if TINTING
… …
2490 Window cr; 2519 Window cr;
2491 XImage *image; 2520 XImage *image;
2492 GC gc; 2521 GC gc;
2493 XGCValues gcvalue; 2522 XGCValues gcvalue;
2494 2523
2495 XTranslateCoordinates (xdisp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2499 nx = ny = 0; 2528 nx = ny = 0;
2500 2529
… …
2513 } 2542 }
2514 2543
2515 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517 2546
2518 XSync (xdisp, False); 2547 XSync (dpy, False);
2519 allowedxerror = -1; 2548 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521 2550
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2524 allowedxerror = 0; 2553 allowedxerror = 0;
2525 2554
… …
2528 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2529 { 2558 {
2530 pchanged = 1; 2559 pchanged = 1;
2531 if (pixmap != None) 2560 if (pixmap != None)
2532 { 2561 {
2533 XFreePixmap (xdisp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2534 pixmap = None; 2563 pixmap = None;
2535 } 2564 }
2536 } 2565 }
2537 2566
2538 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2539 } 2568 }
2540 else 2569 else
2541 { 2570 {
2542 if (pixmap != None) 2571 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2544 2573
2545#if TINTING 2574#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2547 { 2576 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2552 2581
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 } 2583 }
2555#endif 2584#endif
2556 2585
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc); 2590 XFreeGC (dpy, gc);
2562 XDestroyImage (image); 2591 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2565 2594
2566 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2596 pchanged = 1;
2568 2597
2569 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2570 } 2599 }
2571 } 2600 }
2572 2601
2573 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575 else 2604 else
2576 { 2605 {
2577 unsigned int n; 2606 unsigned int n;
2578 /* 2607 /*
2579 * InheritPixmap transparency 2608 * InheritPixmap transparency
2580 */ 2609 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2611 {
2583 oldp = parent[i]; 2612 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list); 2614 XFree (list);
2586 2615
2587 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2588 { 2617 {
2589 if (oldp != None) 2618 if (oldp != None)
… …
2599 n = 0; 2628 n = 0;
2600 2629
2601 if (pchanged) 2630 if (pchanged)
2602 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2603 { 2632 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2605 2634
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 { 2636 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break; 2638 break;
2610 } 2639 }
2611 } 2640 }
2612 2641
2613 if (n > (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 { 2643 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0; 2646 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2619 } 2648 }
2620 else 2649 else
2621 { 2650 {
2622 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2623 { 2652 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2626 } 2655 }
2627 2656
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2629 am_transparent = 1; 2658 am_transparent = 1;
2630 } 2659 }
2631 2660
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None; 2662 parent[i] = None;
2634 } 2663 }
2635 2664
2636 if (scrollBar.win) 2665 if (scrollBar.win)
2637 { 2666 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2640 scrollbar_show (0); 2669 scrollbar_show (0);
2641 } 2670 }
2642 2671
2643 if (am_transparent) 2672 if (am_transparent)
… …
2706 if (ch == C0_LF) 2735 if (ch == C0_LF)
2707 nlines++; 2736 nlines++;
2708 2737
2709 refresh_count++; 2738 refresh_count++;
2710 2739
2711 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2712 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2742 {
2714 refreshnow = true; 2743 refreshnow = true;
2715 refresh_count = 0; 2744 refresh_count = 0;
2716 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2756 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2757 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2787 */
2759 if (refreshnow) 2788 if (refreshnow)
2760 { 2789 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++; 2791 refresh_limit++;
2763 else 2792 else
2764 { 2793 {
2765 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2766 scr_refresh (); 2796 scr_refresh ();
2767 want_refresh = 1; 2797 want_refresh = 1;
2768 } 2798 }
2769 } 2799 }
2770 2800
… …
3431 break; 3461 break;
3432 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3433 scr_report_position (); 3463 scr_report_position ();
3434 break; 3464 break;
3435 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 3468 break;
3439 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 3471 break;
… …
3534{ 3564{
3535 int x, y; 3565 int x, y;
3536 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3537 Window wdummy; 3567 Window wdummy;
3538 3568
3539 dLocal (Display *, xdisp); 3569 dLocal (Display *, dpy);
3540 3570
3541 if (nargs == 0) 3571 if (nargs == 0)
3542 return; 3572 return;
3543 3573
3544 switch (args[0]) 3574 switch (args[0])
3545 { 3575 {
3546 /* 3576 /*
3547 * commands 3577 * commands
3548 */ 3578 */
3549 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3551 break; 3581 break;
3552 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3584 break;
3555 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3587 break;
3558 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3590 break;
3561 case 5: /* raise window */ 3591 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3563 break; 3593 break;
3564 case 6: /* lower window */ 3594 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3566 break; 3596 break;
3567 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3568 scr_touch (true); 3598 scr_touch (true);
3569 break; 3599 break;
3570 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3581 3611
3582 /* 3612 /*
3583 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3584 */ 3614 */
3585 case 11: /* report window state */ 3615 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3618 break;
3589 case 13: /* report window position */ 3619 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3625 break;
3596 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3629 break;
3600 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3632 break;
… …
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3635 break;
3606 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3607 { 3637 {
3608 char *s; 3638 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3641 XFree (s);
3612 } 3642 }
3613 break; 3643 break;
3614 case 21: /* report window title */ 3644 case 21: /* report window title */
3615 { 3645 {
3616 char *s; 3646 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3619 XFree (s); 3649 XFree (s);
3620 } 3650 }
3621 break; 3651 break;
3622 } 3652 }
3623} 3653}
… …
3650 seen_esc = true; 3680 seen_esc = true;
3651 continue; 3681 continue;
3652 } 3682 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3687 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3657 3689
3658 seen_esc = false; 3690 seen_esc = false;
3659 3691
3660 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3693 // stop at some sane length
3662 return NULL; 3694 return NULL;
3663 3695
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3696 string[n++] = ch;
3668 } 3697 }
3669 3698
3670 string[n++] = '\0'; 3699 string[n++] = '\0';
3671 3700
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3748 int color; 3777 int color;
3749 char *buf, *name; 3778 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3780 int saveop = op;
3752 3781
3753 dLocal (Display *, xdisp); 3782 dLocal (Display *, dpy);
3754 3783
3755 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3756 switch (op) 3789 switch (op)
3757 { 3790 {
3758 case XTerm_name: 3791 case XTerm_name:
3759 set_title (str); 3792 set_title (str);
3760 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3807 unsigned long bytes_after;
3775 unsigned char *value = 0; 3808 unsigned char *value = 0;
3776 const char *str = ""; 3809 const char *str = "";
3777 3810
3778 if (prop 3811 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3816 && actual_type != None
3784 && actual_format == 8) 3817 && actual_format == 8)
… …
3796 { 3829 {
3797 *eq = 0; 3830 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3799 } 3832 }
3800 else 3833 else
3801 XDeleteProperty (xdisp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3835 display->atom (str));
3803 } 3836 }
3804 break; 3837 break;
3805 3838
3806 case XTerm_Color: 3839 case XTerm_Color:
… …
3928 case URxvt_italicFont: 3961 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3930#endif 3963#endif
3931 if (query) 3964 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3968 resp);
3936 else 3969 else
3937 { 3970 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 break; 3985 break;
3953 3986
3954#if !ENABLE_MINIMAL 3987#if !ENABLE_MINIMAL
3955 case URxvt_locale: 3988 case URxvt_locale:
3956 if (query) 3989 if (query)
3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3958 else 3991 else
3959 { 3992 {
3960 set_locale (str); 3993 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 3995 init_xlocale ();
… …
3977 break; 4010 break;
3978#endif 4011#endif
3979 4012
3980#if ENABLE_PERL 4013#if ENABLE_PERL
3981 case URxvt_perl: 4014 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3983 ; // no responses yet 4016 ; // no responses yet
3984 break; 4017 break;
3985#endif 4018#endif
3986 } 4019 }
3987} 4020}
… …
4103 scr_touch (true); 4136 scr_touch (true);
4104 break; 4137 break;
4105#endif 4138#endif
4106 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4107 case 1049: 4140 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 4142 if (mode == 0)
4110 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4111 else if (mode == 1) 4144 else if (mode == 1)
4112 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4113 break; 4146 break;
… …
4178 break; 4211 break;
4179 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 4213 set_option (Opt_scrollTtyKeypress, state);
4181 break; 4214 break;
4182 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 4218 scr_erase_screen (2);
4186 scr_change_screen (state); 4219 scr_change_screen (state);
4187 break; 4220 break;
4188 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 4222 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 4225 scr_erase_screen (2);
4193 break; 4226 break;
4194 default: 4227 default:
4195 break; 4228 break;

Diff Legend

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