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.310 by root, Thu Feb 23 19:26:56 2006 UTC vs.
Revision 1.337 by ayin, Sat Jul 28 20:04:00 2007 UTC

… …
500# if ISO_14755 500# if ISO_14755
501 iso14755_51 (0); 501 iso14755_51 (0);
502# endif 502# endif
503 return; 503 return;
504 } 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);
510# endif
511 return;
512 }
505 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
506 { 514 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
509# if ISO_14755 517# if ISO_14755
… …
511# endif 519# endif
512 return; 520 return;
513 } 521 }
514 else 522 else
515 { 523 {
516# if ENABLE_OVERLAY 524# if ISO_14755
517 scr_overlay_off (); 525 scr_overlay_off ();
518# endif 526# endif
519 iso14755buf = 0; 527 iso14755buf = 0;
520 } 528 }
521 } 529 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
525 { 533 {
526 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 535# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 538# endif
531 } 539 }
532#endif 540#endif
533 541
534#ifdef PRINTPIPE 542#ifdef PRINTPIPE
535 if (keysym == XK_Print) 543 if (keysym == XK_Print)
536 { 544 {
537 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
538 return; 546 return;
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
926#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 935 // ISO 14755 support
928 if (iso14755buf) 936 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
930 { 938 {
931# if ENABLE_OVERLAY 939# if ISO_14755
932 scr_overlay_off (); 940 scr_overlay_off ();
933# endif 941# endif
934# if ISO_14755 942# if ISO_14755
935 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
936 // first: controls 944 // first: controls
… …
959 967
960 return; 968 return;
961 } 969 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 971 {
964# if ENABLE_OVERLAY 972# if ISO_14755
965 scr_overlay_off (); 973 scr_overlay_off ();
966# endif 974# endif
967 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 976 commit_iso14755 ();
969#if ISO_14755 977#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 979 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 981
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 1035void
1028rxvt_term::flush () 1036rxvt_term::flush ()
1029{ 1037{
1030 flush_ev.stop (); 1038 flush_ev.stop ();
1031 1039
1032#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
1033 if (want_full_refresh) 1041 if (want_full_refresh)
1034 { 1042 {
1035 want_full_refresh = 0; 1043 want_full_refresh = 0;
1036 scr_clear (); 1044 scr_clear ();
1037 scr_touch (false); 1045 scr_touch (false);
… …
1102void 1110void
1103rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1104{ 1112{
1105 make_current (); 1113 make_current ();
1106 1114
1107 refresh_limit = 1;
1108 refresh_count = 0; 1115 refresh_count = 0;
1109 flush (); 1116 flush ();
1110} 1117}
1111 1118
1112#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1178 1185
1179#if LINUX_YIELD_HACK 1186#if LINUX_YIELD_HACK
1180static struct event_handler 1187static struct event_handler
1181{ 1188{
1182 check_watcher yield_ev; 1189 check_watcher yield_ev;
1183 1190
1184 void yield_cb (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1185 { 1192 {
1186 // this should really be sched_yield(), but the linux guys thought 1193 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1194 // 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 1195 // ones with high nice levels is a useful thing to do. It surely is is
… …
1232 } 1239 }
1233 else 1240 else
1234 { 1241 {
1235 pty_ev.stop (); 1242 pty_ev.stop ();
1236 1243
1237 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1238 destroy (); 1245 destroy ();
1239 } 1246 }
1240 1247
1241 return false; 1248 return false;
1242} 1249}
1243 1250
1244void 1251void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1263 recolour_cursor (); 1270 recolour_cursor ();
1264 1271
1265#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1273 hidden_pointer = 0;
1267 1274
1268 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1277#endif
1271} 1278}
1272 1279
1273#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1274void 1281void
1275rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1276{ 1283{
1277 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1278 return; 1285 return;
1279 1286
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1288 XFlush (dpy);
1282 1289
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1434 focus_out ();
1428 } 1435 }
1429#endif 1436#endif
1430 } 1437 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1438 break;
1436 1439
1437 /* 1440 /*
1438 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1458 break; 1461 break;
1459 } 1462 }
1460 break; 1463 break;
1461 1464
1462 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1469 focus_in ();
1464 break; 1470 break;
1465 1471
1466 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1476 focus_out ();
1468 break; 1477 break;
1469 1478
1470 case ConfigureNotify: 1479 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1472 { 1481 {
… …
1475 1484
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1486 {
1478 seen_resize = 1; 1487 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1480 } 1496 }
1481 1497
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 1499
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500#ifdef ENABLE_TRANSPARENCY
1485 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1486 check_our_parents (); 1502 check_our_parents ();
1487#endif 1503#endif
1488 } 1504 }
1489 break; 1505 break;
1490 1506
… …
1523 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1524#endif 1540#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1542 break;
1527 1543
1528#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1529 case ReparentNotify: 1545 case ReparentNotify:
1530 rootwin_cb (ev); 1546 rootwin_cb (ev);
1531 break; 1547 break;
1532#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1533 1549
1534 case GraphicsExpose: 1550 case GraphicsExpose:
1535 case Expose: 1551 case Expose:
1536 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1537 { 1553 {
… …
1561 { 1577 {
1562 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1563 scrollbar_show (0); 1579 scrollbar_show (0);
1564 } 1580 }
1565 1581
1566#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1567 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1569#endif 1585#endif
1570 } 1586 }
1571 break; 1587 break;
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1689 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1691 scrollbar_size ());
1676 want_refresh = 1; 1692 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1693 scrollbar_show (1);
1679 } 1694 }
1680 break; 1695 break;
1681 } 1696 }
1682 1697
1683#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1700 {
1686 if (hidden_cursor) 1701 if (hidden_cursor)
1687 { 1702 {
1688 hidden_cursor = 0; 1703 hidden_cursor = 0;
1689 want_refresh = 1; 1704 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1708 }
1694#endif 1709#endif
1695 1710
1696#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1713 {
1699 if (ev.type == MotionNotify 1714 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1715 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1716 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1717 if (hidden_pointer)
… …
1724 IMSetPosition (); 1739 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1726 } 1741 }
1727#endif 1742#endif
1728#if CURSOR_BLINK 1743#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1746#endif
1732#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1734 { 1749 {
1735 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1751 scr_recolour ();
1737 } 1752 }
1738#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1739 } 1767 }
1740} 1768}
1741 1769
1742void 1770void
1743rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1751 1779
1752#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1781 if (iso14755buf)
1754 { 1782 {
1755 iso14755buf = 0; 1783 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1784# if ISO_14755
1757 scr_overlay_off (); 1785 scr_overlay_off ();
1758# endif 1786# endif
1759 } 1787 }
1760#endif 1788#endif
1761#if USE_XIM 1789#if USE_XIM
1762 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1764#endif 1792#endif
1765#if CURSOR_BLINK 1793#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1796 hidden_cursor = 0;
1769#endif 1797#endif
1770#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1775 } 1803 }
1776#endif 1804#endif
1777 } 1805 }
1778} 1806}
1779 1807
1780#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1822void
1782rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1824{
1784 make_current (); 1825 make_current ();
1785 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1832 switch (ev.type)
1787 { 1833 {
1788 case PropertyNotify: 1834 case PropertyNotify:
1789 /* 1835 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1795 return; 1841 return;
1796 1842
1797 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1798 case ReparentNotify: 1844 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1800 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1801 break; 1847 break;
1802 } 1848 }
1849# endif
1803} 1850}
1804#endif 1851#endif
1805 1852
1806void 1853void
1807rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
… …
2135 selection_make (ev.time); 2182 selection_make (ev.time);
2136 break; 2183 break;
2137 2184
2138 case Button2: 2185 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 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); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2188 break;
2142 2189
2143#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2144 case Button4: 2191 case Button4:
2145 case Button5: 2192 case Button5:
… …
2149 2196
2150 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2151 2198
2152 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2153 i = 1; 2200 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2202 i = nrow - 1;
2156 else 2203 else
2157 i = 5; 2204 i = 5;
2158 2205
2159# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2180 break; 2227 break;
2181#endif 2228#endif
2182 } 2229 }
2183 } 2230 }
2184} 2231}
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 2232
2658/*}}} */ 2233/*}}} */
2659 2234
2660bool 2235bool
2661rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2285 if (ch == C0_LF)
2711 nlines++; 2286 nlines++;
2712 2287
2713 refresh_count++; 2288 refresh_count++;
2714 2289
2715 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2291 {
2718 refreshnow = true;
2719 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2720 ch = NOCHAR; 2297 ch = NOCHAR;
2721 break; 2298 break;
2299 }
2722 } 2300 }
2723 2301
2724 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2726 { 2304 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2333 scr_add_lines (buf, str - buf, nlines);
2756 2334
2757 /* 2335 /*
2758 * If there have been a lot of new lines, then update the screen 2336 * 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. 2337 * 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 2338 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2339 */
2763 if (refreshnow) 2340 if (refreshnow)
2764 { 2341 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2342 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2343 scr_refresh ();
2772 want_refresh = 1; 2344 want_refresh = 1;
2773 }
2774 } 2345 }
2775 2346
2776 } 2347 }
2777 else 2348 else
2778 { 2349 {
… …
2927 { 2498 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2500 break; /* done = 1 */
2930 } 2501 }
2931 } 2502 }
2932 2503
2933 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2935 { 2506 {
2936 done = 1; 2507 done = 1;
2937 break; 2508 break;
… …
2999 process_dcs_seq (); 2570 process_dcs_seq ();
3000 break; 2571 break;
3001 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
3002 process_csi_seq (); 2573 process_csi_seq ();
3003 break; 2574 break;
3004 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
3005 process_osc_seq (); 2576 process_osc_seq ();
3006 break; 2577 break;
3007#endif 2578#endif
3008 } 2579 }
3009} 2580}
… …
3237 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2809 unsigned int nargs, p;
3239 int n, ndef; 2810 int n, ndef;
3240 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3241 2812
3242 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3243 arg[--nargs] = 0; 2814 nargs = 0;
3244 2815
3245 priv = 0; 2816 priv = 0;
3246 ch = cmd_getc (); 2817 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3248 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3292 switch (priv) 2863 switch (priv)
3293 { 2864 {
3294 case '>': 2865 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2867 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2870 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2873 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3436 break; 3007 break;
3437 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3438 scr_report_position (); 3009 scr_report_position ();
3439 break; 3010 break;
3440 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3014 break;
3444 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3017 break;
… …
3610 break; 3181 break;
3611 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3612 { 3183 {
3613 char *s; 3184 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3187 XFree (s);
3617 } 3188 }
3618 break; 3189 break;
3619 case 21: /* report window title */ 3190 case 21: /* report window title */
3620 { 3191 {
3621 char *s; 3192 char *s;
3622 XFetchName (dpy, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3195 XFree (s);
3625 } 3196 }
3626 break; 3197 break;
3627 } 3198 }
3628} 3199}
… …
3655 seen_esc = true; 3226 seen_esc = true;
3656 continue; 3227 continue;
3657 } 3228 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3233 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3662 3235
3663 seen_esc = false; 3236 seen_esc = false;
3664 3237
3665 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3239 // stop at some sane length
3667 return NULL; 3240 return NULL;
3668 3241
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3242 string[n++] = ch;
3673 } 3243 }
3674 3244
3675 string[n++] = '\0'; 3245 string[n++] = '\0';
3676 3246
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3756 int saveop = op; 3326 int saveop = op;
3757 3327
3758 dLocal (Display *, dpy); 3328 dLocal (Display *, dpy);
3759 3329
3760 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3761 switch (op) 3335 switch (op)
3762 { 3336 {
3763 case XTerm_name: 3337 case XTerm_name:
3764 set_title (str); 3338 set_title (str);
3765 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3857 break; 3431 break;
3858 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3859 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3860 break; 3434 break;
3861#endif 3435#endif
3862#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3863 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3864 process_color_seq (op, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3865 3439
3866 check_our_parents (); 3440 check_our_parents ();
3867 3441
… …
3897#ifdef XPM_BACKGROUND 3471#ifdef XPM_BACKGROUND
3898 resize_pixmap (); 3472 resize_pixmap ();
3899 scr_touch (true); 3473 scr_touch (true);
3900#endif 3474#endif
3901 } 3475 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3902 } 3480 }
3903 break; 3481 break;
3904 3482
3905 case Rxvt_restoreFG: 3483 case Rxvt_restoreFG:
3906 set_window_color (Color_fg, str); 3484 set_window_color (Color_fg, str);
… …
3933 case URxvt_italicFont: 3511 case URxvt_italicFont:
3934 case URxvt_boldItalicFont: 3512 case URxvt_boldItalicFont:
3935#endif 3513#endif
3936 if (query) 3514 if (query)
3937 tt_printf ("\33]%d;%-.250s%c", saveop, 3515 tt_printf ("\33]%d;%-.250s%c", saveop,
3938 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3516 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3939 ? fontset[op - URxvt_font]->fontdesc : "", 3517 ? fontset[op - URxvt_font]->fontdesc : "",
3940 resp); 3518 resp);
3941 else 3519 else
3942 { 3520 {
3943 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3521 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3957 break; 3535 break;
3958 3536
3959#if !ENABLE_MINIMAL 3537#if !ENABLE_MINIMAL
3960 case URxvt_locale: 3538 case URxvt_locale:
3961 if (query) 3539 if (query)
3962 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3540 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3963 else 3541 else
3964 { 3542 {
3965 set_locale (str); 3543 set_locale (str);
3966 pty->set_utf8_mode (enc_utf8); 3544 pty->set_utf8_mode (enc_utf8);
3967 init_xlocale (); 3545 init_xlocale ();
… …
3982 break; 3560 break;
3983#endif 3561#endif
3984 3562
3985#if ENABLE_PERL 3563#if ENABLE_PERL
3986 case URxvt_perl: 3564 case URxvt_perl:
3987 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3988 ; // no responses yet 3566 ; // no responses yet
3989 break; 3567 break;
3990#endif 3568#endif
3991 } 3569 }
3992} 3570}
… …
4108 scr_touch (true); 3686 scr_touch (true);
4109 break; 3687 break;
4110#endif 3688#endif
4111 case 1048: /* alternative cursor save */ 3689 case 1048: /* alternative cursor save */
4112 case 1049: 3690 case 1049:
4113 if (OPTION (Opt_secondaryScreen)) 3691 if (option (Opt_secondaryScreen))
4114 if (mode == 0) 3692 if (mode == 0)
4115 scr_cursor (RESTORE); 3693 scr_cursor (RESTORE);
4116 else if (mode == 1) 3694 else if (mode == 1)
4117 scr_cursor (SAVE); 3695 scr_cursor (SAVE);
4118 break; 3696 break;
… …
4183 break; 3761 break;
4184 case 1011: /* scroll to bottom on key press */ 3762 case 1011: /* scroll to bottom on key press */
4185 set_option (Opt_scrollTtyKeypress, state); 3763 set_option (Opt_scrollTtyKeypress, state);
4186 break; 3764 break;
4187 case 1047: /* secondary screen w/ clearing last */ 3765 case 1047: /* secondary screen w/ clearing last */
4188 if (OPTION (Opt_secondaryScreen)) 3766 if (option (Opt_secondaryScreen))
4189 if (current_screen != PRIMARY) 3767 if (current_screen != PRIMARY)
4190 scr_erase_screen (2); 3768 scr_erase_screen (2);
4191 scr_change_screen (state); 3769 scr_change_screen (state);
4192 break; 3770 break;
4193 case 1049: /* secondary screen w/ clearing first */ 3771 case 1049: /* secondary screen w/ clearing first */
4194 scr_change_screen (state); 3772 scr_change_screen (state);
4195 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4196 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4197 scr_erase_screen (2); 3775 scr_erase_screen (2);
4198 break; 3776 break;
4199 default: 3777 default:
4200 break; 3778 break;

Diff Legend

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