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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
489 { 497 {
490 commit_iso14755 (); 498 commit_iso14755 ();
491 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
492# if ISO_14755 500# if ISO_14755
493 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
494# endif 510# endif
495 return; 511 return;
496 } 512 }
497 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
498 { 514 {
… …
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
… …
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1183 }
1092} 1184}
1093#endif 1185#endif
1094 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1095bool 1212bool
1096rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1097{ 1214{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099 1216
… …
1114 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1115 return true; 1232 return true;
1116 } 1233 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1235 {
1119#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1120 if (display->is_local) 1237 if (display->is_local)
1121 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1122#endif 1239#endif
1123 } 1240 }
1124 else 1241 else
1125 { 1242 {
1126 pty_ev.stop (); 1243 pty_ev.stop ();
1127 1244
1128 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1129 destroy (); 1246 destroy ();
1130 } 1247 }
1131 1248
1132 return false; 1249 return false;
1133} 1250}
… …
1148} 1265}
1149 1266
1150void 1267void
1151rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1152{ 1269{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1271 recolour_cursor ();
1155 1272
1156#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1274 hidden_pointer = 0;
1158 1275
1159 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1278#endif
1162} 1279}
1163 1280
1164#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1165void 1282void
1166rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1167{ 1284{
1168 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1169 return; 1286 return;
1170 1287
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1289 XFlush (dpy);
1173 1290
1174 hidden_pointer = 1; 1291 hidden_pointer = 1;
1175} 1292}
1176 1293
1177void 1294void
… …
1256void 1373void
1257rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1258{ 1375{
1259 make_current (); 1376 make_current ();
1260 1377
1261 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1262 1379
1263 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1383 return;
… …
1271 unsigned int unused_mask; 1388 unsigned int unused_mask;
1272 1389
1273 switch (ev.type) 1390 switch (ev.type)
1274 { 1391 {
1275 case KeyPress: 1392 case KeyPress:
1276#if ISO_14755 1393 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1394 break;
1282 1395
1283 case KeyRelease: 1396 case KeyRelease:
1284 { 1397 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1398 break;
1356 }
1357 1399
1358 case ButtonPress: 1400 case ButtonPress:
1359 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1360 break; 1402 break;
1361 1403
… …
1376 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)))
1377 destroy (); 1419 destroy ();
1378 } 1420 }
1379#if ENABLE_EWMH 1421#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1425 &ev);
1384#endif 1426#endif
1385 } 1427 }
1386 } 1428 }
… …
1424 break; 1466 break;
1425 } 1467 }
1426 break; 1468 break;
1427 1469
1428 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1474 focus_in ();
1430 break; 1475 break;
1431 1476
1432 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1481 focus_out ();
1434 break; 1482 break;
1435 1483
1436 case ConfigureNotify: 1484 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1438 { 1486 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1488 ;
1441 1489
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1491 {
1444 seen_resize = 1; 1492 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1494 }
1447 1495
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 1497
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1451 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1452 check_our_parents (); 1500 check_our_parents ();
1453#endif 1501#endif
1454 } 1502 }
1455 break; 1503 break;
1456 1504
… …
1502 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1503 { 1551 {
1504 do 1552 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1556
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1558
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1514 1562
1515 want_refresh = 1; 1563 want_refresh = 1;
1516 } 1564 }
1517 else 1565 else
1518 { 1566 {
1519 XEvent unused_event; 1567 XEvent unused_event;
1520 1568
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1570 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1572 ;
1525 1573
1526 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1527 { 1575 {
1528 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1529 scrollbar_show (0); 1577 scrollbar_show (0);
1530 } 1578 }
1531 1579
1532#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1535#endif 1583#endif
1536 } 1584 }
1537 break; 1585 break;
1538 1586
1539 case MotionNotify: 1587 case MotionNotify:
… …
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1599 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1601 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1603 ;
1556 1604
1557 XQueryPointer (xdisp, vt, 1605 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1609 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1626#endif 1674#endif
1627 } 1675 }
1628 } 1676 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1678 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1633 ; 1681 ;
1634 1682
1635 XQueryPointer (xdisp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1687 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1644 scrollbar_show (1); 1692 scrollbar_show (1);
1645 } 1693 }
1646 break; 1694 break;
1647 } 1695 }
1648 1696
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1699 {
1654 if (hidden_cursor) 1700 if (hidden_cursor)
1655 { 1701 {
1656 hidden_cursor = 0; 1702 hidden_cursor = 0;
1657 want_refresh = 1; 1703 want_refresh = 1;
… …
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 } 1707 }
1662#endif 1708#endif
1663 1709
1664#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1712 {
1667 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1682 if (!focus) 1728 if (!focus)
1683 { 1729 {
1684 focus = 1; 1730 focus = 1;
1685 want_refresh = 1; 1731 want_refresh = 1;
1686 1732
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1734
1689#if USE_XIM 1735#if USE_XIM
1690 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1691 { 1737 {
1692 IMSetStatusPosition (); 1738 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1694 } 1740 }
1695#endif 1741#endif
1696#if CURSOR_BLINK 1742#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif 1745#endif
1700#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1702 { 1748 {
1703 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1704 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 }
1705 } 1764 }
1706#endif 1765#endif
1707 } 1766 }
1708} 1767}
1709 1768
… …
1729#if USE_XIM 1788#if USE_XIM
1730 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1732#endif 1791#endif
1733#if CURSOR_BLINK 1792#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1736 hidden_cursor = 0; 1795 hidden_cursor = 0;
1737#endif 1796#endif
1738#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1743 } 1802 }
1744#endif 1803#endif
1745 } 1804 }
1746} 1805}
1747 1806
1748#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
1749void 1821void
1750rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1823{
1752 make_current (); 1824 make_current ();
1753 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
1754 switch (ev.type) 1831 switch (ev.type)
1755 { 1832 {
1756 case PropertyNotify: 1833 case PropertyNotify:
1757 /* 1834 /*
1758 * 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,
… …
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1763 return; 1840 return;
1764 1841
1765 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1766 case ReparentNotify: 1843 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1769 break; 1846 break;
1770 } 1847 }
1848# endif
1771} 1849}
1772#endif 1850#endif
1773 1851
1774void 1852void
1775rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
2103 selection_make (ev.time); 2181 selection_make (ev.time);
2104 break; 2182 break;
2105 2183
2106 case Button2: 2184 case Button2:
2107 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?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2187 break;
2110 2188
2111#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2112 case Button4: 2190 case Button4:
2113 case Button5: 2191 case Button5:
… …
2117 2195
2118 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2119 2197
2120 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2121 i = 1; 2199 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2201 i = nrow - 1;
2124 else 2202 else
2125 i = 5; 2203 i = 5;
2126 2204
2127# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2398 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2400 2478
2401 pchanged = 0; 2479 pchanged = 0;
2402 2480
2403 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2404 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2405 2483
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2408 2486
2409 XGetWindowAttributes (xdisp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2410 2488
2411 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2412 { 2490 {
2413 if (am_transparent) 2491 if (am_transparent)
2414 { 2492 {
2415 pchanged = 1; 2493 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2418 } 2496 }
2419 2497
2420 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2421 } 2499 }
2422 2500
2423 /* 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. */
2424 XSync (xdisp, False); 2502 XSync (dpy, False);
2425 2503
2426 /* 2504 /*
2427 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2429 * 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.
2430 */ 2508 */
2431 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2435 2513
2436 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2441 2519
2442 if (!i || prop == NULL 2520 if (!i || prop == NULL
2443#if TINTING 2521#if TINTING
… …
2462 Window cr; 2540 Window cr;
2463 XImage *image; 2541 XImage *image;
2464 GC gc; 2542 GC gc;
2465 XGCValues gcvalue; 2543 XGCValues gcvalue;
2466 2544
2467 XTranslateCoordinates (xdisp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2471 nx = ny = 0; 2549 nx = ny = 0;
2472 2550
… …
2485 } 2563 }
2486 2564
2487 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489 2567
2490 XSync (xdisp, False); 2568 XSync (dpy, False);
2491 allowedxerror = -1; 2569 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493 2571
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2496 allowedxerror = 0; 2574 allowedxerror = 0;
2497 2575
… …
2500 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2501 { 2579 {
2502 pchanged = 1; 2580 pchanged = 1;
2503 if (pixmap != None) 2581 if (pixmap != None)
2504 { 2582 {
2505 XFreePixmap (xdisp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2506 pixmap = None; 2584 pixmap = None;
2507 } 2585 }
2508 } 2586 }
2509 2587
2510 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2511 } 2589 }
2512 else 2590 else
2513 { 2591 {
2514 if (pixmap != None) 2592 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2516 2594
2517#if TINTING 2595#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2519 { 2597 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2524 2602
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 } 2604 }
2527#endif 2605#endif
2528 2606
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc); 2611 XFreeGC (dpy, gc);
2534 XDestroyImage (image); 2612 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2537 2615
2538 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1; 2617 pchanged = 1;
2540 2618
2541 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2542 } 2620 }
2543 } 2621 }
2544 2622
2545 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547 else 2625 else
2548 { 2626 {
2549 unsigned int n; 2627 unsigned int n;
2550 /* 2628 /*
2551 * InheritPixmap transparency 2629 * InheritPixmap transparency
2552 */ 2630 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 { 2632 {
2555 oldp = parent[i]; 2633 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list); 2635 XFree (list);
2558 2636
2559 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2560 { 2638 {
2561 if (oldp != None) 2639 if (oldp != None)
… …
2571 n = 0; 2649 n = 0;
2572 2650
2573 if (pchanged) 2651 if (pchanged)
2574 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2575 { 2653 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2577 2655
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 { 2657 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break; 2659 break;
2582 } 2660 }
2583 } 2661 }
2584 2662
2585 if (n > (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 { 2664 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0; 2667 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2591 } 2669 }
2592 else 2670 else
2593 { 2671 {
2594 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2595 { 2673 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2598 } 2676 }
2599 2677
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601 am_transparent = 1; 2679 am_transparent = 1;
2602 } 2680 }
2603 2681
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None; 2683 parent[i] = None;
2606 } 2684 }
2607 2685
2608 if (scrollBar.win) 2686 if (scrollBar.win)
2609 { 2687 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2612 scrollbar_show (0); 2690 scrollbar_show (0);
2613 } 2691 }
2614 2692
2615 if (am_transparent) 2693 if (am_transparent)
… …
2678 if (ch == C0_LF) 2756 if (ch == C0_LF)
2679 nlines++; 2757 nlines++;
2680 2758
2681 refresh_count++; 2759 refresh_count++;
2682 2760
2683 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2684 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2763 {
2686 refreshnow = true; 2764 refreshnow = true;
2687 refresh_count = 0; 2765 refresh_count = 0;
2688 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2728 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2729 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2808 */
2731 if (refreshnow) 2809 if (refreshnow)
2732 { 2810 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++; 2812 refresh_limit++;
2735 else 2813 else
2736 { 2814 {
2737 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2738 scr_refresh (); 2817 scr_refresh ();
2739 want_refresh = 1; 2818 want_refresh = 1;
2740 } 2819 }
2741 } 2820 }
2742 2821
… …
3403 break; 3482 break;
3404 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3405 scr_report_position (); 3484 scr_report_position ();
3406 break; 3485 break;
3407 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3489 break;
3411 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3492 break;
… …
3506{ 3585{
3507 int x, y; 3586 int x, y;
3508 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3509 Window wdummy; 3588 Window wdummy;
3510 3589
3511 dLocal (Display *, xdisp); 3590 dLocal (Display *, dpy);
3512 3591
3513 if (nargs == 0) 3592 if (nargs == 0)
3514 return; 3593 return;
3515 3594
3516 switch (args[0]) 3595 switch (args[0])
3517 { 3596 {
3518 /* 3597 /*
3519 * commands 3598 * commands
3520 */ 3599 */
3521 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3523 break; 3602 break;
3524 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3605 break;
3527 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3608 break;
3530 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3611 break;
3533 case 5: /* raise window */ 3612 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3535 break; 3614 break;
3536 case 6: /* lower window */ 3615 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3538 break; 3617 break;
3539 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3540 scr_touch (true); 3619 scr_touch (true);
3541 break; 3620 break;
3542 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3553 3632
3554 /* 3633 /*
3555 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3556 */ 3635 */
3557 case 11: /* report window state */ 3636 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3639 break;
3561 case 13: /* report window position */ 3640 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3646 break;
3568 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3650 break;
3572 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3653 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3656 break;
3578 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3579 { 3658 {
3580 char *s; 3659 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3582 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 */
3583 XFree (s); 3662 XFree (s);
3584 } 3663 }
3585 break; 3664 break;
3586 case 21: /* report window title */ 3665 case 21: /* report window title */
3587 { 3666 {
3588 char *s; 3667 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3590 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 */
3591 XFree (s); 3670 XFree (s);
3592 } 3671 }
3593 break; 3672 break;
3594 } 3673 }
3595} 3674}
… …
3622 seen_esc = true; 3701 seen_esc = true;
3623 continue; 3702 continue;
3624 } 3703 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3708 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3629 3710
3630 seen_esc = false; 3711 seen_esc = false;
3631 3712
3632 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3714 // stop at some sane length
3634 return NULL; 3715 return NULL;
3635 3716
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3717 string[n++] = ch;
3640 } 3718 }
3641 3719
3642 string[n++] = '\0'; 3720 string[n++] = '\0';
3643 3721
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3798 int color;
3721 char *buf, *name; 3799 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3801 int saveop = op;
3724 3802
3725 dLocal (Display *, xdisp); 3803 dLocal (Display *, dpy);
3726 3804
3727 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
3728 switch (op) 3810 switch (op)
3729 { 3811 {
3730 case XTerm_name: 3812 case XTerm_name:
3731 set_title (str); 3813 set_title (str);
3732 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3828 unsigned long bytes_after;
3747 unsigned char *value = 0; 3829 unsigned char *value = 0;
3748 const char *str = ""; 3830 const char *str = "";
3749 3831
3750 if (prop 3832 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3837 && actual_type != None
3756 && actual_format == 8) 3838 && actual_format == 8)
… …
3768 { 3850 {
3769 *eq = 0; 3851 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3771 } 3853 }
3772 else 3854 else
3773 XDeleteProperty (xdisp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3856 display->atom (str));
3775 } 3857 }
3776 break; 3858 break;
3777 3859
3778 case XTerm_Color: 3860 case XTerm_Color:
… …
3900 case URxvt_italicFont: 3982 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3902#endif 3984#endif
3903 if (query) 3985 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3989 resp);
3908 else 3990 else
3909 { 3991 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 4006 break;
3925 4007
3926#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
3927 case URxvt_locale: 4009 case URxvt_locale:
3928 if (query) 4010 if (query)
3929 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);
3930 else 4012 else
3931 { 4013 {
3932 set_locale (str); 4014 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 4016 init_xlocale ();
… …
3949 break; 4031 break;
3950#endif 4032#endif
3951 4033
3952#if ENABLE_PERL 4034#if ENABLE_PERL
3953 case URxvt_perl: 4035 case URxvt_perl:
3954 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)))
3955 ; // no responses yet 4037 ; // no responses yet
3956 break; 4038 break;
3957#endif 4039#endif
3958 } 4040 }
3959} 4041}
… …
4075 scr_touch (true); 4157 scr_touch (true);
4076 break; 4158 break;
4077#endif 4159#endif
4078 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4079 case 1049: 4161 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 4163 if (mode == 0)
4082 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4083 else if (mode == 1) 4165 else if (mode == 1)
4084 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4085 break; 4167 break;
… …
4150 break; 4232 break;
4151 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4153 break; 4235 break;
4154 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 4239 scr_erase_screen (2);
4158 scr_change_screen (state); 4240 scr_change_screen (state);
4159 break; 4241 break;
4160 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 4243 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 4246 scr_erase_screen (2);
4165 break; 4247 break;
4166 default: 4248 default:
4167 break; 4249 break;

Diff Legend

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