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

Diff Legend

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