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.306 by root, Mon Feb 6 05:40:15 2006 UTC vs.
Revision 1.351 by ayin, Sun Sep 9 10:14:40 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>
… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
… …
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 560 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 561 kbuf[1] = '\0';
555 } 562 }
556 else 563 else
557 strcpy (kbuf, key_backspace); 564 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 565 break;
559#endif 566#endif
560#ifndef NO_DELETE_KEY 567#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior 568# ifdef XK_KP_Delete
562 case XK_KP_Delete: 569 case XK_KP_Delete:
563 /* allow shift to override */ 570 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 { 572 {
566 strcpy (kbuf, "\033On"); 573 strcpy (kbuf, "\033On");
567 break; 574 break;
568 } 575 }
569 /* FALLTHROUGH */ 576 /* FALLTHROUGH */
570# endif 577# endif
571 case XK_Delete: 578 case XK_Delete:
572 strcpy (kbuf, key_delete); 579 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 580 break;
574#endif 581#endif
575 case XK_Tab: 582 case XK_Tab:
576 if (shft) 583 if (shft)
577 strcpy (kbuf, "\033[Z"); 584 strcpy (kbuf, "\033[Z");
… …
720 727
721 case XK_Find: 728 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
723 break; 730 break;
724 731
725#ifdef XK_KP_End 732#ifdef XK_KP_Insert
726 case XK_KP_Insert: 733 case XK_KP_Insert:
727 /* allow shift to override */ 734 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 { 736 {
730 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
877 return; 884 return;
878 885
879 if (len <= 0) 886 if (len <= 0)
880 return; /* not mapped */ 887 return; /* not mapped */
881 888
882 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 890 if (view_start)
884 { 891 {
885 view_start = 0; 892 view_start = 0;
886 want_refresh = 1; 893 want_refresh = 1;
887 } 894 }
… …
926#if ENABLE_FRILLS || ISO_14755 933#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 934 // ISO 14755 support
928 if (iso14755buf) 935 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 936 if (iso14755buf & ISO_14755_52)
930 { 937 {
931# if ENABLE_OVERLAY 938# if ISO_14755
932 scr_overlay_off (); 939 scr_overlay_off ();
933# endif 940# endif
934# if ISO_14755 941# if ISO_14755
935 // iso14755 part 5.2 handling: release time 942 // iso14755 part 5.2 handling: release time
936 // first: controls 943 // first: controls
… …
959 966
960 return; 967 return;
961 } 968 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 970 {
964# if ENABLE_OVERLAY 971# if ISO_14755
965 scr_overlay_off (); 972 scr_overlay_off ();
966# endif 973# endif
967 if (iso14755buf & ISO_14755_51) 974 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 975 commit_iso14755 ();
969#if ISO_14755 976#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 978 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 980
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 1034void
1028rxvt_term::flush () 1035rxvt_term::flush ()
1029{ 1036{
1030 flush_ev.stop (); 1037 flush_ev.stop ();
1031 1038
1032#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
1033 if (want_full_refresh) 1040 if (want_full_refresh)
1034 { 1041 {
1035 want_full_refresh = 0; 1042 want_full_refresh = 0;
1036 scr_clear (); 1043 scr_clear ();
1037 scr_touch (false); 1044 scr_touch (false);
… …
1102void 1109void
1103rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1104{ 1111{
1105 make_current (); 1112 make_current ();
1106 1113
1107 refresh_limit = 1;
1108 refresh_count = 0; 1114 refresh_count = 0;
1109 flush (); 1115 flush ();
1110} 1116}
1111 1117
1112#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1178 1184
1179#if LINUX_YIELD_HACK 1185#if LINUX_YIELD_HACK
1180static struct event_handler 1186static struct event_handler
1181{ 1187{
1182 check_watcher yield_ev; 1188 check_watcher yield_ev;
1183 1189
1184 void yield_cb (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1185 { 1191 {
1186 // this should really be sched_yield(), but the linux guys thought 1192 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1193 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1194 // ones with high nice levels is a useful thing to do. It surely is is
… …
1232 } 1238 }
1233 else 1239 else
1234 { 1240 {
1235 pty_ev.stop (); 1241 pty_ev.stop ();
1236 1242
1237 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1238 destroy (); 1244 destroy ();
1239 } 1245 }
1240 1246
1241 return false; 1247 return false;
1242} 1248}
1243 1249
1244void 1250void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1263 recolour_cursor (); 1269 recolour_cursor ();
1264 1270
1265#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1272 hidden_pointer = 0;
1267 1273
1268 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1276#endif
1271} 1277}
1272 1278
1273#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1274void 1280void
1275rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1276{ 1282{
1277 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1278 return; 1284 return;
1279 1285
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1287 XFlush (dpy);
1282 1288
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1433 focus_out ();
1428 } 1434 }
1429#endif 1435#endif
1430 } 1436 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1437 break;
1436 1438
1437 /* 1439 /*
1438 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1458 break; 1460 break;
1459 } 1461 }
1460 break; 1462 break;
1461 1463
1462 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1468 focus_in ();
1464 break; 1469 break;
1465 1470
1466 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1475 focus_out ();
1468 break; 1476 break;
1469 1477
1470 case ConfigureNotify: 1478 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1471 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1472 { 1483 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1485 ;
1475 1486
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1488 {
1478 seen_resize = 1; 1489 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1491 }
1481 1492 else
1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (option (Opt_transparent))
1496 update_background ();
1497#endif
1498 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1500 }
1489 break; 1501 break;
1490 1502
1491 case PropertyNotify: 1503 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1523 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1524#endif 1536#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1538 break;
1527 1539
1528#ifdef TRANSPARENT 1540#ifdef ENABLE_TRANSPARENCY
1529 case ReparentNotify: 1541 case ReparentNotify:
1530 rootwin_cb (ev); 1542 rootwin_cb (ev);
1531 break; 1543 break;
1532#endif /* TRANSPARENT */ 1544#endif /* ENABLE_TRANSPARENCY */
1533 1545
1534 case GraphicsExpose: 1546 case GraphicsExpose:
1535 case Expose: 1547 case Expose:
1536 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1537 { 1549 {
… …
1560 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1561 { 1573 {
1562 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1563 scrollbar_show (0); 1575 scrollbar_show (0);
1564 } 1576 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1577 }
1571 break; 1578 break;
1572 1579
1573 case MotionNotify: 1580 case MotionNotify:
1574#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1680 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1682 scrollbar_size ());
1676 want_refresh = 1; 1683 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1684 scrollbar_show (1);
1679 } 1685 }
1680 break; 1686 break;
1681 } 1687 }
1682 1688
1683#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1691 {
1686 if (hidden_cursor) 1692 if (hidden_cursor)
1687 { 1693 {
1688 hidden_cursor = 0; 1694 hidden_cursor = 0;
1689 want_refresh = 1; 1695 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1699 }
1694#endif 1700#endif
1695 1701
1696#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1704 {
1699 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1714 if (!focus) 1720 if (!focus)
1715 { 1721 {
1716 focus = 1; 1722 focus = 1;
1717 want_refresh = 1; 1723 want_refresh = 1;
1718 1724
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720 1726
1721#if USE_XIM 1727#if USE_XIM
1722 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1723 { 1729 {
1724 IMSetStatusPosition (); 1730 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1726 } 1732 }
1727#endif 1733#endif
1728#if CURSOR_BLINK 1734#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1737#endif
1732#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1734 { 1740 {
1735 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1742 scr_recolour ();
1737 } 1743 }
1738#endif 1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1739 } 1758 }
1740} 1759}
1741 1760
1742void 1761void
1743rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1751 1770
1752#if ENABLE_FRILLS || ISO_14755 1771#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1772 if (iso14755buf)
1754 { 1773 {
1755 iso14755buf = 0; 1774 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1775# if ISO_14755
1757 scr_overlay_off (); 1776 scr_overlay_off ();
1758# endif 1777# endif
1759 } 1778 }
1760#endif 1779#endif
1761#if USE_XIM 1780#if USE_XIM
1762 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1764#endif 1783#endif
1765#if CURSOR_BLINK 1784#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1787 hidden_cursor = 0;
1769#endif 1788#endif
1770#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1775 } 1794 }
1776#endif 1795#endif
1777 } 1796 }
1778} 1797}
1779 1798
1780#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1813void
1782rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1815{
1784 make_current (); 1816 make_current ();
1785 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1823 switch (ev.type)
1787 { 1824 {
1788 case PropertyNotify: 1825 case PropertyNotify:
1789 /* 1826 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1792 */ 1829 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1832 {
1796 1833 bgPixmap.set_root_pixmap ();
1797 /* FALLTHROUGH */ 1834 update_background ();
1798 case ReparentNotify: 1835 }
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1836 break;
1802 } 1837 }
1838# endif
1803} 1839}
1804#endif 1840#endif
1805 1841
1806void 1842void
1807rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
… …
2135 selection_make (ev.time); 2171 selection_make (ev.time);
2136 break; 2172 break;
2137 2173
2138 case Button2: 2174 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2177 break;
2142 2178
2143#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2144 case Button4: 2180 case Button4:
2145 case Button5: 2181 case Button5:
… …
2149 2185
2150 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2151 2187
2152 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2153 i = 1; 2189 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2190 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2191 i = nrow - 1;
2156 else 2192 else
2157 i = 5; 2193 i = 5;
2158 2194
2159# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
… …
2180 break; 2216 break;
2181#endif 2217#endif
2182 } 2218 }
2183 } 2219 }
2184} 2220}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2221
2658/*}}} */ 2222/*}}} */
2659 2223
2660bool 2224bool
2661rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2274 if (ch == C0_LF)
2711 nlines++; 2275 nlines++;
2712 2276
2713 refresh_count++; 2277 refresh_count++;
2714 2278
2715 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2280 {
2718 refreshnow = true;
2719 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2284 {
2285 refreshnow = true;
2720 ch = NOCHAR; 2286 ch = NOCHAR;
2721 break; 2287 break;
2288 }
2722 } 2289 }
2723 2290
2724 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2726 { 2293 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2756 2323
2757 /* 2324 /*
2758 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2328 */
2763 if (refreshnow) 2329 if (refreshnow)
2764 { 2330 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2331 flag = true;
2770 scr_refresh (); 2332 scr_refresh ();
2771 want_refresh = 1; 2333 want_refresh = 1;
2772 }
2773 } 2334 }
2774 2335
2775 } 2336 }
2776 else 2337 else
2777 { 2338 {
… …
2926 { 2487 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2489 break; /* done = 1 */
2929 } 2490 }
2930 } 2491 }
2931 2492
2932 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2934 { 2495 {
2935 done = 1; 2496 done = 1;
2936 break; 2497 break;
… …
2998 process_dcs_seq (); 2559 process_dcs_seq ();
2999 break; 2560 break;
3000 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3001 process_csi_seq (); 2562 process_csi_seq ();
3002 break; 2563 break;
3003 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3004 process_osc_seq (); 2565 process_osc_seq ();
3005 break; 2566 break;
3006#endif 2567#endif
3007 } 2568 }
3008} 2569}
… …
3234rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3235{ 2796{
3236 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3237 unsigned int nargs, p; 2798 unsigned int nargs, p;
3238 int n, ndef; 2799 int n, ndef;
3239 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3240 2801
3241 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3242 arg[--nargs] = 0;
3243 2803
3244 priv = 0; 2804 priv = 0;
3245 ch = cmd_getc (); 2805 ch = cmd_getc ();
3246 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3247 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3291 switch (priv) 2851 switch (priv)
3292 { 2852 {
3293 case '>': 2853 case '>':
3294 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3295 { 2855 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 // 2858 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3301 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3435 break; 2995 break;
3436 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3437 scr_report_position (); 2997 scr_report_position ();
3438 break; 2998 break;
3439 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3441 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3442 break; 3002 break;
3443 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3445 break; 3005 break;
… …
3609 break; 3169 break;
3610 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3611 { 3171 {
3612 char *s; 3172 char *s;
3613 XGetIconName (dpy, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3615 XFree (s); 3175 XFree (s);
3616 } 3176 }
3617 break; 3177 break;
3618 case 21: /* report window title */ 3178 case 21: /* report window title */
3619 { 3179 {
3620 char *s; 3180 char *s;
3621 XFetchName (dpy, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3623 XFree (s); 3183 XFree (s);
3624 } 3184 }
3625 break; 3185 break;
3626 } 3186 }
3627} 3187}
… …
3654 seen_esc = true; 3214 seen_esc = true;
3655 continue; 3215 continue;
3656 } 3216 }
3657 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3658 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3659 else if (ch < 0x20) 3221 else if (ch < 0x20)
3660 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3661 3223
3662 seen_esc = false; 3224 seen_esc = false;
3663 3225
3664 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3665 // stop at some sane length 3227 // stop at some sane length
3666 return NULL; 3228 return NULL;
3667 3229
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
3671 string[n++] = ch; 3230 string[n++] = ch;
3672 } 3231 }
3673 3232
3674 string[n++] = '\0'; 3233 string[n++] = '\0';
3675 3234
3676 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3755 int saveop = op; 3314 int saveop = op;
3756 3315
3757 dLocal (Display *, dpy); 3316 dLocal (Display *, dpy);
3758 3317
3759 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3760 switch (op) 3323 switch (op)
3761 { 3324 {
3762 case XTerm_name: 3325 case XTerm_name:
3763 set_title (str); 3326 set_title (str);
3764 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3856 break; 3419 break;
3857 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3859 break; 3422 break;
3860#endif 3423#endif
3861#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3862 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3863 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3429 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3864 3436
3865 check_our_parents ();
3866
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3869
3870 break; 3437 break;
3871#endif 3438#endif
3872 3439
3440#if XPM_BACKGROUND
3873 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3874 { 3442 if (!strcmp (str, "?"))
3875 if (*str != ';')
3876 { 3443 {
3877#if XPM_BACKGROUND 3444 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3445
3879 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3450 }
3883 3451 else
3452 {
3884 int changed = 0; 3453 int changed = 0;
3885 3454
3886 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3887 { 3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465 while (str)
3466 {
3888 str++; 3467 str++;
3889#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3890 changed += scale_pixmap (str); 3469 changed++;
3891#endif 3470 str = strchr (str, ';');
3892 } 3471 }
3893
3894 if (changed) 3472 if (changed)
3895 { 3473 update_background ();
3896#ifdef XPM_BACKGROUND
3897 resize_pixmap ();
3898 scr_touch (true);
3899#endif
3900 } 3474 }
3901 }
3902 break; 3475 break;
3476#endif
3903 3477
3904 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3905 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3906 break; 3480 break;
3907 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
… …
3932 case URxvt_italicFont: 3506 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3934#endif 3508#endif
3935 if (query) 3509 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3513 resp);
3940 else 3514 else
3941 { 3515 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3956 break; 3530 break;
3957 3531
3958#if !ENABLE_MINIMAL 3532#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3533 case URxvt_locale:
3960 if (query) 3534 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 3536 else
3963 { 3537 {
3964 set_locale (str); 3538 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3540 init_xlocale ();
… …
3981 break; 3555 break;
3982#endif 3556#endif
3983 3557
3984#if ENABLE_PERL 3558#if ENABLE_PERL
3985 case URxvt_perl: 3559 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3987 ; // no responses yet 3561 ; // no responses yet
3988 break; 3562 break;
3989#endif 3563#endif
3990 } 3564 }
3991} 3565}
… …
4029{ 3603{
4030 unsigned int i, j; 3604 unsigned int i, j;
4031 int state; 3605 int state;
4032 3606
4033 static const struct 3607 static const struct
4034 { 3608 {
4035 const int argval; 3609 const int argval;
4036 const unsigned long bit; 3610 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3611 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
… …
4107 scr_touch (true); 3679 scr_touch (true);
4108 break; 3680 break;
4109#endif 3681#endif
4110 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4111 case 1049: 3683 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3685 if (mode == 0)
4114 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4115 else if (mode == 1) 3687 else if (mode == 1)
4116 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4117 break; 3689 break;
… …
4182 break; 3754 break;
4183 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3757 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3760 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3761 scr_erase_screen (2);
4190 scr_change_screen (state); 3762 scr_change_screen (state);
4191 break; 3763 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3764 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3765 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3766 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3767 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3768 scr_erase_screen (2);
4197 break; 3769 break;
4198 default: 3770 default:
4199 break; 3771 break;

Diff Legend

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