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

Diff Legend

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