ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
489 { 497 {
490 commit_iso14755 (); 498 commit_iso14755 ();
491 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
492# if ISO_14755 500# if ISO_14755
493 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
494# endif 510# endif
495 return; 511 return;
496 } 512 }
497 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
498 { 514 {
… …
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
… …
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1183 }
1092} 1184}
1093#endif 1185#endif
1094 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1095bool 1212bool
1096rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1097{ 1214{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099 1216
… …
1114 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1115 return true; 1232 return true;
1116 } 1233 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1235 {
1119#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1120 if (display->is_local) 1237 if (display->is_local)
1121 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1122#endif 1239#endif
1123 } 1240 }
1124 else 1241 else
1125 { 1242 {
1126 pty_ev.stop (); 1243 pty_ev.stop ();
1127 1244
1128 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1129 destroy (); 1246 destroy ();
1130 } 1247 }
1131 1248
1132 return false; 1249 return false;
1133} 1250}
… …
1148} 1265}
1149 1266
1150void 1267void
1151rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1152{ 1269{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1271 recolour_cursor ();
1155 1272
1156#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1274 hidden_pointer = 0;
1158 1275
1159 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1278#endif
1162} 1279}
1163 1280
1164#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1165void 1282void
1166rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1167{ 1284{
1168 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1169 return; 1286 return;
1170 1287
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1289 XFlush (dpy);
1173 1290
1174 hidden_pointer = 1; 1291 hidden_pointer = 1;
1175} 1292}
1176 1293
1177void 1294void
… …
1256void 1373void
1257rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1258{ 1375{
1259 make_current (); 1376 make_current ();
1260 1377
1261 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1262 1379
1263 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1383 return;
… …
1271 unsigned int unused_mask; 1388 unsigned int unused_mask;
1272 1389
1273 switch (ev.type) 1390 switch (ev.type)
1274 { 1391 {
1275 case KeyPress: 1392 case KeyPress:
1276#if ISO_14755 1393 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1394 break;
1282 1395
1283 case KeyRelease: 1396 case KeyRelease:
1284 { 1397 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1398 break;
1356 }
1357 1399
1358 case ButtonPress: 1400 case ButtonPress:
1359 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1360 break; 1402 break;
1361 1403
… …
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1419 destroy ();
1378 } 1420 }
1379#if ENABLE_EWMH 1421#if ENABLE_EWMH
1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1425 &ev);
1384#endif 1426#endif
1385 } 1427 }
1386 } 1428 }
… …
1424 break; 1466 break;
1425 } 1467 }
1426 break; 1468 break;
1427 1469
1428 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1474 focus_in ();
1430 break; 1475 break;
1431 1476
1432 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1481 focus_out ();
1434 break; 1482 break;
1435 1483
1436 case ConfigureNotify: 1484 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1438 { 1486 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1488 ;
1441 1489
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1491 {
1444 seen_resize = 1; 1492 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1446 } 1501 }
1447 1502
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 1504
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1451 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1452 check_our_parents (); 1507 check_our_parents ();
1453#endif 1508#endif
1454 } 1509 }
1455 break; 1510 break;
1456 1511
… …
1502 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1503 { 1558 {
1504 do 1559 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1563
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1565
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1514 1569
1515 want_refresh = 1; 1570 want_refresh = 1;
1516 } 1571 }
1517 else 1572 else
1518 { 1573 {
1519 XEvent unused_event; 1574 XEvent unused_event;
1520 1575
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1577 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1579 ;
1525 1580
1526 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1527 { 1582 {
1528 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1529 scrollbar_show (0); 1584 scrollbar_show (0);
1530 } 1585 }
1531 1586
1532#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1535#endif 1590#endif
1536 } 1591 }
1537 break; 1592 break;
1538 1593
1539 case MotionNotify: 1594 case MotionNotify:
… …
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1606 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1608 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1610 ;
1556 1611
1557 XQueryPointer (xdisp, vt, 1612 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1616 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1626#endif 1681#endif
1627 } 1682 }
1628 } 1683 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1685 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1633 ; 1688 ;
1634 1689
1635 XQueryPointer (xdisp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1694 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1644 scrollbar_show (1); 1699 scrollbar_show (1);
1645 } 1700 }
1646 break; 1701 break;
1647 } 1702 }
1648 1703
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1706 {
1654 if (hidden_cursor) 1707 if (hidden_cursor)
1655 { 1708 {
1656 hidden_cursor = 0; 1709 hidden_cursor = 0;
1657 want_refresh = 1; 1710 want_refresh = 1;
… …
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 } 1714 }
1662#endif 1715#endif
1663 1716
1664#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1719 {
1667 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1682 if (!focus) 1735 if (!focus)
1683 { 1736 {
1684 focus = 1; 1737 focus = 1;
1685 want_refresh = 1; 1738 want_refresh = 1;
1686 1739
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1741
1689#if USE_XIM 1742#if USE_XIM
1690 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1691 { 1744 {
1692 IMSetStatusPosition (); 1745 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1694 } 1747 }
1695#endif 1748#endif
1696#if CURSOR_BLINK 1749#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif 1752#endif
1700#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1702 { 1755 {
1703 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1705 } 1771 }
1706#endif 1772#endif
1707 } 1773 }
1708} 1774}
1709 1775
… …
1729#if USE_XIM 1795#if USE_XIM
1730 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1732#endif 1798#endif
1733#if CURSOR_BLINK 1799#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1736 hidden_cursor = 0; 1802 hidden_cursor = 0;
1737#endif 1803#endif
1738#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1743 } 1809 }
1744#endif 1810#endif
1745 } 1811 }
1746} 1812}
1747 1813
1748#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1749void 1828void
1750rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1830{
1752 make_current (); 1831 make_current ();
1753 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1754 switch (ev.type) 1838 switch (ev.type)
1755 { 1839 {
1756 case PropertyNotify: 1840 case PropertyNotify:
1757 /* 1841 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1763 return; 1847 return;
1764 1848
1765 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1766 case ReparentNotify: 1850 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1768 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1769 break; 1853 break;
1770 } 1854 }
1855# endif
1771} 1856}
1772#endif 1857#endif
1773 1858
1774void 1859void
1775rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2103 selection_make (ev.time); 2188 selection_make (ev.time);
2104 break; 2189 break;
2105 2190
2106 case Button2: 2191 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2194 break;
2110 2195
2111#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2112 case Button4: 2197 case Button4:
2113 case Button5: 2198 case Button5:
… …
2117 2202
2118 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2119 2204
2120 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2121 i = 1; 2206 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2208 i = nrow - 1;
2124 else 2209 else
2125 i = 5; 2210 i = 5;
2126 2211
2127# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2150 } 2235 }
2151 } 2236 }
2152} 2237}
2153 2238
2154#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2155#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2156/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2157 2242
2158typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2159 2244
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
… …
2388 * Do transparency updates if required 2473 * Do transparency updates if required
2389 */ 2474 */
2390int 2475int
2391rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2392{ 2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2393 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2395 Atom atype; 2488 Atom atype;
2396 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2397 Window root, oldp, *list; 2490 Window root, oldp, *list;
2398 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2400 2495
2401 pchanged = 0; 2496 pchanged = 0;
2402 2497
2403 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2404 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2405 2500
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2408 2503
2409 XGetWindowAttributes (xdisp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2410 2505
2411 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2412 { 2507 {
2413 if (am_transparent) 2508 if (am_transparent)
2414 { 2509 {
2415 pchanged = 1; 2510 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2418 } 2513 }
2419 2514
2420 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2421 } 2516 }
2422 2517
2423 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False); 2519 XSync (dpy, False);
2425 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2426 /* 2528 /*
2427 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
2430 */ 2532 */
2431 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2435 2537
2436 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2441 2543
2442 if (!i || prop == NULL 2544 if (!i || prop == NULL
2443#if TINTING 2545#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint) 2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2445#endif 2551#endif
2446 ) 2552 )
2447 have_pixmap = 0; 2553 have_pixmap = 0;
2448 else 2554 else
2449 { 2555 {
… …
2452 XFree (prop); 2558 XFree (prop);
2453 } 2559 }
2454 2560
2455 if (have_pixmap) 2561 if (have_pixmap)
2456 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2457 /* 2685 /*
2458 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2459 */ 2687 */
2460 int sx, sy, nx, ny; 2688 int nx, ny;
2461 unsigned int nw, nh; 2689 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image; 2690 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466 2691
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2471 nx = ny = 0; 2694 nx = ny = 0;
2472 2695
2473 if (sx < 0) 2696 if (sx < 0)
2474 { 2697 {
2475 nw += sx; 2698 nw += sx;
2476 nx = -sx; 2699 nx = -sx;
2477 sx = 0; 2700 sx = 0;
2478 } 2701 }
2479 2702
2480 if (sy < 0) 2703 if (sy < 0)
2481 { 2704 {
2482 nh += sy; 2705 nh += sy;
2483 ny = -sy; 2706 ny = -sy;
2484 sy = 0; 2707 sy = 0;
2485 } 2708 }
2486 2709
2487 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489 2712
2490 XSync (xdisp, False); 2713 XSync (dpy, False);
2491 allowedxerror = -1; 2714 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493 2716
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2496 allowedxerror = 0; 2719 allowedxerror = 0;
2497
2498 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2499 { 2749 {
2500 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2501 { 2751 {
2502 pchanged = 1; 2752 pchanged = 1;
2503 if (pixmap != None) 2753 if (pixmap != None)
2504 { 2754 {
2505 XFreePixmap (xdisp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2506 pixmap = None; 2756 pixmap = None;
2507 } 2757 }
2508 } 2758 }
2509 2759
2510 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2511 } 2761 }
2512 else 2762 else
2513 { 2763 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2537 2766
2538 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1; 2768 pchanged = 1;
2540 2769
2541 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2542 } 2771 }
2543 } 2772 }
2544 2773
2545 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547 else 2776 else
2548 { 2777 {
2549 unsigned int n; 2778 unsigned int n;
2550 /* 2779 /*
2551 * InheritPixmap transparency 2780 * InheritPixmap transparency
2552 */ 2781 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 { 2783 {
2555 oldp = parent[i]; 2784 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list); 2786 XFree (list);
2558 2787
2559 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2560 { 2789 {
2561 if (oldp != None) 2790 if (oldp != None)
… …
2571 n = 0; 2800 n = 0;
2572 2801
2573 if (pchanged) 2802 if (pchanged)
2574 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2575 { 2804 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2577 2806
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 { 2808 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break; 2810 break;
2582 } 2811 }
2583 } 2812 }
2584 2813
2585 if (n > (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 { 2815 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0; 2818 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2591 } 2820 }
2592 else 2821 else
2593 { 2822 {
2594 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2595 { 2824 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2598 } 2827 }
2599 2828
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601 am_transparent = 1; 2830 am_transparent = 1;
2602 } 2831 }
2603 2832
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None; 2834 parent[i] = None;
2606 } 2835 }
2607 2836
2608 if (scrollBar.win) 2837 if (scrollBar.win)
2609 { 2838 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2612 scrollbar_show (0); 2841 scrollbar_show (0);
2613 } 2842 }
2614 2843
2615 if (am_transparent) 2844 if (am_transparent)
… …
2617 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2619 flush (); 2848 flush ();
2620 } 2849 }
2621 2850
2622 return pchanged; 2851// return pchanged;
2623} 2852}
2624#endif 2853#endif
2625 2854
2626/*}}} */ 2855/*}}} */
2627 2856
… …
2678 if (ch == C0_LF) 2907 if (ch == C0_LF)
2679 nlines++; 2908 nlines++;
2680 2909
2681 refresh_count++; 2910 refresh_count++;
2682 2911
2683 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2684 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2914 {
2686 refreshnow = true; 2915 refreshnow = true;
2687 refresh_count = 0; 2916 refresh_count = 0;
2688 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2728 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2729 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2959 */
2731 if (refreshnow) 2960 if (refreshnow)
2732 { 2961 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++; 2963 refresh_limit++;
2735 else 2964 else
2736 { 2965 {
2737 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2738 scr_refresh (); 2968 scr_refresh ();
2739 want_refresh = 1; 2969 want_refresh = 1;
2740 } 2970 }
2741 } 2971 }
2742 2972
… …
3403 break; 3633 break;
3404 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3405 scr_report_position (); 3635 scr_report_position ();
3406 break; 3636 break;
3407 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3640 break;
3411 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3643 break;
… …
3506{ 3736{
3507 int x, y; 3737 int x, y;
3508 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3509 Window wdummy; 3739 Window wdummy;
3510 3740
3511 dLocal (Display *, xdisp); 3741 dLocal (Display *, dpy);
3512 3742
3513 if (nargs == 0) 3743 if (nargs == 0)
3514 return; 3744 return;
3515 3745
3516 switch (args[0]) 3746 switch (args[0])
3517 { 3747 {
3518 /* 3748 /*
3519 * commands 3749 * commands
3520 */ 3750 */
3521 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3523 break; 3753 break;
3524 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3756 break;
3527 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3759 break;
3530 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3762 break;
3533 case 5: /* raise window */ 3763 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3535 break; 3765 break;
3536 case 6: /* lower window */ 3766 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3538 break; 3768 break;
3539 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3540 scr_touch (true); 3770 scr_touch (true);
3541 break; 3771 break;
3542 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3553 3783
3554 /* 3784 /*
3555 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3556 */ 3786 */
3557 case 11: /* report window state */ 3787 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3790 break;
3561 case 13: /* report window position */ 3791 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3797 break;
3568 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3801 break;
3572 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3804 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3807 break;
3578 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3579 { 3809 {
3580 char *s; 3810 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3813 XFree (s);
3584 } 3814 }
3585 break; 3815 break;
3586 case 21: /* report window title */ 3816 case 21: /* report window title */
3587 { 3817 {
3588 char *s; 3818 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3821 XFree (s);
3592 } 3822 }
3593 break; 3823 break;
3594 } 3824 }
3595} 3825}
… …
3622 seen_esc = true; 3852 seen_esc = true;
3623 continue; 3853 continue;
3624 } 3854 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3859 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3629 3861
3630 seen_esc = false; 3862 seen_esc = false;
3631 3863
3632 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3865 // stop at some sane length
3634 return NULL; 3866 return NULL;
3635 3867
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3868 string[n++] = ch;
3640 } 3869 }
3641 3870
3642 string[n++] = '\0'; 3871 string[n++] = '\0';
3643 3872
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3949 int color;
3721 char *buf, *name; 3950 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3952 int saveop = op;
3724 3953
3725 dLocal (Display *, xdisp); 3954 dLocal (Display *, dpy);
3726 3955
3727 assert (str != NULL); 3956 assert (str != NULL);
3957
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return;
3960
3728 switch (op) 3961 switch (op)
3729 { 3962 {
3730 case XTerm_name: 3963 case XTerm_name:
3731 set_title (str); 3964 set_title (str);
3732 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3979 unsigned long bytes_after;
3747 unsigned char *value = 0; 3980 unsigned char *value = 0;
3748 const char *str = ""; 3981 const char *str = "";
3749 3982
3750 if (prop 3983 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3988 && actual_type != None
3756 && actual_format == 8) 3989 && actual_format == 8)
… …
3768 { 4001 {
3769 *eq = 0; 4002 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3771 } 4004 }
3772 else 4005 else
3773 XDeleteProperty (xdisp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 4007 display->atom (str));
3775 } 4008 }
3776 break; 4009 break;
3777 4010
3778 case XTerm_Color: 4011 case XTerm_Color:
… …
3864#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3865 resize_pixmap (); 4098 resize_pixmap ();
3866 scr_touch (true); 4099 scr_touch (true);
3867#endif 4100#endif
3868 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3869 } 4107 }
3870 break; 4108 break;
3871 4109
3872 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
… …
3900 case URxvt_italicFont: 4138 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3902#endif 4140#endif
3903 if (query) 4141 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 4145 resp);
3908 else 4146 else
3909 { 4147 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 4162 break;
3925 4163
3926#if !ENABLE_MINIMAL 4164#if !ENABLE_MINIMAL
3927 case URxvt_locale: 4165 case URxvt_locale:
3928 if (query) 4166 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 4168 else
3931 { 4169 {
3932 set_locale (str); 4170 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 4172 init_xlocale ();
… …
3949 break; 4187 break;
3950#endif 4188#endif
3951 4189
3952#if ENABLE_PERL 4190#if ENABLE_PERL
3953 case URxvt_perl: 4191 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3955 ; // no responses yet 4193 ; // no responses yet
3956 break; 4194 break;
3957#endif 4195#endif
3958 } 4196 }
3959} 4197}
… …
4075 scr_touch (true); 4313 scr_touch (true);
4076 break; 4314 break;
4077#endif 4315#endif
4078 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4079 case 1049: 4317 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 4319 if (mode == 0)
4082 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4083 else if (mode == 1) 4321 else if (mode == 1)
4084 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4085 break; 4323 break;
… …
4150 break; 4388 break;
4151 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4153 break; 4391 break;
4154 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 4395 scr_erase_screen (2);
4158 scr_change_screen (state); 4396 scr_change_screen (state);
4159 break; 4397 break;
4160 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 4399 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 4402 scr_erase_screen (2);
4165 break; 4403 break;
4166 default: 4404 default:
4167 break; 4405 break;

Diff Legend

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