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.303 by root, Tue Jan 31 21:47:56 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>
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */
304void 303void
305rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
306{ 305{
307 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
308 unsigned int newlen; 307 unsigned int newlen;
309 KeySym keysym; 308 KeySym keysym;
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 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);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
911} 923}
912/*}}} */ 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}
913 1001
914#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
915unsigned int 1003unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 1005{
1103 1191
1104 void yield_cb (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1105 { 1193 {
1106 // this should really be sched_yield(), but the linux guys thought 1194 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1195 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 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.
1109 1198
1110 struct timespec ts = { 0, 0 }; 1199 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1200 nanosleep (&ts, 0);
1112 1201
1113 w.stop (); 1202 w.stop ();
1151 } 1240 }
1152 else 1241 else
1153 { 1242 {
1154 pty_ev.stop (); 1243 pty_ev.stop ();
1155 1244
1156 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1157 destroy (); 1246 destroy ();
1158 } 1247 }
1159 1248
1160 return false; 1249 return false;
1161} 1250}
1176} 1265}
1177 1266
1178void 1267void
1179rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1180{ 1269{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1271 recolour_cursor ();
1183 1272
1184#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1274 hidden_pointer = 0;
1186 1275
1187 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1189#endif 1278#endif
1190} 1279}
1191 1280
1192#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1193void 1282void
1194rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1195{ 1284{
1196 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1197 return; 1286 return;
1198 1287
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1289 XFlush (dpy);
1201 1290
1202 hidden_pointer = 1; 1291 hidden_pointer = 1;
1203} 1292}
1204 1293
1205void 1294void
1284void 1373void
1285rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1286{ 1375{
1287 make_current (); 1376 make_current ();
1288 1377
1289 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1290 1379
1291 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1383 return;
1299 unsigned int unused_mask; 1388 unsigned int unused_mask;
1300 1389
1301 switch (ev.type) 1390 switch (ev.type)
1302 { 1391 {
1303 case KeyPress: 1392 case KeyPress:
1304#if ISO_14755 1393 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1394 break;
1310 1395
1311 case KeyRelease: 1396 case KeyRelease:
1312 { 1397 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1398 break;
1384 }
1385 1399
1386 case ButtonPress: 1400 case ButtonPress:
1387 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1388 break; 1402 break;
1389 1403
1404 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)))
1405 destroy (); 1419 destroy ();
1406 } 1420 }
1407#if ENABLE_EWMH 1421#if ENABLE_EWMH
1408 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])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1425 &ev);
1412#endif 1426#endif
1413 } 1427 }
1414 } 1428 }
1452 break; 1466 break;
1453 } 1467 }
1454 break; 1468 break;
1455 1469
1456 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1474 focus_in ();
1458 break; 1475 break;
1459 1476
1460 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1481 focus_out ();
1462 break; 1482 break;
1463 1483
1464 case ConfigureNotify: 1484 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1466 { 1486 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1488 ;
1469 1489
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1491 {
1472 seen_resize = 1; 1492 seen_resize = 1;
1473 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
1474 } 1501 }
1475 1502
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 1504
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1479 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1480 check_our_parents (); 1507 check_our_parents ();
1481#endif 1508#endif
1482 } 1509 }
1483 break; 1510 break;
1484 1511
1530 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1531 { 1558 {
1532 do 1559 do
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1563
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1565
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1542 1569
1543 want_refresh = 1; 1570 want_refresh = 1;
1544 } 1571 }
1545 else 1572 else
1546 { 1573 {
1547 XEvent unused_event; 1574 XEvent unused_event;
1548 1575
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1577 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1579 ;
1553 1580
1554 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1555 { 1582 {
1556 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1557 scrollbar_show (0); 1584 scrollbar_show (0);
1558 } 1585 }
1559 1586
1560#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1563#endif 1590#endif
1564 } 1591 }
1565 break; 1592 break;
1566 1593
1567 case MotionNotify: 1594 case MotionNotify:
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1606 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1608 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1610 ;
1584 1611
1585 XQueryPointer (xdisp, vt, 1612 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1616 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1654#endif 1681#endif
1655 } 1682 }
1656 } 1683 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658 { 1685 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1661 ; 1688 ;
1662 1689
1663 XQueryPointer (xdisp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1694 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672 scrollbar_show (1); 1699 scrollbar_show (1);
1673 } 1700 }
1674 break; 1701 break;
1675 } 1702 }
1676 1703
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1706 {
1682 if (hidden_cursor) 1707 if (hidden_cursor)
1683 { 1708 {
1684 hidden_cursor = 0; 1709 hidden_cursor = 0;
1685 want_refresh = 1; 1710 want_refresh = 1;
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 } 1714 }
1690#endif 1715#endif
1691 1716
1692#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1719 {
1695 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1723 if (hidden_pointer)
1710 if (!focus) 1735 if (!focus)
1711 { 1736 {
1712 focus = 1; 1737 focus = 1;
1713 want_refresh = 1; 1738 want_refresh = 1;
1714 1739
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1741
1717#if USE_XIM 1742#if USE_XIM
1718 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1719 { 1744 {
1720 IMSetStatusPosition (); 1745 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1722 } 1747 }
1723#endif 1748#endif
1724#if CURSOR_BLINK 1749#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1727#endif 1752#endif
1728#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1730 { 1755 {
1731 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1732 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 }
1733 } 1771 }
1734#endif 1772#endif
1735 } 1773 }
1736} 1774}
1737 1775
1757#if USE_XIM 1795#if USE_XIM
1758 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1760#endif 1798#endif
1761#if CURSOR_BLINK 1799#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1764 hidden_cursor = 0; 1802 hidden_cursor = 0;
1765#endif 1803#endif
1766#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
1771 } 1809 }
1772#endif 1810#endif
1773 } 1811 }
1774} 1812}
1775 1813
1776#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
1777void 1828void
1778rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1830{
1780 make_current (); 1831 make_current ();
1781 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
1782 switch (ev.type) 1838 switch (ev.type)
1783 { 1839 {
1784 case PropertyNotify: 1840 case PropertyNotify:
1785 /* 1841 /*
1786 * 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,
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1791 return; 1847 return;
1792 1848
1793 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1794 case ReparentNotify: 1850 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1796 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1797 break; 1853 break;
1798 } 1854 }
1855# endif
1799} 1856}
1800#endif 1857#endif
1801 1858
1802void 1859void
1803rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
2131 selection_make (ev.time); 2188 selection_make (ev.time);
2132 break; 2189 break;
2133 2190
2134 case Button2: 2191 case Button2:
2135 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?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2194 break;
2138 2195
2139#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2140 case Button4: 2197 case Button4:
2141 case Button5: 2198 case Button5:
2145 2202
2146 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2147 2204
2148 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2149 i = 1; 2206 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2208 i = nrow - 1;
2152 else 2209 else
2153 i = 5; 2210 i = 5;
2154 2211
2155# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2178 } 2235 }
2179 } 2236 }
2180} 2237}
2181 2238
2182#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2183#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2184/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2185 2242
2186typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2187 2244
2188void 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)
2416 * Do transparency updates if required 2473 * Do transparency updates if required
2417 */ 2474 */
2418int 2475int
2419rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2420{ 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{
2421 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2422 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2423 Atom atype; 2488 Atom atype;
2424 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2425 Window root, oldp, *list; 2490 Window root, oldp, *list;
2426 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2428 2495
2429 pchanged = 0; 2496 pchanged = 0;
2430 2497
2431 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2432 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2433 2500
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2436 2503
2437 XGetWindowAttributes (xdisp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2438 2505
2439 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2440 { 2507 {
2441 if (am_transparent) 2508 if (am_transparent)
2442 { 2509 {
2443 pchanged = 1; 2510 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2446 } 2513 }
2447 2514
2448 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2449 } 2516 }
2450 2517
2451 /* 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. */
2452 XSync (xdisp, False); 2519 XSync (dpy, False);
2453 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 */ ;
2454 /* 2528 /*
2455 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2457 * 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.
2458 */ 2532 */
2459 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2463 2537
2464 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2469 2543
2470 if (!i || prop == NULL 2544 if (!i || prop == NULL
2471#if TINTING 2545#if TINTING
2472 || !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 )
2473#endif 2551#endif
2474 ) 2552 )
2475 have_pixmap = 0; 2553 have_pixmap = 0;
2476 else 2554 else
2477 { 2555 {
2480 XFree (prop); 2558 XFree (prop);
2481 } 2559 }
2482 2560
2483 if (have_pixmap) 2561 if (have_pixmap)
2484 { 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 {
2485 /* 2685 /*
2486 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2487 */ 2687 */
2488 int sx, sy, nx, ny; 2688 int nx, ny;
2489 unsigned int nw, nh; 2689 unsigned int nw, nh;
2490 Window cr;
2491 XImage *image; 2690 XImage *image;
2492 GC gc;
2493 XGCValues gcvalue;
2494 2691
2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2499 nx = ny = 0; 2694 nx = ny = 0;
2500 2695
2501 if (sx < 0) 2696 if (sx < 0)
2502 { 2697 {
2503 nw += sx; 2698 nw += sx;
2504 nx = -sx; 2699 nx = -sx;
2505 sx = 0; 2700 sx = 0;
2506 } 2701 }
2507 2702
2508 if (sy < 0) 2703 if (sy < 0)
2509 { 2704 {
2510 nh += sy; 2705 nh += sy;
2511 ny = -sy; 2706 ny = -sy;
2512 sy = 0; 2707 sy = 0;
2513 } 2708 }
2514 2709
2515 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517 2712
2518 XSync (xdisp, False); 2713 XSync (dpy, False);
2519 allowedxerror = -1; 2714 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521 2716
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2524 allowedxerror = 0; 2719 allowedxerror = 0;
2525
2526 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)
2527 { 2749 {
2528 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2529 { 2751 {
2530 pchanged = 1; 2752 pchanged = 1;
2531 if (pixmap != None) 2753 if (pixmap != None)
2532 { 2754 {
2533 XFreePixmap (xdisp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2534 pixmap = None; 2756 pixmap = None;
2535 } 2757 }
2536 } 2758 }
2537 2759
2538 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2539 } 2761 }
2540 else 2762 else
2541 { 2763 {
2542 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap);
2544
2545#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint))
2547 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 rgba c;
2551 pix_colors_focused [Color_tint].get (c);
2552
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 }
2555#endif
2556
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2565 2766
2566 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2768 pchanged = 1;
2568 2769
2569 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2570 } 2771 }
2571 } 2772 }
2572 2773
2573 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575 else 2776 else
2576 { 2777 {
2577 unsigned int n; 2778 unsigned int n;
2578 /* 2779 /*
2579 * InheritPixmap transparency 2780 * InheritPixmap transparency
2580 */ 2781 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2783 {
2583 oldp = parent[i]; 2784 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list); 2786 XFree (list);
2586 2787
2587 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2588 { 2789 {
2589 if (oldp != None) 2790 if (oldp != None)
2599 n = 0; 2800 n = 0;
2600 2801
2601 if (pchanged) 2802 if (pchanged)
2602 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2603 { 2804 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2605 2806
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 { 2808 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break; 2810 break;
2610 } 2811 }
2611 } 2812 }
2612 2813
2613 if (n > (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 { 2815 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0; 2818 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2619 } 2820 }
2620 else 2821 else
2621 { 2822 {
2622 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2623 { 2824 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2626 } 2827 }
2627 2828
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2629 am_transparent = 1; 2830 am_transparent = 1;
2630 } 2831 }
2631 2832
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None; 2834 parent[i] = None;
2634 } 2835 }
2635 2836
2636 if (scrollBar.win) 2837 if (scrollBar.win)
2637 { 2838 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2640 scrollbar_show (0); 2841 scrollbar_show (0);
2641 } 2842 }
2642 2843
2643 if (am_transparent) 2844 if (am_transparent)
2645 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2647 flush (); 2848 flush ();
2648 } 2849 }
2649 2850
2650 return pchanged; 2851// return pchanged;
2651} 2852}
2652#endif 2853#endif
2653 2854
2654/*}}} */ 2855/*}}} */
2655 2856
2706 if (ch == C0_LF) 2907 if (ch == C0_LF)
2707 nlines++; 2908 nlines++;
2708 2909
2709 refresh_count++; 2910 refresh_count++;
2710 2911
2711 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2712 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2914 {
2714 refreshnow = true; 2915 refreshnow = true;
2715 refresh_count = 0; 2916 refresh_count = 0;
2716 ch = NOCHAR; 2917 ch = NOCHAR;
2756 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2757 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2959 */
2759 if (refreshnow) 2960 if (refreshnow)
2760 { 2961 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++; 2963 refresh_limit++;
2763 else 2964 else
2764 { 2965 {
2765 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2766 scr_refresh (); 2968 scr_refresh ();
2767 want_refresh = 1; 2969 want_refresh = 1;
2768 } 2970 }
2769 } 2971 }
2770 2972
3431 break; 3633 break;
3432 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3433 scr_report_position (); 3635 scr_report_position ();
3434 break; 3636 break;
3435 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 3640 break;
3439 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 3643 break;
3534{ 3736{
3535 int x, y; 3737 int x, y;
3536 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3537 Window wdummy; 3739 Window wdummy;
3538 3740
3539 dLocal (Display *, xdisp); 3741 dLocal (Display *, dpy);
3540 3742
3541 if (nargs == 0) 3743 if (nargs == 0)
3542 return; 3744 return;
3543 3745
3544 switch (args[0]) 3746 switch (args[0])
3545 { 3747 {
3546 /* 3748 /*
3547 * commands 3749 * commands
3548 */ 3750 */
3549 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3551 break; 3753 break;
3552 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3756 break;
3555 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3759 break;
3558 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3762 break;
3561 case 5: /* raise window */ 3763 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3563 break; 3765 break;
3564 case 6: /* lower window */ 3766 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3566 break; 3768 break;
3567 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3568 scr_touch (true); 3770 scr_touch (true);
3569 break; 3771 break;
3570 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
3581 3783
3582 /* 3784 /*
3583 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3584 */ 3786 */
3585 case 11: /* report window state */ 3787 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3790 break;
3589 case 13: /* report window position */ 3791 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3797 break;
3596 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3801 break;
3600 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3804 break;
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3807 break;
3606 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3607 { 3809 {
3608 char *s; 3810 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3610 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 */
3611 XFree (s); 3813 XFree (s);
3612 } 3814 }
3613 break; 3815 break;
3614 case 21: /* report window title */ 3816 case 21: /* report window title */
3615 { 3817 {
3616 char *s; 3818 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3618 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 */
3619 XFree (s); 3821 XFree (s);
3620 } 3822 }
3621 break; 3823 break;
3622 } 3824 }
3623} 3825}
3650 seen_esc = true; 3852 seen_esc = true;
3651 continue; 3853 continue;
3652 } 3854 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3859 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3657 3861
3658 seen_esc = false; 3862 seen_esc = false;
3659 3863
3660 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3865 // stop at some sane length
3662 return NULL; 3866 return NULL;
3663 3867
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3868 string[n++] = ch;
3668 } 3869 }
3669 3870
3670 string[n++] = '\0'; 3871 string[n++] = '\0';
3671 3872
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
3748 int color; 3949 int color;
3749 char *buf, *name; 3950 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3952 int saveop = op;
3752 3953
3753 dLocal (Display *, xdisp); 3954 dLocal (Display *, dpy);
3754 3955
3755 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
3756 switch (op) 3961 switch (op)
3757 { 3962 {
3758 case XTerm_name: 3963 case XTerm_name:
3759 set_title (str); 3964 set_title (str);
3760 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
3774 unsigned long bytes_after; 3979 unsigned long bytes_after;
3775 unsigned char *value = 0; 3980 unsigned char *value = 0;
3776 const char *str = ""; 3981 const char *str = "";
3777 3982
3778 if (prop 3983 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3988 && actual_type != None
3784 && actual_format == 8) 3989 && actual_format == 8)
3796 { 4001 {
3797 *eq = 0; 4002 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3799 } 4004 }
3800 else 4005 else
3801 XDeleteProperty (xdisp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 4007 display->atom (str));
3803 } 4008 }
3804 break; 4009 break;
3805 4010
3806 case XTerm_Color: 4011 case XTerm_Color:
3892#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3893 resize_pixmap (); 4098 resize_pixmap ();
3894 scr_touch (true); 4099 scr_touch (true);
3895#endif 4100#endif
3896 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3897 } 4107 }
3898 break; 4108 break;
3899 4109
3900 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3928 case URxvt_italicFont: 4138 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3930#endif 4140#endif
3931 if (query) 4141 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 4145 resp);
3936 else 4146 else
3937 { 4147 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
3952 break; 4162 break;
3953 4163
3954#if !ENABLE_MINIMAL 4164#if !ENABLE_MINIMAL
3955 case URxvt_locale: 4165 case URxvt_locale:
3956 if (query) 4166 if (query)
3957 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);
3958 else 4168 else
3959 { 4169 {
3960 set_locale (str); 4170 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 4172 init_xlocale ();
3977 break; 4187 break;
3978#endif 4188#endif
3979 4189
3980#if ENABLE_PERL 4190#if ENABLE_PERL
3981 case URxvt_perl: 4191 case URxvt_perl:
3982 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)))
3983 ; // no responses yet 4193 ; // no responses yet
3984 break; 4194 break;
3985#endif 4195#endif
3986 } 4196 }
3987} 4197}
4103 scr_touch (true); 4313 scr_touch (true);
4104 break; 4314 break;
4105#endif 4315#endif
4106 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4107 case 1049: 4317 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 4319 if (mode == 0)
4110 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4111 else if (mode == 1) 4321 else if (mode == 1)
4112 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4113 break; 4323 break;
4178 break; 4388 break;
4179 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4181 break; 4391 break;
4182 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 4395 scr_erase_screen (2);
4186 scr_change_screen (state); 4396 scr_change_screen (state);
4187 break; 4397 break;
4188 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 4399 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 4402 scr_erase_screen (2);
4193 break; 4403 break;
4194 default: 4404 default:
4195 break; 4405 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines