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.316 by root, Thu Dec 7 20:59:59 2006 UTC vs.
Revision 1.340 by sasha, Fri Aug 3 22:40:10 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;
… …
720 728
721 case XK_Find: 729 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
723 break; 731 break;
724 732
725#ifdef XK_KP_End 733#ifdef XK_KP_Insert
726 case XK_KP_Insert: 734 case XK_KP_Insert:
727 /* allow shift to override */ 735 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 { 737 {
730 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
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:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1469 focus_in ();
1465 break; 1470 break;
1466 1471
1467 case FocusOut: 1472 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1476 focus_out ();
1470 break; 1477 break;
1471 1478
1472 case ConfigureNotify: 1479 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
… …
1477 1484
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1486 {
1480 seen_resize = 1; 1487 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef HAVE_BG_PIXMAP
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1482 } 1497 }
1483 1498
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485 1500
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1501#ifdef ENABLE_TRANSPARENCY
1487 if (OPTION (Opt_transparent)) 1502 if (option (Opt_transparent))
1488 check_our_parents (); 1503 check_our_parents ();
1489#endif 1504#endif
1490 } 1505 }
1491 break; 1506 break;
1492 1507
… …
1525 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1526#endif 1541#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1543 break;
1529 1544
1530#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1531 case ReparentNotify: 1546 case ReparentNotify:
1532 rootwin_cb (ev); 1547 rootwin_cb (ev);
1533 break; 1548 break;
1534#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1535 1550
1536 case GraphicsExpose: 1551 case GraphicsExpose:
1537 case Expose: 1552 case Expose:
1538 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1539 { 1554 {
… …
1563 { 1578 {
1564 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1565 scrollbar_show (0); 1580 scrollbar_show (0);
1566 } 1581 }
1567 1582
1568#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1569 if (am_transparent && ev.xany.window == parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1571#endif 1586#endif
1572 } 1587 }
1573 break; 1588 break;
… …
1674 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1690 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1692 scrollbar_size ());
1678 want_refresh = 1; 1693 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1694 scrollbar_show (1);
1681 } 1695 }
1682 break; 1696 break;
1683 } 1697 }
1684 1698
1685#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1701 {
1688 if (hidden_cursor) 1702 if (hidden_cursor)
1689 { 1703 {
1690 hidden_cursor = 0; 1704 hidden_cursor = 0;
1691 want_refresh = 1; 1705 want_refresh = 1;
… …
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 } 1709 }
1696#endif 1710#endif
1697 1711
1698#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1714 {
1701 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1726 IMSetPosition (); 1740 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1741 XSetICFocus (Input_Context);
1728 } 1742 }
1729#endif 1743#endif
1730#if CURSOR_BLINK 1744#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif 1747#endif
1734#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1736 { 1750 {
1737 pix_colors = pix_colors_focused; 1751 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1752 scr_recolour ();
1739 } 1753 }
1740#endif 1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1741 } 1768 }
1742} 1769}
1743 1770
1744void 1771void
1745rxvt_term::focus_out () 1772rxvt_term::focus_out ()
… …
1753 1780
1754#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1782 if (iso14755buf)
1756 { 1783 {
1757 iso14755buf = 0; 1784 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1785# if ISO_14755
1759 scr_overlay_off (); 1786 scr_overlay_off ();
1760# endif 1787# endif
1761 } 1788 }
1762#endif 1789#endif
1763#if USE_XIM 1790#if USE_XIM
1764 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1766#endif 1793#endif
1767#if CURSOR_BLINK 1794#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1770 hidden_cursor = 0; 1797 hidden_cursor = 0;
1771#endif 1798#endif
1772#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1818 }
1792#endif 1819#endif
1793} 1820}
1794 1821
1795#if TRANSPARENT || ENABLE_PERL 1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1796void 1823void
1797rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1825{
1799 make_current (); 1826 make_current ();
1800 1827
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1830 return;
1804 1831
1805# if TRANSPARENT 1832# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1833 switch (ev.type)
1807 { 1834 {
1808 case PropertyNotify: 1835 case PropertyNotify:
1809 /* 1836 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1837 * if user used some Esetroot compatible prog to set the root bg,
… …
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1815 return; 1842 return;
1816 1843
1817 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1818 case ReparentNotify: 1845 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1846 if (option (Opt_transparent))
1820 want_refresh = want_full_refresh = 1; 1847 check_our_parents ();
1821 break; 1848 break;
1822 } 1849 }
1823# endif 1850# endif
1824} 1851}
1825#endif 1852#endif
… …
2156 selection_make (ev.time); 2183 selection_make (ev.time);
2157 break; 2184 break;
2158 2185
2159 case Button2: 2186 case Button2:
2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2187 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2189 break;
2163 2190
2164#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
2165 case Button4: 2192 case Button4:
2166 case Button5: 2193 case Button5:
… …
2170 2197
2171 v = ev.button == Button4 ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2172 2199
2173 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
2174 i = 1; 2201 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2202 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2203 i = nrow - 1;
2177 else 2204 else
2178 i = 5; 2205 i = 5;
2179 2206
2180# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
… …
2201 break; 2228 break;
2202#endif 2229#endif
2203 } 2230 }
2204 } 2231 }
2205} 2232}
2206
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678 2233
2679/*}}} */ 2234/*}}} */
2680 2235
2681bool 2236bool
2682rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
… …
2731 if (ch == C0_LF) 2286 if (ch == C0_LF)
2732 nlines++; 2287 nlines++;
2733 2288
2734 refresh_count++; 2289 refresh_count++;
2735 2290
2736 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2292 {
2739 refreshnow = true;
2740 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2297 refreshnow = true;
2741 ch = NOCHAR; 2298 ch = NOCHAR;
2742 break; 2299 break;
2300 }
2743 } 2301 }
2744 2302
2745 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2747 { 2305 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2777 2335
2778 /* 2336 /*
2779 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2340 */
2784 if (refreshnow) 2341 if (refreshnow)
2785 { 2342 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true; 2343 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2344 scr_refresh ();
2793 want_refresh = 1; 2345 want_refresh = 1;
2794 }
2795 } 2346 }
2796 2347
2797 } 2348 }
2798 else 2349 else
2799 { 2350 {
… …
2948 { 2499 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2501 break; /* done = 1 */
2951 } 2502 }
2952 } 2503 }
2953 2504
2954 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2956 { 2507 {
2957 done = 1; 2508 done = 1;
2958 break; 2509 break;
… …
3020 process_dcs_seq (); 2571 process_dcs_seq ();
3021 break; 2572 break;
3022 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
3023 process_csi_seq (); 2574 process_csi_seq ();
3024 break; 2575 break;
3025 case 0x9d: /* CSI */ 2576 case 0x9d: /* OSC */
3026 process_osc_seq (); 2577 process_osc_seq ();
3027 break; 2578 break;
3028#endif 2579#endif
3029 } 2580 }
3030} 2581}
… …
3258 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
3259 unsigned int nargs, p; 2810 unsigned int nargs, p;
3260 int n, ndef; 2811 int n, ndef;
3261 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
3262 2813
3263 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
3264 arg[--nargs] = 0; 2815 nargs = 0;
3265 2816
3266 priv = 0; 2817 priv = 0;
3267 ch = cmd_getc (); 2818 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
3269 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
3313 switch (priv) 2864 switch (priv)
3314 { 2865 {
3315 case '>': 2866 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2868 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2871 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2874 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3457 break; 3008 break;
3458 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
3459 scr_report_position (); 3010 scr_report_position ();
3460 break; 3011 break;
3461 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 3013 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 3015 break;
3465 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 3018 break;
… …
3631 break; 3182 break;
3632 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3633 { 3184 {
3634 char *s; 3185 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3188 XFree (s);
3638 } 3189 }
3639 break; 3190 break;
3640 case 21: /* report window title */ 3191 case 21: /* report window title */
3641 { 3192 {
3642 char *s; 3193 char *s;
3643 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3196 XFree (s);
3646 } 3197 }
3647 break; 3198 break;
3648 } 3199 }
3649} 3200}
… …
3776 int saveop = op; 3327 int saveop = op;
3777 3328
3778 dLocal (Display *, dpy); 3329 dLocal (Display *, dpy);
3779 3330
3780 assert (str != NULL); 3331 assert (str != NULL);
3781 3332
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3333 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3334 return;
3784 3335
3785 switch (op) 3336 switch (op)
3786 { 3337 {
… …
3881 break; 3432 break;
3882 case URxvt_Color_IT: 3433 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3434 process_color_seq (op, Color_IT, str, resp);
3884 break; 3435 break;
3885#endif 3436#endif
3886#if TRANSPARENT && TINTING 3437#if ENABLE_TRANSPARENCY && TINTING
3887 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3889 3440
3890 check_our_parents (); 3441 check_our_parents ();
3891 3442
… …
3893 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3894 3445
3895 break; 3446 break;
3896#endif 3447#endif
3897 3448
3449#if XPM_BACKGROUND
3898 case Rxvt_Pixmap: 3450 case Rxvt_Pixmap:
3899 { 3451 {
3900 if (*str != ';') 3452 if (*str != ';')
3901 { 3453 {
3902#if XPM_BACKGROUND
3903 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3904 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3905 scr_touch (true); 3456 scr_touch (true);
3906#endif
3907 } 3457 }
3908 3458
3909 int changed = 0; 3459 int changed = 0;
3910 3460
3911 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3912 { 3462 {
3913 str++; 3463 str++;
3914#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3915 changed += scale_pixmap (str);
3916#endif
3917 } 3465 }
3918 3466
3919 if (changed) 3467 if (changed)
3920 { 3468 {
3921#ifdef XPM_BACKGROUND
3922 resize_pixmap (); 3469 resize_pixmap ();
3923 scr_touch (true); 3470 scr_touch (true);
3924#endif
3925 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3926 } 3476 }
3927 break; 3477 break;
3478#endif
3928 3479
3929 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3931 break; 3482 break;
3932 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3957 case URxvt_italicFont: 3508 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3959#endif 3510#endif
3960 if (query) 3511 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3515 resp);
3965 else 3516 else
3966 { 3517 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3532 break;
3982 3533
3983#if !ENABLE_MINIMAL 3534#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3535 case URxvt_locale:
3985 if (query) 3536 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 3538 else
3988 { 3539 {
3989 set_locale (str); 3540 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3542 init_xlocale ();
… …
4132 scr_touch (true); 3683 scr_touch (true);
4133 break; 3684 break;
4134#endif 3685#endif
4135 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4136 case 1049: 3687 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3689 if (mode == 0)
4139 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4140 else if (mode == 1) 3691 else if (mode == 1)
4141 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4142 break; 3693 break;
… …
4207 break; 3758 break;
4208 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3760 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3761 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3762 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3763 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 3765 scr_erase_screen (2);
4215 scr_change_screen (state); 3766 scr_change_screen (state);
4216 break; 3767 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state); 3769 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4221 scr_erase_screen (2); 3772 scr_erase_screen (2);
4222 break; 3773 break;
4223 default: 3774 default:
4224 break; 3775 break;

Diff Legend

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