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.296 by root, Tue Jan 31 14:16:59 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>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ Convert the keypress event into a string */
305void 303void
306rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
307{ 305{
308 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
309 unsigned int newlen; 307 unsigned int newlen;
310 KeySym keysym; 308 KeySym keysym;
311 int valid_keysym; 309 int valid_keysym;
312 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
313 316
314 /* 317 /*
315 * 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
316 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
317 * 320 *
… …
874 return; 877 return;
875 878
876 if (len <= 0) 879 if (len <= 0)
877 return; /* not mapped */ 880 return; /* not mapped */
878 881
879 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 883 if (view_start)
881 { 884 {
882 view_start = 0; 885 view_start = 0;
883 want_refresh = 1; 886 want_refresh = 1;
884 } 887 }
… …
908 tt_write (&ch, 1); 911 tt_write (&ch, 1);
909 } 912 }
910 913
911 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
912} 915}
913/*}}} */ 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}
914 993
915#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
916unsigned int 995unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 997{
… …
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1175 }
1097} 1176}
1098#endif 1177#endif
1099 1178
1100#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1101static struct event_handler 1180static struct event_handler
1102{ 1181{
1103 check_watcher cw_yield; 1182 check_watcher yield_ev;
1104 1183
1105 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1106 { 1185 {
1107 sched_yield (); 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
1108 w.stop (); 1194 w.stop ();
1109 } 1195 }
1110 1196
1111 event_handler () 1197 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1113 { 1199 {
1114 } 1200 }
1115} event_handler; 1201} event_handler;
1116#endif 1202#endif
1117 1203
… …
1137 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1138 return true; 1224 return true;
1139 } 1225 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1227 {
1142#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1143 if (display->is_local) 1229 if (display->is_local)
1144 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1145#endif 1231#endif
1146 } 1232 }
1147 else 1233 else
1148 { 1234 {
1149 pty_ev.stop (); 1235 pty_ev.stop ();
1150 1236
1151 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1152 destroy (); 1238 destroy ();
1153 } 1239 }
1154 1240
1155 return false; 1241 return false;
1156} 1242}
… …
1171} 1257}
1172 1258
1173void 1259void
1174rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1175{ 1261{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1263 recolour_cursor ();
1178 1264
1179#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1266 hidden_pointer = 0;
1181 1267
1182 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1184#endif 1270#endif
1185} 1271}
1186 1272
1187#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1188void 1274void
1189rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1190{ 1276{
1191 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1192 return; 1278 return;
1193 1279
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1281 XFlush (dpy);
1196 1282
1197 hidden_pointer = 1; 1283 hidden_pointer = 1;
1198} 1284}
1199 1285
1200void 1286void
… …
1279void 1365void
1280rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1281{ 1367{
1282 make_current (); 1368 make_current ();
1283 1369
1284 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1285 1371
1286 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1375 return;
… …
1294 unsigned int unused_mask; 1380 unsigned int unused_mask;
1295 1381
1296 switch (ev.type) 1382 switch (ev.type)
1297 { 1383 {
1298 case KeyPress: 1384 case KeyPress:
1299#if ISO_14755 1385 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1386 break;
1305 1387
1306 case KeyRelease: 1388 case KeyRelease:
1307 { 1389 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1390 break;
1379 }
1380 1391
1381 case ButtonPress: 1392 case ButtonPress:
1382 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1383 break; 1394 break;
1384 1395
… …
1399 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)))
1400 destroy (); 1411 destroy ();
1401 } 1412 }
1402#if ENABLE_EWMH 1413#if ENABLE_EWMH
1403 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])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1417 &ev);
1407#endif 1418#endif
1408 } 1419 }
1409 } 1420 }
… …
1447 break; 1458 break;
1448 } 1459 }
1449 break; 1460 break;
1450 1461
1451 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1466 focus_in ();
1453 break; 1467 break;
1454 1468
1455 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1473 focus_out ();
1457 break; 1474 break;
1458 1475
1459 case ConfigureNotify: 1476 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1461 { 1478 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1480 ;
1464 1481
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1483 {
1467 seen_resize = 1; 1484 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1486 }
1470 1487
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 1489
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1474 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1475 check_our_parents (); 1492 check_our_parents ();
1476#endif 1493#endif
1477 } 1494 }
1478 break; 1495 break;
1479 1496
… …
1525 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1526 { 1543 {
1527 do 1544 do
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1548
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1550
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1537 1554
1538 want_refresh = 1; 1555 want_refresh = 1;
1539 } 1556 }
1540 else 1557 else
1541 { 1558 {
1542 XEvent unused_event; 1559 XEvent unused_event;
1543 1560
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1562 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1564 ;
1548 1565
1549 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1550 { 1567 {
1551 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1552 scrollbar_show (0); 1569 scrollbar_show (0);
1553 } 1570 }
1554 1571
1555#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1558#endif 1575#endif
1559 } 1576 }
1560 break; 1577 break;
1561 1578
1562 case MotionNotify: 1579 case MotionNotify:
… …
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1591 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1593 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1595 ;
1579 1596
1580 XQueryPointer (xdisp, vt, 1597 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1601 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1649#endif 1666#endif
1650 } 1667 }
1651 } 1668 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653 { 1670 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1656 ; 1673 ;
1657 1674
1658 XQueryPointer (xdisp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1679 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 scrollbar_show (1); 1684 scrollbar_show (1);
1668 } 1685 }
1669 break; 1686 break;
1670 } 1687 }
1671 1688
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1691 {
1677 if (hidden_cursor) 1692 if (hidden_cursor)
1678 { 1693 {
1679 hidden_cursor = 0; 1694 hidden_cursor = 0;
1680 want_refresh = 1; 1695 want_refresh = 1;
… …
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 } 1699 }
1685#endif 1700#endif
1686 1701
1687#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1704 {
1690 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1705 if (!focus) 1720 if (!focus)
1706 { 1721 {
1707 focus = 1; 1722 focus = 1;
1708 want_refresh = 1; 1723 want_refresh = 1;
1709 1724
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1726
1712#if USE_XIM 1727#if USE_XIM
1713 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1714 { 1729 {
1715 IMSetStatusPosition (); 1730 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1717 } 1732 }
1718#endif 1733#endif
1719#if CURSOR_BLINK 1734#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif 1737#endif
1723#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1725 { 1740 {
1726 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1727 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 }
1728 } 1756 }
1729#endif 1757#endif
1730 } 1758 }
1731} 1759}
1732 1760
… …
1752#if USE_XIM 1780#if USE_XIM
1753 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1755#endif 1783#endif
1756#if CURSOR_BLINK 1784#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1759 hidden_cursor = 0; 1787 hidden_cursor = 0;
1760#endif 1788#endif
1761#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1766 } 1794 }
1767#endif 1795#endif
1768 } 1796 }
1769} 1797}
1770 1798
1771#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
1772void 1813void
1773rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1815{
1775 make_current (); 1816 make_current ();
1776 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
1777 switch (ev.type) 1823 switch (ev.type)
1778 { 1824 {
1779 case PropertyNotify: 1825 case PropertyNotify:
1780 /* 1826 /*
1781 * 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,
… …
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1786 return; 1832 return;
1787 1833
1788 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1789 case ReparentNotify: 1835 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1792 break; 1838 break;
1793 } 1839 }
1840# endif
1794} 1841}
1795#endif 1842#endif
1796 1843
1797void 1844void
1798rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
… …
2126 selection_make (ev.time); 2173 selection_make (ev.time);
2127 break; 2174 break;
2128 2175
2129 case Button2: 2176 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2179 break;
2133 2180
2134#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2135 case Button4: 2182 case Button4:
2136 case Button5: 2183 case Button5:
… …
2140 2187
2141 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2142 2189
2143 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2144 i = 1; 2191 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2193 i = nrow - 1;
2147 else 2194 else
2148 i = 5; 2195 i = 5;
2149 2196
2150# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2421 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2423 2470
2424 pchanged = 0; 2471 pchanged = 0;
2425 2472
2426 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2427 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2428 2475
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2431 2478
2432 XGetWindowAttributes (xdisp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2433 2480
2434 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2435 { 2482 {
2436 if (am_transparent) 2483 if (am_transparent)
2437 { 2484 {
2438 pchanged = 1; 2485 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2441 } 2488 }
2442 2489
2443 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2444 } 2491 }
2445 2492
2446 /* 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. */
2447 XSync (xdisp, False); 2494 XSync (dpy, False);
2448 2495
2449 /* 2496 /*
2450 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2452 * 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.
2453 */ 2500 */
2454 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2458 2505
2459 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2464 2511
2465 if (!i || prop == NULL 2512 if (!i || prop == NULL
2466#if TINTING 2513#if TINTING
2467 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2468#endif 2515#endif
2469 ) 2516 )
2470 have_pixmap = 0; 2517 have_pixmap = 0;
2471 else 2518 else
2472 { 2519 {
… …
2485 Window cr; 2532 Window cr;
2486 XImage *image; 2533 XImage *image;
2487 GC gc; 2534 GC gc;
2488 XGCValues gcvalue; 2535 XGCValues gcvalue;
2489 2536
2490 XTranslateCoordinates (xdisp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2494 nx = ny = 0; 2541 nx = ny = 0;
2495 2542
… …
2508 } 2555 }
2509 2556
2510 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512 2559
2513 XSync (xdisp, False); 2560 XSync (dpy, False);
2514 allowedxerror = -1; 2561 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516 2563
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2519 allowedxerror = 0; 2566 allowedxerror = 0;
2520 2567
… …
2523 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2524 { 2571 {
2525 pchanged = 1; 2572 pchanged = 1;
2526 if (pixmap != None) 2573 if (pixmap != None)
2527 { 2574 {
2528 XFreePixmap (xdisp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2529 pixmap = None; 2576 pixmap = None;
2530 } 2577 }
2531 } 2578 }
2532 2579
2533 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2534 } 2581 }
2535 else 2582 else
2536 { 2583 {
2537 if (pixmap != None) 2584 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2539 2586
2540#if TINTING 2587#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2589 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544 2591
2545 rxvt_rgba c; 2592 rgba c;
2546 pix_colors_focused [Color_tint].get (this, c); 2593 pix_colors_focused [Color_tint].get (c);
2547 2594
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 } 2596 }
2550#endif 2597#endif
2551 2598
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc); 2603 XFreeGC (dpy, gc);
2557 XDestroyImage (image); 2604 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2560 2607
2561 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1; 2609 pchanged = 1;
2563 2610
2564 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2565 } 2612 }
2566 } 2613 }
2567 2614
2568 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2570 else 2617 else
2571 { 2618 {
2572 unsigned int n; 2619 unsigned int n;
2573 /* 2620 /*
2574 * InheritPixmap transparency 2621 * InheritPixmap transparency
2575 */ 2622 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2624 {
2578 oldp = parent[i]; 2625 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2580 &parent[i], &list, &n);
2581 XFree (list); 2627 XFree (list);
2582 2628
2583 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2584 { 2630 {
2585 if (oldp != None) 2631 if (oldp != None)
… …
2593 } 2639 }
2594 2640
2595 n = 0; 2641 n = 0;
2596 2642
2597 if (pchanged) 2643 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2600 { 2645 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 { 2649 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break; 2651 break;
2606 } 2652 }
2607 } 2653 }
2608 }
2609 2654
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2611 { 2656 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0; 2659 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2616 } 2661 }
2617 else 2662 else
2618 { 2663 {
2619 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2620 { 2665 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2623 } 2668 }
2624 2669
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2626 am_transparent = 1; 2671 am_transparent = 1;
2627 } 2672 }
2628 2673
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None; 2675 parent[i] = None;
2631 } 2676 }
2632 2677
2633 if (scrollBar.win) 2678 if (scrollBar.win)
2634 { 2679 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2637 scrollbar_show (0); 2682 scrollbar_show (0);
2638 } 2683 }
2639 2684
2640 if (am_transparent) 2685 if (am_transparent)
… …
2703 if (ch == C0_LF) 2748 if (ch == C0_LF)
2704 nlines++; 2749 nlines++;
2705 2750
2706 refresh_count++; 2751 refresh_count++;
2707 2752
2708 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2709 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2755 {
2711 refreshnow = true; 2756 refreshnow = true;
2712 refresh_count = 0; 2757 refresh_count = 0;
2713 ch = NOCHAR; 2758 ch = NOCHAR;
… …
2753 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2754 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2800 */
2756 if (refreshnow) 2801 if (refreshnow)
2757 { 2802 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++; 2804 refresh_limit++;
2760 else 2805 else
2761 { 2806 {
2762 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2763 scr_refresh (); 2809 scr_refresh ();
2764 want_refresh = 1; 2810 want_refresh = 1;
2765 } 2811 }
2766 } 2812 }
2767 2813
… …
3428 break; 3474 break;
3429 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3430 scr_report_position (); 3476 scr_report_position ();
3431 break; 3477 break;
3432 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 3481 break;
3436 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 3484 break;
… …
3531{ 3577{
3532 int x, y; 3578 int x, y;
3533 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3534 Window wdummy; 3580 Window wdummy;
3535 3581
3536 dLocal (Display *, xdisp); 3582 dLocal (Display *, dpy);
3537 3583
3538 if (nargs == 0) 3584 if (nargs == 0)
3539 return; 3585 return;
3540 3586
3541 switch (args[0]) 3587 switch (args[0])
3542 { 3588 {
3543 /* 3589 /*
3544 * commands 3590 * commands
3545 */ 3591 */
3546 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3548 break; 3594 break;
3549 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3597 break;
3552 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3600 break;
3555 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3603 break;
3558 case 5: /* raise window */ 3604 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3560 break; 3606 break;
3561 case 6: /* lower window */ 3607 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3563 break; 3609 break;
3564 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3565 scr_touch (true); 3611 scr_touch (true);
3566 break; 3612 break;
3567 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3621 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3622 (unsigned int) (args[1] * fheight));
3577 break; 3623 break;
3578 3624
3579
3580 /* 3625 /*
3581 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3582 */ 3627 */
3583 case 11: /* report window state */ 3628 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3631 break;
3587 case 13: /* report window position */ 3632 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3638 break;
3594 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3642 break;
3598 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3645 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3648 break;
3604 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3605 { 3650 {
3606 char *s; 3651 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3608 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 */
3609 XFree (s); 3654 XFree (s);
3610 } 3655 }
3611 break; 3656 break;
3612 case 21: /* report window title */ 3657 case 21: /* report window title */
3613 { 3658 {
3614 char *s; 3659 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3616 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 */
3617 XFree (s); 3662 XFree (s);
3618 } 3663 }
3619 break; 3664 break;
3620 } 3665 }
3621} 3666}
… …
3648 seen_esc = true; 3693 seen_esc = true;
3649 continue; 3694 continue;
3650 } 3695 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3700 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3655 3702
3656 seen_esc = false; 3703 seen_esc = false;
3657 3704
3658 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3706 // stop at some sane length
3660 return NULL; 3707 return NULL;
3661 3708
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3709 string[n++] = ch;
3666 } 3710 }
3667 3711
3668 string[n++] = '\0'; 3712 string[n++] = '\0';
3669 3713
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3765void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3767{
3724 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3725 { 3769 {
3726 rxvt_rgba c; 3770 rgba c;
3727 pix_colors_focused[color].get (this, c); 3771 pix_colors_focused[color].get (c);
3728 3772
3729#if XFT 3773#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3774 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3776 else
3733#endif 3777#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3779 }
… …
3746 int color; 3790 int color;
3747 char *buf, *name; 3791 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3793 int saveop = op;
3750 3794
3751 dLocal (Display *, xdisp); 3795 dLocal (Display *, dpy);
3752 3796
3753 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
3754 switch (op) 3802 switch (op)
3755 { 3803 {
3756 case XTerm_name: 3804 case XTerm_name:
3757 set_title (str); 3805 set_title (str);
3758 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3820 unsigned long bytes_after;
3773 unsigned char *value = 0; 3821 unsigned char *value = 0;
3774 const char *str = ""; 3822 const char *str = "";
3775 3823
3776 if (prop 3824 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3829 && actual_type != None
3782 && actual_format == 8) 3830 && actual_format == 8)
… …
3794 { 3842 {
3795 *eq = 0; 3843 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3797 } 3845 }
3798 else 3846 else
3799 XDeleteProperty (xdisp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3848 display->atom (str));
3801 } 3849 }
3802 break; 3850 break;
3803 3851
3804 case XTerm_Color: 3852 case XTerm_Color:
… …
3853 break; 3901 break;
3854#endif 3902#endif
3855#if TRANSPARENT && TINTING 3903#if TRANSPARENT && TINTING
3856 case URxvt_Color_tint: 3904 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3905 process_color_seq (op, Color_tint, str, resp);
3906
3858 check_our_parents (); 3907 check_our_parents ();
3908
3859 if (am_transparent) 3909 if (am_transparent)
3860 want_full_refresh = want_refresh = 1; 3910 want_full_refresh = want_refresh = 1;
3911
3861 break; 3912 break;
3862#endif 3913#endif
3863 3914
3864 case Rxvt_Pixmap: 3915 case Rxvt_Pixmap:
3865 { 3916 {
… …
3923 case URxvt_italicFont: 3974 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3925#endif 3976#endif
3926 if (query) 3977 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3981 resp);
3931 else 3982 else
3932 { 3983 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3998 break;
3948 3999
3949#if !ENABLE_MINIMAL 4000#if !ENABLE_MINIMAL
3950 case URxvt_locale: 4001 case URxvt_locale:
3951 if (query) 4002 if (query)
3952 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);
3953 else 4004 else
3954 { 4005 {
3955 set_locale (str); 4006 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 4008 init_xlocale ();
… …
3972 break; 4023 break;
3973#endif 4024#endif
3974 4025
3975#if ENABLE_PERL 4026#if ENABLE_PERL
3976 case URxvt_perl: 4027 case URxvt_perl:
3977 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)))
3978 ; // no responses yet 4029 ; // no responses yet
3979 break; 4030 break;
3980#endif 4031#endif
3981 } 4032 }
3982} 4033}
… …
4098 scr_touch (true); 4149 scr_touch (true);
4099 break; 4150 break;
4100#endif 4151#endif
4101 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4102 case 1049: 4153 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 4155 if (mode == 0)
4105 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4106 else if (mode == 1) 4157 else if (mode == 1)
4107 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4108 break; 4159 break;
… …
4173 break; 4224 break;
4174 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4176 break; 4227 break;
4177 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 4231 scr_erase_screen (2);
4181 scr_change_screen (state); 4232 scr_change_screen (state);
4182 break; 4233 break;
4183 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 4235 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 4238 scr_erase_screen (2);
4188 break; 4239 break;
4189 default: 4240 default:
4190 break; 4241 break;

Diff Legend

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