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.554 by sf-exg, Sun Aug 3 14:02:08 2014 UTC vs.
Revision 1.585 by root, Sun Jul 7 08:06:44 2019 UTC

… …
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 3 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
1034 1034
1035#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void 1036void
1037rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1038{ 1038{
1039 if (!focus)
1040 return;
1041
1039 if (hidden_cursor) 1042 if (hidden_cursor)
1040 { 1043 {
1041 hidden_cursor = 0; 1044 hidden_cursor = 0;
1042 want_refresh = 1; 1045 want_refresh = 1;
1043 } 1046 }
1044 1047
1045 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1047 else 1050 else
1048 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1049} 1052}
1050 1053
… …
1239 1242
1240void ecb_cold 1243void ecb_cold
1241rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1242{ 1245{
1243 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1244 recolour_cursor (); 1247 recolor_cursor ();
1245 1248
1246#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1247 hidden_pointer = 0; 1250 hidden_pointer = 0;
1248 1251
1249 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1483 ;
1481 1484
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483 1486
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change) 1487 if (want_position_change)
1495 { 1488 {
1496 int x, y; 1489 int x, y;
1497 1490
1498 if (ev.xconfigure.send_event) 1491 if (ev.xconfigure.send_event)
… …
1506 if (x != parent_x || y != parent_y) 1499 if (x != parent_x || y != parent_y)
1507 { 1500 {
1508 parent_x = x; 1501 parent_x = x;
1509 parent_y = y; 1502 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 } 1504 }
1513 } 1505 }
1514 1506
1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1516 { 1508 {
1517 seen_resize = 1; 1509 seen_resize = 1;
1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1519 } 1511 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1527 1512
1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 } 1514 }
1530 break; 1515 break;
1531 1516
… …
1540 case SelectionRequest: 1525 case SelectionRequest:
1541 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1542 break; 1527 break;
1543 1528
1544 case MapNotify: 1529 case MapNotify:
1545#ifdef HAVE_BG_PIXMAP
1546 // This is needed at startup for the case of no window manager
1547 // or a non-reparenting window manager and also because we
1548 // defer bg image updates if the window is not mapped. The
1549 // short delay is to optimize for multiple ConfigureNotify
1550 // events at startup when the window manager reparents the
1551 // window, so as to perform the computation after we have
1552 // received all of them.
1553 if (bg_img == 0)
1554 update_background_ev.start (0.025);
1555#endif
1556 mapped = 1; 1530 mapped = 1;
1557#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1558 text_blink_ev.start (); 1532 text_blink_ev.start ();
1559#endif 1533#endif
1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1609 case MotionNotify: 1583 case MotionNotify:
1610#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1585 if (hidden_pointer)
1612 pointer_unblank (); 1586 pointer_unblank ();
1613#endif 1587#endif
1588 if (!bypass_keystate
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent) 1590 || priv_modes & PrivMode_MouseAnyEvent))
1616 mouse_report (ev.xbutton); 1591 mouse_report (ev.xbutton);
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1593 break;
1619 1594
1620 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
… …
1632 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1609 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1636 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1638 { 1614 {
1639#endif
1640#if ISO_14755 1615#if ISO_14755
1641 // 5.4 1616 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 { 1618 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1693 * shouldn't be scrolling 1668 * shouldn't be scrolling
1694 */ 1669 */
1695 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1696 } 1671 }
1697#endif 1672#endif
1698#ifdef MOUSE_THRESHOLD
1699 } 1673 }
1700#endif
1701 } 1674 }
1702 } 1675 }
1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1704 { 1677 {
1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1779#endif 1752#endif
1780#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1782 { 1755 {
1783 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1757 scr_recolor ();
1785 } 1758 }
1786#endif 1759#endif
1787#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1762 set_urgency (0);
1763
1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1790#endif 1766#endif
1791 1767
1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 } 1769 }
1794} 1770}
… …
1802 want_refresh = 1; 1778 want_refresh = 1;
1803 1779
1804#if ENABLE_FRILLS 1780#if ENABLE_FRILLS
1805 if (option (Opt_urgentOnBell)) 1781 if (option (Opt_urgentOnBell))
1806 set_urgency (0); 1782 set_urgency (0);
1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1807#endif 1786#endif
1808#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1809 if (iso14755buf) 1788 if (iso14755buf)
1810 { 1789 {
1811 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1826#endif 1805#endif
1827#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1829 { 1808 {
1830 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1810 scr_recolor ();
1832 } 1811 }
1833#endif 1812#endif
1834 1813
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1815 }
1837} 1816}
1838 1817
1839void ecb_cold 1818void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1820{
1842#if OFF_FOCUS_FADING 1821#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1822 if (rs[Rs_fade])
1844 { 1823 {
1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1826
1845 rgba c; 1827 rgba c;
1846 pix_colors [Color_fade].get (c); 1828 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1830 }
1849#endif 1831#endif
1850} 1832}
1851 1833
1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1834#if ENABLE_PERL
1853void ecb_hot 1835void ecb_hot
1854rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1855{ 1837{
1856 make_current (); 1838 make_current ();
1857 1839
… …
1867 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1868 */ 1850 */
1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1871 { 1853 {
1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 } 1855 }
1881 1856
1882 break; 1857 break;
1883 } 1858 }
… …
1911 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1912 return; 1887 return;
1913 } 1888 }
1914#endif 1889#endif
1915 1890
1916 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1917 1892
1918 if (reportmode) 1893 if (reportmode)
1919 { 1894 {
1920 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1921 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
… …
2171#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2172 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2173 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2174 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2175 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2176 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2177 { 2152 {
2178 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2179 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2180 mouse_report (ev); 2155 mouse_report (ev);
2181 } 2156 }
… …
2379wchar_t ecb_hot 2354wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2381{ 2356{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2358 {
2384 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2386 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2387 2362
2388 wchar_t wc; 2363 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2365
… …
2571 scr_charset_choose (0); 2546 scr_charset_choose (0);
2572 break; 2547 break;
2573 2548
2574#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2550 // 8-bit controls
2576 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
2577 process_dcs_seq (); 2552 process_dcs_seq ();
2578 break; 2553 break;
2579 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2580 process_csi_seq (); 2555 process_csi_seq ();
2581 break; 2556 break;
2582 case 0x9d: /* OSC */ 2557 case 0x9d: /* OSC */
2583 process_osc_seq (); 2558 process_osc_seq ();
2584 break; 2559 break;
2585#endif 2560#endif
2586 } 2561 }
2587} 2562}
… …
2715 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2717 } 2692 }
2718 break; 2693 break;
2719 2694
2695#if 0 // disabled because embedded newlines can make exploits easier
2720 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
2721 case C1_ESA: /* ESC G */ 2697 case C1_ESA: /* ESC G */
2722 // used by original rxvt for rob nations own graphics mode 2698 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q') 2699 if (cmd_getc () == 'Q' && option (Opt_insecure))
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2700 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2725 break; 2701 break;
2702#endif
2726 2703
2727 /* 8.3.63: CHARACTER TABULATION SET */ 2704 /* 8.3.63: CHARACTER TABULATION SET */
2728 case C1_HTS: /* ESC H */ 2705 case C1_HTS: /* ESC H */
2729 scr_set_tab (1); 2706 scr_set_tab (1);
2730 break; 2707 break;
… …
2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2938 scr_gotorc (arg[0], 0, RELATIVE); 2915 scr_gotorc (arg[0], 0, RELATIVE);
2939 break; 2916 break;
2940 2917
2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2943#ifdef ISO6429 2920#ifdef ISO6429
2944 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2945#else /* emulate common DEC VTs */ 2922#else /* emulate common DEC VTs */
2946 arg[0] = arg[0] ? -arg[0] : -1; 2923 arg[0] = arg[0] ? -arg[0] : -1;
2947#endif 2924#endif
… …
3092 scr_insert_mode (1); 3069 scr_insert_mode (1);
3093 else if (arg[0] == 20) 3070 else if (arg[0] == 20)
3094 priv_modes |= PrivMode_LFNL; 3071 priv_modes |= PrivMode_LFNL;
3095 break; 3072 break;
3096 3073
3097 case CSI_71: // DESCUSR: set cursor style 3074 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ') 3075 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]); 3076 set_cursor_style (arg[0]);
3100 break; 3077 break;
3101 3078
3102 /* 3079 /*
… …
3323 free (s); 3300 free (s);
3324 } 3301 }
3325 } 3302 }
3326} 3303}
3327 3304
3305static unsigned int
3306colorcube_index (unsigned int idx_r,
3307 unsigned int idx_g,
3308 unsigned int idx_b)
3309{
3310 assert (idx_r < Red_levels);
3311 assert (idx_g < Green_levels);
3312 assert (idx_b < Blue_levels);
3313
3314 return idx_r * Blue_levels * Green_levels +
3315 idx_g * Blue_levels +
3316 idx_b;
3317}
3318
3319/*
3320 * Find the nearest color slot in the hidden color cube,
3321 * adapt its value to the 32bit RGBA color.
3322 */
3323unsigned int
3324rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3325{
3326 r &= 0xff;
3327 g &= 0xff;
3328 b &= 0xff;
3329 a &= 0xff;
3330
3331 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3332
3333 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3334 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3335 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3336 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3337
3338 /* we allow one of the 6 directly neighbouring colours */
3339 /* to replace the current color, if they not used recently */
3340 static const signed char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, +1,
3343 0, 0, -1,
3344 0, +1, 0,
3345 0, -1, 0,
3346 +1, 0, 0,
3347 -1, 0, 0,
3348 };
3349
3350 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3351 {
3352 int r = idx_r + dxyz[n][0];
3353 int g = idx_g + dxyz[n][1];
3354 int b = idx_b + dxyz[n][2];
3355
3356 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3357 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3358 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3359
3360 unsigned int index = colorcube_index (r, g, b);
3361
3362 if (rgb24_color[index] == color)
3363 {
3364 rgb24_seqno[index] = ++rgb24_sequence;
3365 return index + minTermCOLOR24;
3366 }
3367
3368 // minor issue: could update index 0 few more times
3369 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3370 {
3371 idx = index;
3372 goto update;
3373 }
3374
3375 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3376 // but also handles wrap around values good enough
3377 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3378 idx = index;
3379 }
3380
3381update:
3382 rgb24_color[idx] = color;
3383 rgb24_seqno[idx] = ++rgb24_sequence;
3384
3385 idx += minTermCOLOR24;
3386 pix_colors_focused [idx].free (this);
3387 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3388 update_fade_color (idx, false);
3389
3390 return idx;
3391}
3392
3328void 3393void
3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3394rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3330{ 3395{
3331 if (str[0] == '?' && !str[1]) 3396 if (str[0] == '?' && !str[1])
3332 { 3397 {
3333 rgba c; 3398 rgba c;
3334 pix_colors_focused[color].get (c); 3399 pix_colors_focused[color].get (c);
3335 3400
3336#if XFT 3401#if XFT
3337 if (c.a != rgba::MAX_CC) 3402 if (c.a != rgba::MAX_CC)
3338 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3403 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3339 else 3404 else
3340#endif 3405#endif
3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3406 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3342 } 3407 }
3343 else 3408 else
… …
3469 break; 3534 break;
3470#endif 3535#endif
3471 case URxvt_Color_border: 3536 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp); 3537 process_color_seq (op, Color_border, str, resp);
3473 break; 3538 break;
3474
3475#if BG_IMAGE_FROM_ROOT
3476 case URxvt_Color_tint:
3477 process_color_seq (op, Color_tint, str, resp);
3478 {
3479 bool changed = false;
3480
3481 if (ISSET_PIXCOLOR (Color_tint))
3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3483
3484 if (changed)
3485 update_background ();
3486 }
3487
3488 break;
3489#endif
3490
3491#if BG_IMAGE_FROM_FILE
3492 case Rxvt_Pixmap:
3493 if (!strcmp (str, "?"))
3494 {
3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3500
3501 sprintf (str, "[%dx%d+%d+%d]",
3502 h_scale, v_scale,
3503 h_align, v_align);
3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3505 }
3506 else
3507 {
3508 bool changed = false;
3509
3510 if (*str != ';')
3511 {
3512 try
3513 {
3514 fimage.set_file_geometry (this, str);
3515 changed = true;
3516 }
3517 catch (const class rxvt_failure_exception &e)
3518 {
3519 }
3520 }
3521 else
3522 {
3523 str++;
3524 if (fimage.set_geometry (str, true))
3525 changed = true;
3526 }
3527
3528 if (changed)
3529 {
3530 if (bg_window_position_sensitive ())
3531 {
3532 int x, y;
3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3537 update_background ();
3538 }
3539 }
3540 break;
3541#endif
3542 3539
3543 case XTerm_logfile: 3540 case XTerm_logfile:
3544 // TODO, when secure mode? 3541 // TODO, when secure mode?
3545 break; 3542 break;
3546 3543
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3677 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3678 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3679 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3680 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3681 { 9, PrivMode_MouseX10 },
3682 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3683 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3684 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3685 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3686#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3687 { scrollBar_esc, PrivMode_scrollBar },
… …
3701#endif 3699#endif
3702 { 1000, PrivMode_MouseX11 }, 3700 { 1000, PrivMode_MouseX11 },
3703 { 1002, PrivMode_MouseBtnEvent }, 3701 { 1002, PrivMode_MouseBtnEvent },
3704 { 1003, PrivMode_MouseAnyEvent }, 3702 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS 3703#if ENABLE_FRILLS
3704 { 1004, PrivMode_FocusEvent },
3706 { 1005, PrivMode_ExtModeMouse }, 3705 { 1005, PrivMode_ExtModeMouse },
3707#endif 3706#endif
3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3707 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3709 { 1011, PrivMode_Keypress }, // rxvt extension 3708 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS 3709#if ENABLE_FRILLS
… …
3798 scrollBar.map (state); 3797 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3798 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3799 scr_touch (true);
3801 break; 3800 break;
3802#endif 3801#endif
3802#ifdef CURSOR_BLINK
3803 case 12:
3804 cursor_blink_reset ();
3805 break;
3806#endif
3803 case 25: /* visible/invisible cursor */ 3807 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3808 scr_cursor_visible (state);
3805 break; 3809 break;
3806 /* case 35: - shift keys */ 3810 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3811 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 3916 //case 19: // ninth alt font
3913 //case 20: // gothic 3917 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3918 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 3919 rendset = 0, rendstyle = RS_Bold;
3916 break; 3920 break;
3917 case 22: // normal intensity 3921 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 3922 rendset = 0, rendstyle = RS_Bold;
3919 break; 3923 break;
3920 case 23: // disable italic 3924 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 3925 rendset = 0, rendstyle = RS_Italic;
3922 break; 3926 break;
3923 case 24: 3927 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 3928 rendset = 0, rendstyle = RS_Uline;
3925 break; 3929 break;
3926 case 25: 3930 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 3931 rendset = 0, rendstyle = RS_Blink;
3928 break; 3932 break;
3929 case 26: // variable spacing (iso 8613) 3933 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 3934 rendset = 0, rendstyle = RS_Blink;
3931 break; 3935 break;
3932 case 27: 3936 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 3937 rendset = 0, rendstyle = RS_RVid;
3934 break; 3938 break;
3935 //case 28: // visible. NYI 3939 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 3940 //case 29: // not crossed-out
3937 } 3941 }
… …
3952 case 35: 3956 case 35:
3953 case 36: 3957 case 36:
3954 case 37: 3958 case 37:
3955 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3959 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3956 break; 3960 break;
3957 case 38: // set fg color, ISO 8613-6
3958 if (nargs > i + 2 && arg[i + 1] == 5)
3959 {
3960 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3961 i += 2;
3962 }
3963 break;
3964 case 39: /* default fg */ 3961 case 39: /* default fg */
3965 scr_color (Color_fg, Color_fg); 3962 scr_color (Color_fg, Color_fg);
3966 break; 3963 break;
3967 3964
3968 case 40: 3965 case 40:
… …
3973 case 45: 3970 case 45:
3974 case 46: 3971 case 46:
3975 case 47: 3972 case 47:
3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3977 break; 3974 break;
3978 case 48: // set bg color, ISO 8613-6
3979 if (nargs > i + 2 && arg[i + 1] == 5)
3980 {
3981 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3982 i += 2;
3983 }
3984 break;
3985 case 49: /* default bg */ 3975 case 49: /* default bg */
3986 scr_color (Color_bg, Color_bg); 3976 scr_color (Color_bg, Color_bg);
3977 break;
3978
3979 case 38: // set fg color, ISO 8613-6
3980 case 48: // set bg color, ISO 8613-6
3981 {
3982 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3983 unsigned int idx;
3984
3985 if (nargs > i + 2 && arg[i + 1] == 5)
3986 {
3987 idx = minCOLOR + arg[i + 2];
3988 i += 2;
3989
3990 scr_color (idx, fgbg);
3991 }
3992 else if (nargs > i + 4 && arg[i + 1] == 2)
3993 {
3994 unsigned int r = arg[i + 2];
3995 unsigned int g = arg[i + 3];
3996 unsigned int b = arg[i + 4];
3997 unsigned int a = 0xff;
3998
3999 idx = map_rgb24_color (r, g, b, a);
4000
4001 i += 4;
4002
4003 scr_color (idx, fgbg);
4004 }
4005 }
3987 break; 4006 break;
3988 4007
3989 //case 50: // not variable spacing 4008 //case 50: // not variable spacing
3990 4009
3991#if !ENABLE_MINIMAL 4010#if !ENABLE_MINIMAL
… …
4015} 4034}
4016 4035
4017void 4036void
4018rxvt_term::set_cursor_style (int style) 4037rxvt_term::set_cursor_style (int style)
4019{ 4038{
4020 if (!IN_RANGE_INC (style, 0, 4)) 4039 if (!IN_RANGE_INC (style, 0, 6))
4021 return; 4040 return;
4022 4041
4042 if (style == 0)
4043 style = 1;
4044
4045 cursor_type = (style - 1) / 2;
4023 set_option (Opt_cursorUnderline, style >= 3); 4046 set_option (Opt_cursorUnderline, cursor_type == 1);
4024 4047
4025#ifdef CURSOR_BLINK 4048#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1)); 4049 set_option (Opt_cursorBlink, style & 1);
4027 cursor_blink_reset (); 4050 cursor_blink_reset ();
4028#endif 4051#endif
4029 4052
4030 want_refresh = 1; 4053 want_refresh = 1;
4031} 4054}

Diff Legend

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