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.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>
… …
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 (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}
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);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1469 } 1501 }
1470 1502
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 1504
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1474 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1475 check_our_parents (); 1507 check_our_parents ();
1476#endif 1508#endif
1477 } 1509 }
1478 break; 1510 break;
1479 1511
… …
1525 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1526 { 1558 {
1527 do 1559 do
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1563
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1565
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1537 1569
1538 want_refresh = 1; 1570 want_refresh = 1;
1539 } 1571 }
1540 else 1572 else
1541 { 1573 {
1542 XEvent unused_event; 1574 XEvent unused_event;
1543 1575
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1577 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1579 ;
1548 1580
1549 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1550 { 1582 {
1551 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1552 scrollbar_show (0); 1584 scrollbar_show (0);
1553 } 1585 }
1554 1586
1555#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1558#endif 1590#endif
1559 } 1591 }
1560 break; 1592 break;
1561 1593
1562 case MotionNotify: 1594 case MotionNotify:
… …
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1606 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1608 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1610 ;
1579 1611
1580 XQueryPointer (xdisp, vt, 1612 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1616 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1649#endif 1681#endif
1650 } 1682 }
1651 } 1683 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653 { 1685 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1656 ; 1688 ;
1657 1689
1658 XQueryPointer (xdisp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1694 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 scrollbar_show (1); 1699 scrollbar_show (1);
1668 } 1700 }
1669 break; 1701 break;
1670 } 1702 }
1671 1703
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1706 {
1677 if (hidden_cursor) 1707 if (hidden_cursor)
1678 { 1708 {
1679 hidden_cursor = 0; 1709 hidden_cursor = 0;
1680 want_refresh = 1; 1710 want_refresh = 1;
… …
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 } 1714 }
1685#endif 1715#endif
1686 1716
1687#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1719 {
1690 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1705 if (!focus) 1735 if (!focus)
1706 { 1736 {
1707 focus = 1; 1737 focus = 1;
1708 want_refresh = 1; 1738 want_refresh = 1;
1709 1739
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1741
1712#if USE_XIM 1742#if USE_XIM
1713 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1714 { 1744 {
1715 IMSetStatusPosition (); 1745 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1717 } 1747 }
1718#endif 1748#endif
1719#if CURSOR_BLINK 1749#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif 1752#endif
1723#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1725 { 1755 {
1726 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1727 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 }
1728 } 1771 }
1729#endif 1772#endif
1730 } 1773 }
1731} 1774}
1732 1775
… …
1752#if USE_XIM 1795#if USE_XIM
1753 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1755#endif 1798#endif
1756#if CURSOR_BLINK 1799#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1759 hidden_cursor = 0; 1802 hidden_cursor = 0;
1760#endif 1803#endif
1761#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1766 } 1809 }
1767#endif 1810#endif
1768 } 1811 }
1769} 1812}
1770 1813
1771#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
1772void 1828void
1773rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1830{
1775 make_current (); 1831 make_current ();
1776 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
1777 switch (ev.type) 1838 switch (ev.type)
1778 { 1839 {
1779 case PropertyNotify: 1840 case PropertyNotify:
1780 /* 1841 /*
1781 * 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,
… …
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1786 return; 1847 return;
1787 1848
1788 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1789 case ReparentNotify: 1850 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1791 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1792 break; 1853 break;
1793 } 1854 }
1855# endif
1794} 1856}
1795#endif 1857#endif
1796 1858
1797void 1859void
1798rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2126 selection_make (ev.time); 2188 selection_make (ev.time);
2127 break; 2189 break;
2128 2190
2129 case Button2: 2191 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2194 break;
2133 2195
2134#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2135 case Button4: 2197 case Button4:
2136 case Button5: 2198 case Button5:
… …
2140 2202
2141 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2142 2204
2143 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2144 i = 1; 2206 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2208 i = nrow - 1;
2147 else 2209 else
2148 i = 5; 2210 i = 5;
2149 2211
2150# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2173 } 2235 }
2174 } 2236 }
2175} 2237}
2176 2238
2177#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2178#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2179/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2180 2242
2181typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2182 2244
2183void 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)
… …
2411 * Do transparency updates if required 2473 * Do transparency updates if required
2412 */ 2474 */
2413int 2475int
2414rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2415{ 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{
2416 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2418 Atom atype; 2488 Atom atype;
2419 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2420 Window root, oldp, *list; 2490 Window root, oldp, *list;
2421 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2423 2495
2424 pchanged = 0; 2496 pchanged = 0;
2425 2497
2426 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2427 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2428 2500
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2431 2503
2432 XGetWindowAttributes (xdisp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2433 2505
2434 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2435 { 2507 {
2436 if (am_transparent) 2508 if (am_transparent)
2437 { 2509 {
2438 pchanged = 1; 2510 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2441 } 2513 }
2442 2514
2443 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2444 } 2516 }
2445 2517
2446 /* 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. */
2447 XSync (xdisp, False); 2519 XSync (dpy, False);
2448 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 */ ;
2449 /* 2528 /*
2450 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2452 * 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.
2453 */ 2532 */
2454 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2458 2537
2459 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2464 2543
2465 if (!i || prop == NULL 2544 if (!i || prop == NULL
2466#if TINTING 2545#if TINTING
2467 || !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 )
2468#endif 2551#endif
2469 ) 2552 )
2470 have_pixmap = 0; 2553 have_pixmap = 0;
2471 else 2554 else
2472 { 2555 {
… …
2475 XFree (prop); 2558 XFree (prop);
2476 } 2559 }
2477 2560
2478 if (have_pixmap) 2561 if (have_pixmap)
2479 { 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 {
2480 /* 2685 /*
2481 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2482 */ 2687 */
2483 int sx, sy, nx, ny; 2688 int nx, ny;
2484 unsigned int nw, nh; 2689 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image; 2690 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489 2691
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2494 nx = ny = 0; 2694 nx = ny = 0;
2495 2695
2496 if (sx < 0) 2696 if (sx < 0)
2497 { 2697 {
2498 nw += sx; 2698 nw += sx;
2499 nx = -sx; 2699 nx = -sx;
2500 sx = 0; 2700 sx = 0;
2501 } 2701 }
2502 2702
2503 if (sy < 0) 2703 if (sy < 0)
2504 { 2704 {
2505 nh += sy; 2705 nh += sy;
2506 ny = -sy; 2706 ny = -sy;
2507 sy = 0; 2707 sy = 0;
2508 } 2708 }
2509 2709
2510 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512 2712
2513 XSync (xdisp, False); 2713 XSync (dpy, False);
2514 allowedxerror = -1; 2714 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516 2716
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2519 allowedxerror = 0; 2719 allowedxerror = 0;
2520
2521 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)
2522 { 2749 {
2523 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2524 { 2751 {
2525 pchanged = 1; 2752 pchanged = 1;
2526 if (pixmap != None) 2753 if (pixmap != None)
2527 { 2754 {
2528 XFreePixmap (xdisp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2529 pixmap = None; 2756 pixmap = None;
2530 } 2757 }
2531 } 2758 }
2532 2759
2533 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2534 } 2761 }
2535 else 2762 else
2536 { 2763 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544
2545 rgba c;
2546 pix_colors_focused [Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2560 2766
2561 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1; 2768 pchanged = 1;
2563 2769
2564 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2565 } 2771 }
2566 } 2772 }
2567 2773
2568 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2570 else 2776 else
2571 { 2777 {
2572 unsigned int n; 2778 unsigned int n;
2573 /* 2779 /*
2574 * InheritPixmap transparency 2780 * InheritPixmap transparency
2575 */ 2781 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2783 {
2578 oldp = parent[i]; 2784 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2580 XFree (list); 2786 XFree (list);
2581 2787
2582 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2583 { 2789 {
2584 if (oldp != None) 2790 if (oldp != None)
… …
2594 n = 0; 2800 n = 0;
2595 2801
2596 if (pchanged) 2802 if (pchanged)
2597 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2598 { 2804 {
2599 XGetWindowAttributes (xdisp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2600 2806
2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2602 { 2808 {
2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2604 break; 2810 break;
2605 } 2811 }
2606 } 2812 }
2607 2813
2608 if (n > (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2609 { 2815 {
2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2612 am_transparent = 0; 2818 am_transparent = 0;
2613 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2614 } 2820 }
2615 else 2821 else
2616 { 2822 {
2617 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2618 { 2824 {
2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2620 XClearWindow (xdisp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2621 } 2827 }
2622 2828
2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2624 am_transparent = 1; 2830 am_transparent = 1;
2625 } 2831 }
2626 2832
2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2628 parent[i] = None; 2834 parent[i] = None;
2629 } 2835 }
2630 2836
2631 if (scrollBar.win) 2837 if (scrollBar.win)
2632 { 2838 {
2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2634 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2635 scrollbar_show (0); 2841 scrollbar_show (0);
2636 } 2842 }
2637 2843
2638 if (am_transparent) 2844 if (am_transparent)
… …
2640 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2641 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2642 flush (); 2848 flush ();
2643 } 2849 }
2644 2850
2645 return pchanged; 2851// return pchanged;
2646} 2852}
2647#endif 2853#endif
2648 2854
2649/*}}} */ 2855/*}}} */
2650 2856
… …
2701 if (ch == C0_LF) 2907 if (ch == C0_LF)
2702 nlines++; 2908 nlines++;
2703 2909
2704 refresh_count++; 2910 refresh_count++;
2705 2911
2706 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2707 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2708 { 2914 {
2709 refreshnow = true; 2915 refreshnow = true;
2710 refresh_count = 0; 2916 refresh_count = 0;
2711 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2751 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2752 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2753 */ 2959 */
2754 if (refreshnow) 2960 if (refreshnow)
2755 { 2961 {
2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2757 refresh_limit++; 2963 refresh_limit++;
2758 else 2964 else
2759 { 2965 {
2760 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2761 scr_refresh (); 2968 scr_refresh ();
2762 want_refresh = 1; 2969 want_refresh = 1;
2763 } 2970 }
2764 } 2971 }
2765 2972
… …
3426 break; 3633 break;
3427 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3428 scr_report_position (); 3635 scr_report_position ();
3429 break; 3636 break;
3430 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3431 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3432 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3433 break; 3640 break;
3434 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3435 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3436 break; 3643 break;
… …
3529{ 3736{
3530 int x, y; 3737 int x, y;
3531 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3532 Window wdummy; 3739 Window wdummy;
3533 3740
3534 dLocal (Display *, xdisp); 3741 dLocal (Display *, dpy);
3535 3742
3536 if (nargs == 0) 3743 if (nargs == 0)
3537 return; 3744 return;
3538 3745
3539 switch (args[0]) 3746 switch (args[0])
3540 { 3747 {
3541 /* 3748 /*
3542 * commands 3749 * commands
3543 */ 3750 */
3544 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3545 XMapWindow (xdisp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3546 break; 3753 break;
3547 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3548 XIconifyWindow (xdisp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3549 break; 3756 break;
3550 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3551 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3552 break; 3759 break;
3553 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3555 break; 3762 break;
3556 case 5: /* raise window */ 3763 case 5: /* raise window */
3557 XRaiseWindow (xdisp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3558 break; 3765 break;
3559 case 6: /* lower window */ 3766 case 6: /* lower window */
3560 XLowerWindow (xdisp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3561 break; 3768 break;
3562 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3563 scr_touch (true); 3770 scr_touch (true);
3564 break; 3771 break;
3565 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3576 3783
3577 /* 3784 /*
3578 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3579 */ 3786 */
3580 case 11: /* report window state */ 3787 case 11: /* report window state */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3583 break; 3790 break;
3584 case 13: /* report window position */ 3791 case 13: /* report window position */
3585 XGetWindowAttributes (xdisp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3586 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3587 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3588 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3589 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3590 break; 3797 break;
3591 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3592 XGetWindowAttributes (xdisp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3594 break; 3801 break;
3595 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3596 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3597 break; 3804 break;
… …
3599 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3600 break; 3807 break;
3601 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3602 { 3809 {
3603 char *s; 3810 char *s;
3604 XGetIconName (xdisp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3605 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 */
3606 XFree (s); 3813 XFree (s);
3607 } 3814 }
3608 break; 3815 break;
3609 case 21: /* report window title */ 3816 case 21: /* report window title */
3610 { 3817 {
3611 char *s; 3818 char *s;
3612 XFetchName (xdisp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3613 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 */
3614 XFree (s); 3821 XFree (s);
3615 } 3822 }
3616 break; 3823 break;
3617 } 3824 }
3618} 3825}
… …
3645 seen_esc = true; 3852 seen_esc = true;
3646 continue; 3853 continue;
3647 } 3854 }
3648 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3649 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3650 else if (ch < 0x20) 3859 else if (ch < 0x20)
3651 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3652 3861
3653 seen_esc = false; 3862 seen_esc = false;
3654 3863
3655 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3656 // stop at some sane length 3865 // stop at some sane length
3657 return NULL; 3866 return NULL;
3658 3867
3659 if (ch == C0_SYN)
3660 string[n++] = cmd_get8 ();
3661 else
3662 string[n++] = ch; 3868 string[n++] = ch;
3663 } 3869 }
3664 3870
3665 string[n++] = '\0'; 3871 string[n++] = '\0';
3666 3872
3667 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3719rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3925rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3720{ 3926{
3721 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3722 { 3928 {
3723 rgba c; 3929 rgba c;
3724 pix_colors_focused[color].get (this, c); 3930 pix_colors_focused[color].get (c);
3725 3931
3726#if XFT 3932#if XFT
3727 if (c.a != rgba::MAX_CC) 3933 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); 3934 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3729 else 3935 else
… …
3743 int color; 3949 int color;
3744 char *buf, *name; 3950 char *buf, *name;
3745 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3746 int saveop = op; 3952 int saveop = op;
3747 3953
3748 dLocal (Display *, xdisp); 3954 dLocal (Display *, dpy);
3749 3955
3750 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
3751 switch (op) 3961 switch (op)
3752 { 3962 {
3753 case XTerm_name: 3963 case XTerm_name:
3754 set_title (str); 3964 set_title (str);
3755 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3979 unsigned long bytes_after;
3770 unsigned char *value = 0; 3980 unsigned char *value = 0;
3771 const char *str = ""; 3981 const char *str = "";
3772 3982
3773 if (prop 3983 if (prop
3774 && XGetWindowProperty (xdisp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3988 && actual_type != None
3779 && actual_format == 8) 3989 && actual_format == 8)
… …
3791 { 4001 {
3792 *eq = 0; 4002 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3794 } 4004 }
3795 else 4005 else
3796 XDeleteProperty (xdisp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 4007 display->atom (str));
3798 } 4008 }
3799 break; 4009 break;
3800 4010
3801 case XTerm_Color: 4011 case XTerm_Color:
… …
3887#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3888 resize_pixmap (); 4098 resize_pixmap ();
3889 scr_touch (true); 4099 scr_touch (true);
3890#endif 4100#endif
3891 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3892 } 4107 }
3893 break; 4108 break;
3894 4109
3895 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
… …
3923 case URxvt_italicFont: 4138 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3925#endif 4140#endif
3926 if (query) 4141 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 4145 resp);
3931 else 4146 else
3932 { 4147 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 4162 break;
3948 4163
3949#if !ENABLE_MINIMAL 4164#if !ENABLE_MINIMAL
3950 case URxvt_locale: 4165 case URxvt_locale:
3951 if (query) 4166 if (query)
3952 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);
3953 else 4168 else
3954 { 4169 {
3955 set_locale (str); 4170 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 4172 init_xlocale ();
… …
3972 break; 4187 break;
3973#endif 4188#endif
3974 4189
3975#if ENABLE_PERL 4190#if ENABLE_PERL
3976 case URxvt_perl: 4191 case URxvt_perl:
3977 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)))
3978 ; // no responses yet 4193 ; // no responses yet
3979 break; 4194 break;
3980#endif 4195#endif
3981 } 4196 }
3982} 4197}
… …
4098 scr_touch (true); 4313 scr_touch (true);
4099 break; 4314 break;
4100#endif 4315#endif
4101 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4102 case 1049: 4317 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 4319 if (mode == 0)
4105 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4106 else if (mode == 1) 4321 else if (mode == 1)
4107 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4108 break; 4323 break;
… …
4173 break; 4388 break;
4174 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4176 break; 4391 break;
4177 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 4395 scr_erase_screen (2);
4181 scr_change_screen (state); 4396 scr_change_screen (state);
4182 break; 4397 break;
4183 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 4399 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 4402 scr_erase_screen (2);
4188 break; 4403 break;
4189 default: 4404 default:
4190 break; 4405 break;

Diff Legend

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