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.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>
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 *
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 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);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
911} 923}
912/*}}} */ 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}
913 1001
914#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
915unsigned int 1003unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 1005{
1103 1191
1104 void yield_cb (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1105 { 1193 {
1106 // this should really be sched_yield(), but the linux guys thought 1194 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1195 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 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.
1109 1198
1110 struct timespec ts = { 0, 0 }; 1199 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1200 nanosleep (&ts, 0);
1112 1201
1113 w.stop (); 1202 w.stop ();
1151 } 1240 }
1152 else 1241 else
1153 { 1242 {
1154 pty_ev.stop (); 1243 pty_ev.stop ();
1155 1244
1156 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1157 destroy (); 1246 destroy ();
1158 } 1247 }
1159 1248
1160 return false; 1249 return false;
1161} 1250}
1176} 1265}
1177 1266
1178void 1267void
1179rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1180{ 1269{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1271 recolour_cursor ();
1183 1272
1184#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1274 hidden_pointer = 0;
1186 1275
1187 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1189#endif 1278#endif
1190} 1279}
1191 1280
1192#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1193void 1282void
1194rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1195{ 1284{
1196 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1197 return; 1286 return;
1198 1287
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1289 XFlush (dpy);
1201 1290
1202 hidden_pointer = 1; 1291 hidden_pointer = 1;
1203} 1292}
1204 1293
1205void 1294void
1284void 1373void
1285rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1286{ 1375{
1287 make_current (); 1376 make_current ();
1288 1377
1289 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1290 1379
1291 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1383 return;
1299 unsigned int unused_mask; 1388 unsigned int unused_mask;
1300 1389
1301 switch (ev.type) 1390 switch (ev.type)
1302 { 1391 {
1303 case KeyPress: 1392 case KeyPress:
1304#if ISO_14755 1393 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1394 break;
1310 1395
1311 case KeyRelease: 1396 case KeyRelease:
1312 { 1397 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; 1398 break;
1384 }
1385 1399
1386 case ButtonPress: 1400 case ButtonPress:
1387 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1388 break; 1402 break;
1389 1403
1404 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)))
1405 destroy (); 1419 destroy ();
1406 } 1420 }
1407#if ENABLE_EWMH 1421#if ENABLE_EWMH
1408 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])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1425 &ev);
1412#endif 1426#endif
1413 } 1427 }
1414 } 1428 }
1452 break; 1466 break;
1453 } 1467 }
1454 break; 1468 break;
1455 1469
1456 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1474 focus_in ();
1458 break; 1475 break;
1459 1476
1460 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1481 focus_out ();
1462 break; 1482 break;
1463 1483
1464 case ConfigureNotify: 1484 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1466 { 1486 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1488 ;
1469 1489
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1491 {
1472 seen_resize = 1; 1492 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1494 }
1475 1495
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 1497
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1479 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1480 check_our_parents (); 1500 check_our_parents ();
1481#endif 1501#endif
1482 } 1502 }
1483 break; 1503 break;
1484 1504
1530 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1531 { 1551 {
1532 do 1552 do
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1556
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1558
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1542 1562
1543 want_refresh = 1; 1563 want_refresh = 1;
1544 } 1564 }
1545 else 1565 else
1546 { 1566 {
1547 XEvent unused_event; 1567 XEvent unused_event;
1548 1568
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1570 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1572 ;
1553 1573
1554 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1555 { 1575 {
1556 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1557 scrollbar_show (0); 1577 scrollbar_show (0);
1558 } 1578 }
1559 1579
1560#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1563#endif 1583#endif
1564 } 1584 }
1565 break; 1585 break;
1566 1586
1567 case MotionNotify: 1587 case MotionNotify:
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1599 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1601 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1603 ;
1584 1604
1585 XQueryPointer (xdisp, vt, 1605 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1609 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1654#endif 1674#endif
1655 } 1675 }
1656 } 1676 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658 { 1678 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1661 ; 1681 ;
1662 1682
1663 XQueryPointer (xdisp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1687 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672 scrollbar_show (1); 1692 scrollbar_show (1);
1673 } 1693 }
1674 break; 1694 break;
1675 } 1695 }
1676 1696
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1699 {
1682 if (hidden_cursor) 1700 if (hidden_cursor)
1683 { 1701 {
1684 hidden_cursor = 0; 1702 hidden_cursor = 0;
1685 want_refresh = 1; 1703 want_refresh = 1;
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 } 1707 }
1690#endif 1708#endif
1691 1709
1692#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1712 {
1695 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1716 if (hidden_pointer)
1710 if (!focus) 1728 if (!focus)
1711 { 1729 {
1712 focus = 1; 1730 focus = 1;
1713 want_refresh = 1; 1731 want_refresh = 1;
1714 1732
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1734
1717#if USE_XIM 1735#if USE_XIM
1718 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1719 { 1737 {
1720 IMSetStatusPosition (); 1738 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1722 } 1740 }
1723#endif 1741#endif
1724#if CURSOR_BLINK 1742#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1727#endif 1745#endif
1728#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1730 { 1748 {
1731 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1732 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 }
1733 } 1764 }
1734#endif 1765#endif
1735 } 1766 }
1736} 1767}
1737 1768
1757#if USE_XIM 1788#if USE_XIM
1758 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1760#endif 1791#endif
1761#if CURSOR_BLINK 1792#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1764 hidden_cursor = 0; 1795 hidden_cursor = 0;
1765#endif 1796#endif
1766#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
1771 } 1802 }
1772#endif 1803#endif
1773 } 1804 }
1774} 1805}
1775 1806
1776#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
1777void 1821void
1778rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1823{
1780 make_current (); 1824 make_current ();
1781 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
1782 switch (ev.type) 1831 switch (ev.type)
1783 { 1832 {
1784 case PropertyNotify: 1833 case PropertyNotify:
1785 /* 1834 /*
1786 * 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,
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1791 return; 1840 return;
1792 1841
1793 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1794 case ReparentNotify: 1843 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1797 break; 1846 break;
1798 } 1847 }
1848# endif
1799} 1849}
1800#endif 1850#endif
1801 1851
1802void 1852void
1803rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
2131 selection_make (ev.time); 2181 selection_make (ev.time);
2132 break; 2182 break;
2133 2183
2134 case Button2: 2184 case Button2:
2135 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?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2187 break;
2138 2188
2139#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2140 case Button4: 2190 case Button4:
2141 case Button5: 2191 case Button5:
2145 2195
2146 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2147 2197
2148 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2149 i = 1; 2199 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2201 i = nrow - 1;
2152 else 2202 else
2153 i = 5; 2203 i = 5;
2154 2204
2155# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2426 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2428 2478
2429 pchanged = 0; 2479 pchanged = 0;
2430 2480
2431 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2432 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2433 2483
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2436 2486
2437 XGetWindowAttributes (xdisp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2438 2488
2439 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2440 { 2490 {
2441 if (am_transparent) 2491 if (am_transparent)
2442 { 2492 {
2443 pchanged = 1; 2493 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2446 } 2496 }
2447 2497
2448 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2449 } 2499 }
2450 2500
2451 /* 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. */
2452 XSync (xdisp, False); 2502 XSync (dpy, False);
2453 2503
2454 /* 2504 /*
2455 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2457 * 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.
2458 */ 2508 */
2459 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2463 2513
2464 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2469 2519
2470 if (!i || prop == NULL 2520 if (!i || prop == NULL
2471#if TINTING 2521#if TINTING
2490 Window cr; 2540 Window cr;
2491 XImage *image; 2541 XImage *image;
2492 GC gc; 2542 GC gc;
2493 XGCValues gcvalue; 2543 XGCValues gcvalue;
2494 2544
2495 XTranslateCoordinates (xdisp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2499 nx = ny = 0; 2549 nx = ny = 0;
2500 2550
2513 } 2563 }
2514 2564
2515 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517 2567
2518 XSync (xdisp, False); 2568 XSync (dpy, False);
2519 allowedxerror = -1; 2569 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521 2571
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2524 allowedxerror = 0; 2574 allowedxerror = 0;
2525 2575
2528 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2529 { 2579 {
2530 pchanged = 1; 2580 pchanged = 1;
2531 if (pixmap != None) 2581 if (pixmap != None)
2532 { 2582 {
2533 XFreePixmap (xdisp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2534 pixmap = None; 2584 pixmap = None;
2535 } 2585 }
2536 } 2586 }
2537 2587
2538 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2539 } 2589 }
2540 else 2590 else
2541 { 2591 {
2542 if (pixmap != None) 2592 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2544 2594
2545#if TINTING 2595#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2547 { 2597 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2552 2602
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 } 2604 }
2555#endif 2605#endif
2556 2606
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc); 2611 XFreeGC (dpy, gc);
2562 XDestroyImage (image); 2612 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2565 2615
2566 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2617 pchanged = 1;
2568 2618
2569 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2570 } 2620 }
2571 } 2621 }
2572 2622
2573 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575 else 2625 else
2576 { 2626 {
2577 unsigned int n; 2627 unsigned int n;
2578 /* 2628 /*
2579 * InheritPixmap transparency 2629 * InheritPixmap transparency
2580 */ 2630 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2632 {
2583 oldp = parent[i]; 2633 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list); 2635 XFree (list);
2586 2636
2587 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2588 { 2638 {
2589 if (oldp != None) 2639 if (oldp != None)
2599 n = 0; 2649 n = 0;
2600 2650
2601 if (pchanged) 2651 if (pchanged)
2602 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2603 { 2653 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2605 2655
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 { 2657 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break; 2659 break;
2610 } 2660 }
2611 } 2661 }
2612 2662
2613 if (n > (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 { 2664 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0; 2667 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2619 } 2669 }
2620 else 2670 else
2621 { 2671 {
2622 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2623 { 2673 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2626 } 2676 }
2627 2677
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2629 am_transparent = 1; 2679 am_transparent = 1;
2630 } 2680 }
2631 2681
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None; 2683 parent[i] = None;
2634 } 2684 }
2635 2685
2636 if (scrollBar.win) 2686 if (scrollBar.win)
2637 { 2687 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2640 scrollbar_show (0); 2690 scrollbar_show (0);
2641 } 2691 }
2642 2692
2643 if (am_transparent) 2693 if (am_transparent)
2706 if (ch == C0_LF) 2756 if (ch == C0_LF)
2707 nlines++; 2757 nlines++;
2708 2758
2709 refresh_count++; 2759 refresh_count++;
2710 2760
2711 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2712 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2763 {
2714 refreshnow = true; 2764 refreshnow = true;
2715 refresh_count = 0; 2765 refresh_count = 0;
2716 ch = NOCHAR; 2766 ch = NOCHAR;
2756 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2757 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2808 */
2759 if (refreshnow) 2809 if (refreshnow)
2760 { 2810 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++; 2812 refresh_limit++;
2763 else 2813 else
2764 { 2814 {
2765 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2766 scr_refresh (); 2817 scr_refresh ();
2767 want_refresh = 1; 2818 want_refresh = 1;
2768 } 2819 }
2769 } 2820 }
2770 2821
3431 break; 3482 break;
3432 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3433 scr_report_position (); 3484 scr_report_position ();
3434 break; 3485 break;
3435 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 3489 break;
3439 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 3492 break;
3534{ 3585{
3535 int x, y; 3586 int x, y;
3536 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3537 Window wdummy; 3588 Window wdummy;
3538 3589
3539 dLocal (Display *, xdisp); 3590 dLocal (Display *, dpy);
3540 3591
3541 if (nargs == 0) 3592 if (nargs == 0)
3542 return; 3593 return;
3543 3594
3544 switch (args[0]) 3595 switch (args[0])
3545 { 3596 {
3546 /* 3597 /*
3547 * commands 3598 * commands
3548 */ 3599 */
3549 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3551 break; 3602 break;
3552 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3605 break;
3555 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3608 break;
3558 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3611 break;
3561 case 5: /* raise window */ 3612 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3563 break; 3614 break;
3564 case 6: /* lower window */ 3615 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3566 break; 3617 break;
3567 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3568 scr_touch (true); 3619 scr_touch (true);
3569 break; 3620 break;
3570 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3581 3632
3582 /* 3633 /*
3583 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3584 */ 3635 */
3585 case 11: /* report window state */ 3636 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3639 break;
3589 case 13: /* report window position */ 3640 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3646 break;
3596 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3650 break;
3600 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3653 break;
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3656 break;
3606 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3607 { 3658 {
3608 char *s; 3659 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3610 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 */
3611 XFree (s); 3662 XFree (s);
3612 } 3663 }
3613 break; 3664 break;
3614 case 21: /* report window title */ 3665 case 21: /* report window title */
3615 { 3666 {
3616 char *s; 3667 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3618 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 */
3619 XFree (s); 3670 XFree (s);
3620 } 3671 }
3621 break; 3672 break;
3622 } 3673 }
3623} 3674}
3650 seen_esc = true; 3701 seen_esc = true;
3651 continue; 3702 continue;
3652 } 3703 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3708 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3657 3710
3658 seen_esc = false; 3711 seen_esc = false;
3659 3712
3660 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3714 // stop at some sane length
3662 return NULL; 3715 return NULL;
3663 3716
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3717 string[n++] = ch;
3668 } 3718 }
3669 3719
3670 string[n++] = '\0'; 3720 string[n++] = '\0';
3671 3721
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3748 int color; 3798 int color;
3749 char *buf, *name; 3799 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3801 int saveop = op;
3752 3802
3753 dLocal (Display *, xdisp); 3803 dLocal (Display *, dpy);
3754 3804
3755 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
3756 switch (op) 3810 switch (op)
3757 { 3811 {
3758 case XTerm_name: 3812 case XTerm_name:
3759 set_title (str); 3813 set_title (str);
3760 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
3774 unsigned long bytes_after; 3828 unsigned long bytes_after;
3775 unsigned char *value = 0; 3829 unsigned char *value = 0;
3776 const char *str = ""; 3830 const char *str = "";
3777 3831
3778 if (prop 3832 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3837 && actual_type != None
3784 && actual_format == 8) 3838 && actual_format == 8)
3796 { 3850 {
3797 *eq = 0; 3851 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3799 } 3853 }
3800 else 3854 else
3801 XDeleteProperty (xdisp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3856 display->atom (str));
3803 } 3857 }
3804 break; 3858 break;
3805 3859
3806 case XTerm_Color: 3860 case XTerm_Color:
3928 case URxvt_italicFont: 3982 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3930#endif 3984#endif
3931 if (query) 3985 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3989 resp);
3936 else 3990 else
3937 { 3991 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3952 break; 4006 break;
3953 4007
3954#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
3955 case URxvt_locale: 4009 case URxvt_locale:
3956 if (query) 4010 if (query)
3957 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);
3958 else 4012 else
3959 { 4013 {
3960 set_locale (str); 4014 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 4016 init_xlocale ();
3977 break; 4031 break;
3978#endif 4032#endif
3979 4033
3980#if ENABLE_PERL 4034#if ENABLE_PERL
3981 case URxvt_perl: 4035 case URxvt_perl:
3982 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)))
3983 ; // no responses yet 4037 ; // no responses yet
3984 break; 4038 break;
3985#endif 4039#endif
3986 } 4040 }
3987} 4041}
4103 scr_touch (true); 4157 scr_touch (true);
4104 break; 4158 break;
4105#endif 4159#endif
4106 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4107 case 1049: 4161 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 4163 if (mode == 0)
4110 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4111 else if (mode == 1) 4165 else if (mode == 1)
4112 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4113 break; 4167 break;
4178 break; 4232 break;
4179 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4181 break; 4235 break;
4182 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 4239 scr_erase_screen (2);
4186 scr_change_screen (state); 4240 scr_change_screen (state);
4187 break; 4241 break;
4188 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 4243 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 4246 scr_erase_screen (2);
4193 break; 4247 break;
4194 default: 4248 default:
4195 break; 4249 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines