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.322 by ayin, Wed May 2 23:06:32 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
869 return; 877 return;
870 878
871 if (len <= 0) 879 if (len <= 0)
872 return; /* not mapped */ 880 return; /* not mapped */
873 881
874 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 883 if (view_start)
876 { 884 {
877 view_start = 0; 885 view_start = 0;
878 want_refresh = 1; 886 want_refresh = 1;
879 } 887 }
… …
903 tt_write (&ch, 1); 911 tt_write (&ch, 1);
904 } 912 }
905 913
906 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
907} 915}
908/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
909 993
910#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
911unsigned int 995unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 997{
… …
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1175 }
1092} 1176}
1093#endif 1177#endif
1094 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1095bool 1204bool
1096rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1097{ 1206{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099 1208
… …
1114 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1115 return true; 1224 return true;
1116 } 1225 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1227 {
1119#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1120 if (display->is_local) 1229 if (display->is_local)
1121 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1122#endif 1231#endif
1123 } 1232 }
1124 else 1233 else
1125 { 1234 {
1126 pty_ev.stop (); 1235 pty_ev.stop ();
1127 1236
1128 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1129 destroy (); 1238 destroy ();
1130 } 1239 }
1131 1240
1132 return false; 1241 return false;
1133} 1242}
… …
1148} 1257}
1149 1258
1150void 1259void
1151rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1152{ 1261{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1263 recolour_cursor ();
1155 1264
1156#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1266 hidden_pointer = 0;
1158 1267
1159 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1270#endif
1162} 1271}
1163 1272
1164#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1165void 1274void
1166rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1167{ 1276{
1168 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1169 return; 1278 return;
1170 1279
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1281 XFlush (dpy);
1173 1282
1174 hidden_pointer = 1; 1283 hidden_pointer = 1;
1175} 1284}
1176 1285
1177void 1286void
… …
1256void 1365void
1257rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1258{ 1367{
1259 make_current (); 1368 make_current ();
1260 1369
1261 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1262 1371
1263 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1375 return;
… …
1271 unsigned int unused_mask; 1380 unsigned int unused_mask;
1272 1381
1273 switch (ev.type) 1382 switch (ev.type)
1274 { 1383 {
1275 case KeyPress: 1384 case KeyPress:
1276#if ISO_14755 1385 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1386 break;
1282 1387
1283 case KeyRelease: 1388 case KeyRelease:
1284 { 1389 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; 1390 break;
1356 }
1357 1391
1358 case ButtonPress: 1392 case ButtonPress:
1359 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1360 break; 1394 break;
1361 1395
… …
1376 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)))
1377 destroy (); 1411 destroy ();
1378 } 1412 }
1379#if ENABLE_EWMH 1413#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1417 &ev);
1384#endif 1418#endif
1385 } 1419 }
1386 } 1420 }
… …
1424 break; 1458 break;
1425 } 1459 }
1426 break; 1460 break;
1427 1461
1428 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1466 focus_in ();
1430 break; 1467 break;
1431 1468
1432 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1473 focus_out ();
1434 break; 1474 break;
1435 1475
1436 case ConfigureNotify: 1476 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1438 { 1478 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1480 ;
1441 1481
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1483 {
1444 seen_resize = 1; 1484 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1486 }
1447 1487
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 1489
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1451 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1452 check_our_parents (); 1492 check_our_parents ();
1453#endif 1493#endif
1454 } 1494 }
1455 break; 1495 break;
1456 1496
… …
1502 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1503 { 1543 {
1504 do 1544 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1548
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1550
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1514 1554
1515 want_refresh = 1; 1555 want_refresh = 1;
1516 } 1556 }
1517 else 1557 else
1518 { 1558 {
1519 XEvent unused_event; 1559 XEvent unused_event;
1520 1560
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1562 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1564 ;
1525 1565
1526 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1527 { 1567 {
1528 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1529 scrollbar_show (0); 1569 scrollbar_show (0);
1530 } 1570 }
1531 1571
1532#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1535#endif 1575#endif
1536 } 1576 }
1537 break; 1577 break;
1538 1578
1539 case MotionNotify: 1579 case MotionNotify:
… …
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1591 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1593 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1595 ;
1556 1596
1557 XQueryPointer (xdisp, vt, 1597 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1601 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1626#endif 1666#endif
1627 } 1667 }
1628 } 1668 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1670 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1633 ; 1673 ;
1634 1674
1635 XQueryPointer (xdisp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1679 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1644 scrollbar_show (1); 1684 scrollbar_show (1);
1645 } 1685 }
1646 break; 1686 break;
1647 } 1687 }
1648 1688
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1691 {
1654 if (hidden_cursor) 1692 if (hidden_cursor)
1655 { 1693 {
1656 hidden_cursor = 0; 1694 hidden_cursor = 0;
1657 want_refresh = 1; 1695 want_refresh = 1;
… …
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 } 1699 }
1662#endif 1700#endif
1663 1701
1664#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1704 {
1667 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1682 if (!focus) 1720 if (!focus)
1683 { 1721 {
1684 focus = 1; 1722 focus = 1;
1685 want_refresh = 1; 1723 want_refresh = 1;
1686 1724
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1726
1689#if USE_XIM 1727#if USE_XIM
1690 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1691 { 1729 {
1692 IMSetStatusPosition (); 1730 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1694 } 1732 }
1695#endif 1733#endif
1696#if CURSOR_BLINK 1734#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif 1737#endif
1700#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1702 { 1740 {
1703 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1705 } 1756 }
1706#endif 1757#endif
1707 } 1758 }
1708} 1759}
1709 1760
… …
1729#if USE_XIM 1780#if USE_XIM
1730 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1732#endif 1783#endif
1733#if CURSOR_BLINK 1784#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1736 hidden_cursor = 0; 1787 hidden_cursor = 0;
1737#endif 1788#endif
1738#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1743 } 1794 }
1744#endif 1795#endif
1745 } 1796 }
1746} 1797}
1747 1798
1748#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1749void 1813void
1750rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1815{
1752 make_current (); 1816 make_current ();
1753 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1754 switch (ev.type) 1823 switch (ev.type)
1755 { 1824 {
1756 case PropertyNotify: 1825 case PropertyNotify:
1757 /* 1826 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
… …
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1763 return; 1832 return;
1764 1833
1765 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1766 case ReparentNotify: 1835 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1769 break; 1838 break;
1770 } 1839 }
1840# endif
1771} 1841}
1772#endif 1842#endif
1773 1843
1774void 1844void
1775rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
… …
2103 selection_make (ev.time); 2173 selection_make (ev.time);
2104 break; 2174 break;
2105 2175
2106 case Button2: 2176 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2179 break;
2110 2180
2111#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2112 case Button4: 2182 case Button4:
2113 case Button5: 2183 case Button5:
… …
2117 2187
2118 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2119 2189
2120 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2121 i = 1; 2191 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2193 i = nrow - 1;
2124 else 2194 else
2125 i = 5; 2195 i = 5;
2126 2196
2127# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2398 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2400 2470
2401 pchanged = 0; 2471 pchanged = 0;
2402 2472
2403 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2404 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2405 2475
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2408 2478
2409 XGetWindowAttributes (xdisp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2410 2480
2411 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2412 { 2482 {
2413 if (am_transparent) 2483 if (am_transparent)
2414 { 2484 {
2415 pchanged = 1; 2485 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2418 } 2488 }
2419 2489
2420 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2421 } 2491 }
2422 2492
2423 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False); 2494 XSync (dpy, False);
2425 2495
2426 /* 2496 /*
2427 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2430 */ 2500 */
2431 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2435 2505
2436 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2441 2511
2442 if (!i || prop == NULL 2512 if (!i || prop == NULL
2443#if TINTING 2513#if TINTING
… …
2462 Window cr; 2532 Window cr;
2463 XImage *image; 2533 XImage *image;
2464 GC gc; 2534 GC gc;
2465 XGCValues gcvalue; 2535 XGCValues gcvalue;
2466 2536
2467 XTranslateCoordinates (xdisp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2471 nx = ny = 0; 2541 nx = ny = 0;
2472 2542
… …
2485 } 2555 }
2486 2556
2487 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489 2559
2490 XSync (xdisp, False); 2560 XSync (dpy, False);
2491 allowedxerror = -1; 2561 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493 2563
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2496 allowedxerror = 0; 2566 allowedxerror = 0;
2497 2567
… …
2500 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2501 { 2571 {
2502 pchanged = 1; 2572 pchanged = 1;
2503 if (pixmap != None) 2573 if (pixmap != None)
2504 { 2574 {
2505 XFreePixmap (xdisp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2506 pixmap = None; 2576 pixmap = None;
2507 } 2577 }
2508 } 2578 }
2509 2579
2510 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2511 } 2581 }
2512 else 2582 else
2513 { 2583 {
2514 if (pixmap != None) 2584 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2516 2586
2517#if TINTING 2587#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2519 { 2589 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2524 2594
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 } 2596 }
2527#endif 2597#endif
2528 2598
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc); 2603 XFreeGC (dpy, gc);
2534 XDestroyImage (image); 2604 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2537 2607
2538 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1; 2609 pchanged = 1;
2540 2610
2541 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2542 } 2612 }
2543 } 2613 }
2544 2614
2545 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547 else 2617 else
2548 { 2618 {
2549 unsigned int n; 2619 unsigned int n;
2550 /* 2620 /*
2551 * InheritPixmap transparency 2621 * InheritPixmap transparency
2552 */ 2622 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 { 2624 {
2555 oldp = parent[i]; 2625 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list); 2627 XFree (list);
2558 2628
2559 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2560 { 2630 {
2561 if (oldp != None) 2631 if (oldp != None)
… …
2571 n = 0; 2641 n = 0;
2572 2642
2573 if (pchanged) 2643 if (pchanged)
2574 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2575 { 2645 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2577 2647
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 { 2649 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break; 2651 break;
2582 } 2652 }
2583 } 2653 }
2584 2654
2585 if (n > (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 { 2656 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0; 2659 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2591 } 2661 }
2592 else 2662 else
2593 { 2663 {
2594 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2595 { 2665 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2598 } 2668 }
2599 2669
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601 am_transparent = 1; 2671 am_transparent = 1;
2602 } 2672 }
2603 2673
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None; 2675 parent[i] = None;
2606 } 2676 }
2607 2677
2608 if (scrollBar.win) 2678 if (scrollBar.win)
2609 { 2679 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2612 scrollbar_show (0); 2682 scrollbar_show (0);
2613 } 2683 }
2614 2684
2615 if (am_transparent) 2685 if (am_transparent)
… …
2678 if (ch == C0_LF) 2748 if (ch == C0_LF)
2679 nlines++; 2749 nlines++;
2680 2750
2681 refresh_count++; 2751 refresh_count++;
2682 2752
2683 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2684 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2755 {
2686 refreshnow = true; 2756 refreshnow = true;
2687 refresh_count = 0; 2757 refresh_count = 0;
2688 ch = NOCHAR; 2758 ch = NOCHAR;
… …
2728 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2729 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2800 */
2731 if (refreshnow) 2801 if (refreshnow)
2732 { 2802 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++; 2804 refresh_limit++;
2735 else 2805 else
2736 { 2806 {
2737 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2738 scr_refresh (); 2809 scr_refresh ();
2739 want_refresh = 1; 2810 want_refresh = 1;
2740 } 2811 }
2741 } 2812 }
2742 2813
… …
3403 break; 3474 break;
3404 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3405 scr_report_position (); 3476 scr_report_position ();
3406 break; 3477 break;
3407 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3481 break;
3411 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3484 break;
… …
3506{ 3577{
3507 int x, y; 3578 int x, y;
3508 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3509 Window wdummy; 3580 Window wdummy;
3510 3581
3511 dLocal (Display *, xdisp); 3582 dLocal (Display *, dpy);
3512 3583
3513 if (nargs == 0) 3584 if (nargs == 0)
3514 return; 3585 return;
3515 3586
3516 switch (args[0]) 3587 switch (args[0])
3517 { 3588 {
3518 /* 3589 /*
3519 * commands 3590 * commands
3520 */ 3591 */
3521 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3523 break; 3594 break;
3524 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3597 break;
3527 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3600 break;
3530 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3603 break;
3533 case 5: /* raise window */ 3604 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3535 break; 3606 break;
3536 case 6: /* lower window */ 3607 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3538 break; 3609 break;
3539 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3540 scr_touch (true); 3611 scr_touch (true);
3541 break; 3612 break;
3542 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3553 3624
3554 /* 3625 /*
3555 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3556 */ 3627 */
3557 case 11: /* report window state */ 3628 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3631 break;
3561 case 13: /* report window position */ 3632 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3638 break;
3568 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3642 break;
3572 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3645 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3648 break;
3578 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3579 { 3650 {
3580 char *s; 3651 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3654 XFree (s);
3584 } 3655 }
3585 break; 3656 break;
3586 case 21: /* report window title */ 3657 case 21: /* report window title */
3587 { 3658 {
3588 char *s; 3659 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3590 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 */
3591 XFree (s); 3662 XFree (s);
3592 } 3663 }
3593 break; 3664 break;
3594 } 3665 }
3595} 3666}
… …
3622 seen_esc = true; 3693 seen_esc = true;
3623 continue; 3694 continue;
3624 } 3695 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3700 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3629 3702
3630 seen_esc = false; 3703 seen_esc = false;
3631 3704
3632 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3706 // stop at some sane length
3634 return NULL; 3707 return NULL;
3635 3708
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3709 string[n++] = ch;
3640 } 3710 }
3641 3711
3642 string[n++] = '\0'; 3712 string[n++] = '\0';
3643 3713
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3790 int color;
3721 char *buf, *name; 3791 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3793 int saveop = op;
3724 3794
3725 dLocal (Display *, xdisp); 3795 dLocal (Display *, dpy);
3726 3796
3727 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3728 switch (op) 3802 switch (op)
3729 { 3803 {
3730 case XTerm_name: 3804 case XTerm_name:
3731 set_title (str); 3805 set_title (str);
3732 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3820 unsigned long bytes_after;
3747 unsigned char *value = 0; 3821 unsigned char *value = 0;
3748 const char *str = ""; 3822 const char *str = "";
3749 3823
3750 if (prop 3824 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3829 && actual_type != None
3756 && actual_format == 8) 3830 && actual_format == 8)
… …
3768 { 3842 {
3769 *eq = 0; 3843 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3771 } 3845 }
3772 else 3846 else
3773 XDeleteProperty (xdisp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3848 display->atom (str));
3775 } 3849 }
3776 break; 3850 break;
3777 3851
3778 case XTerm_Color: 3852 case XTerm_Color:
… …
3900 case URxvt_italicFont: 3974 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3902#endif 3976#endif
3903 if (query) 3977 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3981 resp);
3908 else 3982 else
3909 { 3983 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3998 break;
3925 3999
3926#if !ENABLE_MINIMAL 4000#if !ENABLE_MINIMAL
3927 case URxvt_locale: 4001 case URxvt_locale:
3928 if (query) 4002 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 4004 else
3931 { 4005 {
3932 set_locale (str); 4006 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 4008 init_xlocale ();
… …
3949 break; 4023 break;
3950#endif 4024#endif
3951 4025
3952#if ENABLE_PERL 4026#if ENABLE_PERL
3953 case URxvt_perl: 4027 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3955 ; // no responses yet 4029 ; // no responses yet
3956 break; 4030 break;
3957#endif 4031#endif
3958 } 4032 }
3959} 4033}
… …
4075 scr_touch (true); 4149 scr_touch (true);
4076 break; 4150 break;
4077#endif 4151#endif
4078 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4079 case 1049: 4153 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 4155 if (mode == 0)
4082 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4083 else if (mode == 1) 4157 else if (mode == 1)
4084 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4085 break; 4159 break;
… …
4150 break; 4224 break;
4151 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4153 break; 4227 break;
4154 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 4231 scr_erase_screen (2);
4158 scr_change_screen (state); 4232 scr_change_screen (state);
4159 break; 4233 break;
4160 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 4235 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 4238 scr_erase_screen (2);
4165 break; 4239 break;
4166 default: 4240 default:
4167 break; 4241 break;

Diff Legend

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