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.313 by root, Wed Jul 5 22:46:14 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:
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 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
1480 } 1497 }
1481 1498
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 1500
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1501#ifdef ENABLE_TRANSPARENCY
1485 if (OPTION (Opt_transparent)) 1502 if (option (Opt_transparent))
1486 check_our_parents (); 1503 check_our_parents ();
1487#endif 1504#endif
1488 } 1505 }
1489 break; 1506 break;
1490 1507
… …
1523 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1524#endif 1541#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1543 break;
1527 1544
1528#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1529 case ReparentNotify: 1546 case ReparentNotify:
1530 rootwin_cb (ev); 1547 rootwin_cb (ev);
1531 break; 1548 break;
1532#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1533 1550
1534 case GraphicsExpose: 1551 case GraphicsExpose:
1535 case Expose: 1552 case Expose:
1536 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1537 { 1554 {
… …
1561 { 1578 {
1562 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1563 scrollbar_show (0); 1580 scrollbar_show (0);
1564 } 1581 }
1565 1582
1566#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1567 if (am_transparent && ev.xany.window == parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1569#endif 1586#endif
1570 } 1587 }
1571 break; 1588 break;
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1690 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1692 scrollbar_size ());
1676 want_refresh = 1; 1693 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1694 scrollbar_show (1);
1679 } 1695 }
1680 break; 1696 break;
1681 } 1697 }
1682 1698
1683#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1701 {
1686 if (hidden_cursor) 1702 if (hidden_cursor)
1687 { 1703 {
1688 hidden_cursor = 0; 1704 hidden_cursor = 0;
1689 want_refresh = 1; 1705 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1709 }
1694#endif 1710#endif
1695 1711
1696#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1714 {
1699 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1724 IMSetPosition (); 1740 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1741 XSetICFocus (Input_Context);
1726 } 1742 }
1727#endif 1743#endif
1728#if CURSOR_BLINK 1744#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1747#endif
1732#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1734 { 1750 {
1735 pix_colors = pix_colors_focused; 1751 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1752 scr_recolour ();
1737 } 1753 }
1738#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
1739 } 1768 }
1740} 1769}
1741 1770
1742void 1771void
1743rxvt_term::focus_out () 1772rxvt_term::focus_out ()
… …
1751 1780
1752#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1782 if (iso14755buf)
1754 { 1783 {
1755 iso14755buf = 0; 1784 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1785# if ISO_14755
1757 scr_overlay_off (); 1786 scr_overlay_off ();
1758# endif 1787# endif
1759 } 1788 }
1760#endif 1789#endif
1761#if USE_XIM 1790#if USE_XIM
1762 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1764#endif 1793#endif
1765#if CURSOR_BLINK 1794#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1797 hidden_cursor = 0;
1769#endif 1798#endif
1770#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
… …
1788 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);
1789 } 1818 }
1790#endif 1819#endif
1791} 1820}
1792 1821
1793#if TRANSPARENT 1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1823void
1795rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1825{
1797 make_current (); 1826 make_current ();
1798 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1799 switch (ev.type) 1833 switch (ev.type)
1800 { 1834 {
1801 case PropertyNotify: 1835 case PropertyNotify:
1802 /* 1836 /*
1803 * 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,
… …
1807 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1808 return; 1842 return;
1809 1843
1810 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1811 case ReparentNotify: 1845 case ReparentNotify:
1812 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1846 if (option (Opt_transparent))
1813 want_refresh = want_full_refresh = 1; 1847 check_our_parents ();
1814 break; 1848 break;
1815 } 1849 }
1850# endif
1816} 1851}
1817#endif 1852#endif
1818 1853
1819void 1854void
1820rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
2148 selection_make (ev.time); 2183 selection_make (ev.time);
2149 break; 2184 break;
2150 2185
2151 case Button2: 2186 case Button2:
2152 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?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2189 break;
2155 2190
2156#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
2157 case Button4: 2192 case Button4:
2158 case Button5: 2193 case Button5:
… …
2162 2197
2163 v = ev.button == Button4 ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2164 2199
2165 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
2166 i = 1; 2201 i = 1;
2167 else if (OPTION (Opt_mouseWheelScrollPage)) 2202 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2203 i = nrow - 1;
2169 else 2204 else
2170 i = 5; 2205 i = 5;
2171 2206
2172# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
… …
2193 break; 2228 break;
2194#endif 2229#endif
2195 } 2230 }
2196 } 2231 }
2197} 2232}
2198
2199#ifdef TRANSPARENT
2200#if TINTING
2201/* taken from aterm-0.4.2 */
2202
2203typedef uint32_t RUINT32T;
2204
2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2206{
2207 int sh_r, sh_g, sh_b;
2208 RUINT32T mask_r, mask_g, mask_b;
2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2212 int i;
2213
2214 Visual *visual = term->visual;
2215
2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2217
2218 /* for convenience */
2219 mask_r = visual->red_mask;
2220 mask_g = visual->green_mask;
2221 mask_b = visual->blue_mask;
2222
2223 /* boring lookup table pre-initialization */
2224 switch (srcImage->bits_per_pixel) {
2225 case 15:
2226 if ((mask_r != 0x7c00) ||
2227 (mask_g != 0x03e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+32;
2234 sh_r = 10;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 16:
2239 if ((mask_r != 0xf800) ||
2240 (mask_g != 0x07e0) ||
2241 (mask_b != 0x001f))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2244 lookup_r = lookup;
2245 lookup_g = lookup+32;
2246 lookup_b = lookup+32+64;
2247 sh_r = 11;
2248 sh_g = 5;
2249 sh_b = 0;
2250 break;
2251 case 24:
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 case 32:
2265 if ((mask_r != 0xff0000) ||
2266 (mask_g != 0x00ff00) ||
2267 (mask_b != 0x0000ff))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2270 lookup_r = lookup;
2271 lookup_g = lookup+256;
2272 lookup_b = lookup+256+256;
2273 sh_r = 16;
2274 sh_g = 8;
2275 sh_b = 0;
2276 break;
2277 default:
2278 return; /* we do not support this color depth */
2279 }
2280
2281 /* prepare limits for color transformation (each channel is handled separately) */
2282 if (shade < 0) {
2283 shade = -shade;
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = 65535-rm;
2288 lower_lim_g = 65535-gm;
2289 lower_lim_b = 65535-bm;
2290
2291 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2292 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2293 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2294
2295 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2296 } else {
2297 if (shade < 0) shade = 0;
2298 if (shade > 100) shade = 100;
2299
2300 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2301
2302 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2303 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2304 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2305 }
2306
2307 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2308 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2309 {
2310 unsigned int tmp;
2311
2312 tmp = lower_lim_r;
2313 lower_lim_r = lower_lim_b;
2314 lower_lim_b = tmp;
2315
2316 tmp = upper_lim_r;
2317 upper_lim_r = upper_lim_b;
2318 upper_lim_b = tmp;
2319 }
2320
2321 /* fill our lookup tables */
2322 for (i = 0; i <= mask_r>>sh_r; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2326 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2327 lookup_r[i] = (tmp/65535)<<sh_r;
2328 }
2329 for (i = 0; i <= mask_g>>sh_g; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2333 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2334 lookup_g[i] = (tmp/65535)<<sh_g;
2335 }
2336 for (i = 0; i <= mask_b>>sh_b; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2340 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2341 lookup_b[i] = (tmp/65535)<<sh_b;
2342 }
2343
2344 /* apply table to input image (replacing colors by newly calculated ones) */
2345 switch (srcImage->bits_per_pixel)
2346 {
2347 case 15:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0x7c00)>>10] |
2359 lookup_g[(*p & 0x03e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 16:
2367 {
2368 unsigned short *p1, *pf, *p, *pl;
2369 p1 = (unsigned short *) srcImage->data;
2370 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width;
2375 for (; p < pl; p++)
2376 {
2377 *p = lookup_r[(*p & 0xf800)>>11] |
2378 lookup_g[(*p & 0x07e0)>> 5] |
2379 lookup_b[(*p & 0x001f)];
2380 }
2381 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 24:
2386 {
2387 unsigned char *p1, *pf, *p, *pl;
2388 p1 = (unsigned char *) srcImage->data;
2389 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width * 3;
2394 for (; p < pl; p += 3)
2395 {
2396 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2397 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2398 p[2] = lookup_r[(p[2] & 0x0000ff)];
2399 }
2400 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 32:
2405 {
2406 RUINT32T *p1, *pf, *p, *pl;
2407 p1 = (RUINT32T *) srcImage->data;
2408 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xff0000)>>16] |
2417 lookup_g[(*p & 0x00ff00)>> 8] |
2418 lookup_b[(*p & 0x0000ff)] |
2419 (*p & ~0xffffff);
2420 }
2421 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 }
2426
2427 free (lookup);
2428}
2429#endif
2430
2431/*
2432 * Check our parents are still who we think they are.
2433 * Do transparency updates if required
2434 */
2435int
2436rxvt_term::check_our_parents ()
2437{
2438 int i, pchanged, aformat, have_pixmap, rootdepth;
2439 unsigned long nitems, bytes_after;
2440 Atom atype;
2441 unsigned char *prop = NULL;
2442 Window root, oldp, *list;
2443 Pixmap rootpixmap = None;
2444 XWindowAttributes wattr, wrootattr;
2445
2446 pchanged = 0;
2447
2448 if (!OPTION (Opt_transparent))
2449 return pchanged; /* Don't try any more */
2450
2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2452 rootdepth = wrootattr.depth;
2453
2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2455
2456 if (rootdepth != wattr.depth)
2457 {
2458 if (am_transparent)
2459 {
2460 pchanged = 1;
2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2462 am_transparent = am_pixmap_trans = 0;
2463 }
2464
2465 return pchanged; /* Don't try any more */
2466 }
2467
2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2469 XSync (dpy, False);
2470
2471 /*
2472 * Make the frame window set by the window manager have
2473 * the root background. Some window managers put multiple nested frame
2474 * windows for each client, so we have to take care about that.
2475 */
2476 i = (xa[XA_XROOTPMAP_ID]
2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2479 &nitems, &bytes_after, &prop) == Success);
2480
2481 if (!i || prop == NULL)
2482 i = (xa[XA_ESETROOT_PMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL
2488#if TINTING
2489 || !ISSET_PIXCOLOR (Color_tint)
2490#endif
2491 )
2492 have_pixmap = 0;
2493 else
2494 {
2495 have_pixmap = 1;
2496 rootpixmap = *(Pixmap *)prop;
2497 XFree (prop);
2498 }
2499
2500 if (have_pixmap)
2501 {
2502 /*
2503 * Copy display->root pixmap transparency
2504 */
2505 int sx, sy, nx, ny;
2506 unsigned int nw, nh;
2507 Window cr;
2508 XImage *image;
2509 GC gc;
2510 XGCValues gcvalue;
2511
2512 XTranslateCoordinates (dpy, parent[0], display->root,
2513 0, 0, &sx, &sy, &cr);
2514 nw = (unsigned int)szHint.width;
2515 nh = (unsigned int)szHint.height;
2516 nx = ny = 0;
2517
2518 if (sx < 0)
2519 {
2520 nw += sx;
2521 nx = -sx;
2522 sx = 0;
2523 }
2524
2525 if (sy < 0)
2526 {
2527 nh += sy;
2528 ny = -sy;
2529 sy = 0;
2530 }
2531
2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2534
2535 XSync (dpy, False);
2536 allowedxerror = -1;
2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2538
2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2540 /* XXX: may need a delay here? */
2541 allowedxerror = 0;
2542
2543 if (image == NULL)
2544 {
2545 if (am_transparent && am_pixmap_trans)
2546 {
2547 pchanged = 1;
2548 if (pixmap != None)
2549 {
2550 XFreePixmap (dpy, pixmap);
2551 pixmap = None;
2552 }
2553 }
2554
2555 am_pixmap_trans = 0;
2556 }
2557 else
2558 {
2559 if (pixmap != None)
2560 XFreePixmap (dpy, pixmap);
2561
2562#if TINTING
2563 if (ISSET_PIXCOLOR (Color_tint))
2564 {
2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2566
2567 rgba c;
2568 pix_colors_focused [Color_tint].get (c);
2569
2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2571 }
2572#endif
2573
2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2577 nx, ny, image->width, image->height);
2578 XFreeGC (dpy, gc);
2579 XDestroyImage (image);
2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2581 XClearWindow (dpy, parent[0]);
2582
2583 if (!am_transparent || !am_pixmap_trans)
2584 pchanged = 1;
2585
2586 am_transparent = am_pixmap_trans = 1;
2587 }
2588 }
2589
2590 if (am_pixmap_trans)
2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2592 else
2593 {
2594 unsigned int n;
2595 /*
2596 * InheritPixmap transparency
2597 */
2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2599 {
2600 oldp = parent[i];
2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2602 XFree (list);
2603
2604 if (parent[i] == display->root)
2605 {
2606 if (oldp != None)
2607 pchanged = 1;
2608
2609 break;
2610 }
2611
2612 if (oldp != parent[i])
2613 pchanged = 1;
2614 }
2615
2616 n = 0;
2617
2618 if (pchanged)
2619 for (; n < (unsigned int)i; n++)
2620 {
2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2624 {
2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2626 break;
2627 }
2628 }
2629
2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2631 {
2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2634 am_transparent = 0;
2635 /* XXX: also turn off Opt_transparent? */
2636 }
2637 else
2638 {
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (dpy, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670 2233
2671/*}}} */ 2234/*}}} */
2672 2235
2673bool 2236bool
2674rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
… …
2723 if (ch == C0_LF) 2286 if (ch == C0_LF)
2724 nlines++; 2287 nlines++;
2725 2288
2726 refresh_count++; 2289 refresh_count++;
2727 2290
2728 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2292 {
2731 refreshnow = true;
2732 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2297 refreshnow = true;
2733 ch = NOCHAR; 2298 ch = NOCHAR;
2734 break; 2299 break;
2300 }
2735 } 2301 }
2736 2302
2737 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2739 { 2305 {
… …
2767 && 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))))
2768 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2769 2335
2770 /* 2336 /*
2771 * 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
2772 * 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.
2773 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2340 */
2776 if (refreshnow) 2341 if (refreshnow)
2777 { 2342 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true; 2343 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2784 scr_refresh (); 2344 scr_refresh ();
2785 want_refresh = 1; 2345 want_refresh = 1;
2786 }
2787 } 2346 }
2788 2347
2789 } 2348 }
2790 else 2349 else
2791 { 2350 {
… …
2940 { 2499 {
2941 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2942 break; /* done = 1 */ 2501 break; /* done = 1 */
2943 } 2502 }
2944 } 2503 }
2945 2504
2946 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2947 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2948 { 2507 {
2949 done = 1; 2508 done = 1;
2950 break; 2509 break;
… …
3012 process_dcs_seq (); 2571 process_dcs_seq ();
3013 break; 2572 break;
3014 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
3015 process_csi_seq (); 2574 process_csi_seq ();
3016 break; 2575 break;
3017 case 0x9d: /* CSI */ 2576 case 0x9d: /* OSC */
3018 process_osc_seq (); 2577 process_osc_seq ();
3019 break; 2578 break;
3020#endif 2579#endif
3021 } 2580 }
3022} 2581}
… …
3250 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
3251 unsigned int nargs, p; 2810 unsigned int nargs, p;
3252 int n, ndef; 2811 int n, ndef;
3253 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
3254 2813
3255 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
3256 arg[--nargs] = 0; 2815 nargs = 0;
3257 2816
3258 priv = 0; 2817 priv = 0;
3259 ch = cmd_getc (); 2818 ch = cmd_getc ();
3260 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
3261 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
3305 switch (priv) 2864 switch (priv)
3306 { 2865 {
3307 case '>': 2866 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
3309 { 2868 {
3310 // 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,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 // 2871 //
3313 // 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
3314 // 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
3315 // 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).
… …
3449 break; 3008 break;
3450 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
3451 scr_report_position (); 3010 scr_report_position ();
3452 break; 3011 break;
3453 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3454 if (OPTION (Opt_insecure)) 3013 if (option (Opt_insecure))
3455 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3456 break; 3015 break;
3457 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
3458 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3459 break; 3018 break;
… …
3623 break; 3182 break;
3624 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3625 { 3184 {
3626 char *s; 3185 char *s;
3627 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
3628 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 */
3629 XFree (s); 3188 XFree (s);
3630 } 3189 }
3631 break; 3190 break;
3632 case 21: /* report window title */ 3191 case 21: /* report window title */
3633 { 3192 {
3634 char *s; 3193 char *s;
3635 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
3636 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 */
3637 XFree (s); 3196 XFree (s);
3638 } 3197 }
3639 break; 3198 break;
3640 } 3199 }
3641} 3200}
… …
3668 seen_esc = true; 3227 seen_esc = true;
3669 continue; 3228 continue;
3670 } 3229 }
3671 else if (ch == C0_BEL || ch == CHAR_ST) 3230 else if (ch == C0_BEL || ch == CHAR_ST)
3672 break; 3231 break;
3232 else if (ch == C0_SYN)
3233 ch = cmd_get8 ();
3673 else if (ch < 0x20) 3234 else if (ch < 0x20)
3674 return NULL; /* other control character - exit */ 3235 return NULL; /* other control character - exit */
3675 3236
3676 seen_esc = false; 3237 seen_esc = false;
3677 3238
3678 if (n >= STRING_MAX - 1) 3239 if (n >= STRING_MAX - 1)
3679 // stop at some sane length 3240 // stop at some sane length
3680 return NULL; 3241 return NULL;
3681 3242
3682 if (ch == C0_SYN)
3683 string[n++] = cmd_get8 ();
3684 else
3685 string[n++] = ch; 3243 string[n++] = ch;
3686 } 3244 }
3687 3245
3688 string[n++] = '\0'; 3246 string[n++] = '\0';
3689 3247
3690 ends_how = (ch == 0x5c ? C0_ESC : ch); 3248 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3769 int saveop = op; 3327 int saveop = op;
3770 3328
3771 dLocal (Display *, dpy); 3329 dLocal (Display *, dpy);
3772 3330
3773 assert (str != NULL); 3331 assert (str != NULL);
3774 3332
3775 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)))
3776 return; 3334 return;
3777 3335
3778 switch (op) 3336 switch (op)
3779 { 3337 {
… …
3874 break; 3432 break;
3875 case URxvt_Color_IT: 3433 case URxvt_Color_IT:
3876 process_color_seq (op, Color_IT, str, resp); 3434 process_color_seq (op, Color_IT, str, resp);
3877 break; 3435 break;
3878#endif 3436#endif
3879#if TRANSPARENT && TINTING 3437#if ENABLE_TRANSPARENCY && TINTING
3880 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3881 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3882 3440
3883 check_our_parents (); 3441 check_our_parents ();
3884 3442
… …
3886 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3887 3445
3888 break; 3446 break;
3889#endif 3447#endif
3890 3448
3449#if XPM_BACKGROUND
3891 case Rxvt_Pixmap: 3450 case Rxvt_Pixmap:
3892 { 3451 {
3893 if (*str != ';') 3452 if (*str != ';')
3894 { 3453 {
3895#if XPM_BACKGROUND
3896 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3897 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3898 scr_touch (true); 3456 scr_touch (true);
3899#endif
3900 } 3457 }
3901 3458
3902 int changed = 0; 3459 int changed = 0;
3903 3460
3904 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3905 { 3462 {
3906 str++; 3463 str++;
3907#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3908 changed += scale_pixmap (str);
3909#endif
3910 } 3465 }
3911 3466
3912 if (changed) 3467 if (changed)
3913 { 3468 {
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3469 resize_pixmap ();
3916 scr_touch (true); 3470 scr_touch (true);
3917#endif
3918 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3919 } 3476 }
3920 break; 3477 break;
3478#endif
3921 3479
3922 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3923 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3924 break; 3482 break;
3925 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3950 case URxvt_italicFont: 3508 case URxvt_italicFont:
3951 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3952#endif 3510#endif
3953 if (query) 3511 if (query)
3954 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3955 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3956 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3957 resp); 3515 resp);
3958 else 3516 else
3959 { 3517 {
3960 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3974 break; 3532 break;
3975 3533
3976#if !ENABLE_MINIMAL 3534#if !ENABLE_MINIMAL
3977 case URxvt_locale: 3535 case URxvt_locale:
3978 if (query) 3536 if (query)
3979 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);
3980 else 3538 else
3981 { 3539 {
3982 set_locale (str); 3540 set_locale (str);
3983 pty->set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
3984 init_xlocale (); 3542 init_xlocale ();
… …
4125 scr_touch (true); 3683 scr_touch (true);
4126 break; 3684 break;
4127#endif 3685#endif
4128 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4129 case 1049: 3687 case 1049:
4130 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4131 if (mode == 0) 3689 if (mode == 0)
4132 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4133 else if (mode == 1) 3691 else if (mode == 1)
4134 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4135 break; 3693 break;
… …
4200 break; 3758 break;
4201 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
4202 set_option (Opt_scrollTtyKeypress, state); 3760 set_option (Opt_scrollTtyKeypress, state);
4203 break; 3761 break;
4204 case 1047: /* secondary screen w/ clearing last */ 3762 case 1047: /* secondary screen w/ clearing last */
4205 if (OPTION (Opt_secondaryScreen)) 3763 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
4207 scr_erase_screen (2); 3765 scr_erase_screen (2);
4208 scr_change_screen (state); 3766 scr_change_screen (state);
4209 break; 3767 break;
4210 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
4211 scr_change_screen (state); 3769 scr_change_screen (state);
4212 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 3772 scr_erase_screen (2);
4215 break; 3773 break;
4216 default: 3774 default:
4217 break; 3775 break;

Diff Legend

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