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

Diff Legend

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