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.589 by sf-exg, Sun May 9 15:48:26 2021 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))
… …
1274#endif 1277#endif
1275 1278
1276void 1279void
1277rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1278{ 1281{
1279 int button_number, key_state = 0; 1282 int button_number, state = 0;
1280 int x, y; 1283 int x, y;
1281 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1282 1285
1283 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1284 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1285 1288
1286 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1288 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1289 return; 1292 return;
1290 1293
1291 mouse_row = x; 1294 mouse_row = x;
1292 mouse_col = y; 1295 mouse_col = y;
1293 code += 32; 1296 state += 32;
1294 }
1295
1296 if (MEvent.button == AnyButton)
1297 button_number = 3;
1298 else
1299 { 1297 }
1298
1300 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1301 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1302 if (button_number >= 3) 1301 if (button_number >= 3)
1303 button_number += 64 - 3; 1302 button_number += 64 - 3;
1304 }
1305 1303
1306 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1307 { 1305 {
1308 /* 1306 /*
1309 * do not report ButtonRelease 1307 * do not report ButtonRelease
1310 * no state info allowed 1308 * no state info allowed
1311 */ 1309 */
1312 key_state = 0; 1310 if (release)
1313 if (button_number == 3)
1314 return; 1311 return;
1315 } 1312 }
1316 else 1313 else
1317 { 1314 {
1318 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1320 * 8 = Meta 1317 * 8 = Meta
1321 * 16 = Control 1318 * 16 = Control
1322 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1323 * 32 = Double Click 1320 * 32 = Double Click
1324 */ 1321 */
1325 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1326 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1327 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1328#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1329 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1330#endif 1327#endif
1331 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1332 1331
1333#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1334 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1335 if (key_state & 16) 1334 if (state & 16)
1336 fputc ('C', stderr); 1335 fputc ('C', stderr);
1337 if (key_state & 4) 1336 if (state & 4)
1338 fputc ('S', stderr); 1337 fputc ('S', stderr);
1339 if (key_state & 8) 1338 if (state & 8)
1340 fputc ('A', stderr); 1339 fputc ('A', stderr);
1341 if (key_state & 32) 1340 if (state & 32)
1342 fputc ('2', stderr); 1341 fputc ('2', stderr);
1343 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1344 button_number, 1343 button_number,
1345 x, 1344 x,
1346 y); 1345 y);
1347#endif 1346#endif
1348 1347
1349#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1351 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state, 1357 code,
1353 x, 1358 x,
1354 y); 1359 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1356 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state, 1362 code,
1358 wint_t (32 + x), 1363 wint_t (32 + x),
1359 wint_t (32 + y)); 1364 wint_t (32 + y));
1360 else 1365 else
1361#endif 1366#endif
1362 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1363 code + button_number + key_state, 1368 code,
1364 32 + x, 1369 32 + x,
1365 32 + y); 1370 32 + y);
1366} 1371}
1367 1372
1368/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1485 ;
1481 1486
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483 1488
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) 1489 if (want_position_change)
1495 { 1490 {
1496 int x, y; 1491 int x, y;
1497 1492
1498 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1506 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1507 { 1502 {
1508 parent_x = x; 1503 parent_x = x;
1509 parent_y = y; 1504 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 } 1506 }
1513 } 1507 }
1514 1508
1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1516 { 1510 {
1517 seen_resize = 1; 1511 seen_resize = 1;
1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1519 } 1513 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1527 1514
1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 } 1516 }
1530 break; 1517 break;
1531 1518
… …
1540 case SelectionRequest: 1527 case SelectionRequest:
1541 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1542 break; 1529 break;
1543 1530
1544 case MapNotify: 1531 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; 1532 mapped = 1;
1557#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1558 text_blink_ev.start (); 1534 text_blink_ev.start ();
1559#endif 1535#endif
1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1609 case MotionNotify: 1585 case MotionNotify:
1610#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1587 if (hidden_pointer)
1612 pointer_unblank (); 1588 pointer_unblank ();
1613#endif 1589#endif
1590 if (!bypass_keystate
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1616 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1595 break;
1619 1596
1620 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1632 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1611 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1636 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1638 { 1616 {
1639#endif
1640#if ISO_14755 1617#if ISO_14755
1641 // 5.4 1618 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 { 1620 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1693 * shouldn't be scrolling 1670 * shouldn't be scrolling
1694 */ 1671 */
1695 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1696 } 1673 }
1697#endif 1674#endif
1698#ifdef MOUSE_THRESHOLD
1699 } 1675 }
1700#endif
1701 } 1676 }
1702 } 1677 }
1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1704 { 1679 {
1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1779#endif 1754#endif
1780#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1782 { 1757 {
1783 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1759 scr_recolor ();
1785 } 1760 }
1786#endif 1761#endif
1787#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1790#endif 1768#endif
1791 1769
1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 } 1771 }
1794} 1772}
… …
1802 want_refresh = 1; 1780 want_refresh = 1;
1803 1781
1804#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1805 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1806 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1807#endif 1788#endif
1808#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1809 if (iso14755buf) 1790 if (iso14755buf)
1810 { 1791 {
1811 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1826#endif 1807#endif
1827#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1829 { 1810 {
1830 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1812 scr_recolor ();
1832 } 1813 }
1833#endif 1814#endif
1834 1815
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1817 }
1837} 1818}
1838 1819
1839void ecb_cold 1820void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1822{
1842#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1844 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1845 rgba c; 1829 rgba c;
1846 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1832 }
1849#endif 1833#endif
1850} 1834}
1851 1835
1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1853void ecb_hot 1837void ecb_hot
1854rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1855{ 1839{
1856 make_current (); 1840 make_current ();
1857 1841
… …
1867 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1868 */ 1852 */
1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1871 { 1855 {
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)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 } 1857 }
1881 1858
1882 break; 1859 break;
1883 } 1860 }
… …
1911 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1912 return; 1889 return;
1913 } 1890 }
1914#endif 1891#endif
1915 1892
1916 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1917 1894
1918 if (reportmode) 1895 if (reportmode)
1919 { 1896 {
1920 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1921 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
… …
2171#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2172 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2173 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2174 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2175 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2176 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2177 { 2154 {
2178 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2179 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2180 mouse_report (ev); 2157 mouse_report (ev);
2181 } 2158 }
2182#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2183 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2184 mouse_report (ev); 2161 mouse_report (ev);
2185#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2186 return; 2163 return;
2187 } 2164 }
2188 2165
… …
2379wchar_t ecb_hot 2356wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () NOTHROW
2381{ 2358{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2360 {
2384 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2386 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2387 2364
2388 wchar_t wc; 2365 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2367
… …
2571 scr_charset_choose (0); 2548 scr_charset_choose (0);
2572 break; 2549 break;
2573 2550
2574#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2552 // 8-bit controls
2576 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2577 process_dcs_seq (); 2554 process_dcs_seq ();
2578 break; 2555 break;
2579 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2580 process_csi_seq (); 2557 process_csi_seq ();
2581 break; 2558 break;
2582 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2583 process_osc_seq (); 2560 process_osc_seq ();
2584 break; 2561 break;
2585#endif 2562#endif
2586 } 2563 }
2587} 2564}
… …
2715 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2717 } 2694 }
2718 break; 2695 break;
2719 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2720 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2721 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2722 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2725 break; 2703 break;
2704#endif
2726 2705
2727 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2728 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2729 scr_set_tab (1); 2708 scr_set_tab (1);
2730 break; 2709 break;
… …
2888 break; 2867 break;
2889 2868
2890 case '?': 2869 case '?':
2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2892 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2893 break; 2874 break;
2894 2875
2895 case '!': 2876 case '!':
2896 if (ch == CSI_70) 2877 if (ch == CSI_70)
2897 { 2878 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset (); 2880 scr_soft_reset ();
2900 2881
2901 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2903 2884
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2906 } 2887 }
2907 break; 2888 break;
… …
2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2938 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2939 break; 2920 break;
2940 2921
2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2943#ifdef ISO6429 2924#ifdef ISO6429
2944 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2945#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2946 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2947#endif 2928#endif
… …
3092 scr_insert_mode (1); 3073 scr_insert_mode (1);
3093 else if (arg[0] == 20) 3074 else if (arg[0] == 20)
3094 priv_modes |= PrivMode_LFNL; 3075 priv_modes |= PrivMode_LFNL;
3095 break; 3076 break;
3096 3077
3097 case CSI_71: // DESCUSR: set cursor style 3078 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ') 3079 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]); 3080 set_cursor_style (arg[0]);
3100 break; 3081 break;
3101 3082
3102 /* 3083 /*
… …
3323 free (s); 3304 free (s);
3324 } 3305 }
3325 } 3306 }
3326} 3307}
3327 3308
3309static unsigned int
3310colorcube_index (unsigned int idx_r,
3311 unsigned int idx_g,
3312 unsigned int idx_b)
3313{
3314 assert (idx_r < Red_levels);
3315 assert (idx_g < Green_levels);
3316 assert (idx_b < Blue_levels);
3317
3318 return idx_r * Blue_levels * Green_levels +
3319 idx_g * Blue_levels +
3320 idx_b;
3321}
3322
3323/*
3324 * Find the nearest color slot in the hidden color cube,
3325 * adapt its value to the 32bit RGBA color.
3326 */
3327unsigned int
3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3329{
3330 r &= 0xff;
3331 g &= 0xff;
3332 b &= 0xff;
3333 a &= 0xff;
3334
3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3336
3337 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3338 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3339 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3340 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3341
3342 /* we allow one of the 6 directly neighbouring colours */
3343 /* to replace the current color, if they not used recently */
3344 static const signed char dxyz[][3] = {
3345 0, 0, 0,
3346 0, 0, +1,
3347 0, 0, -1,
3348 0, +1, 0,
3349 0, -1, 0,
3350 +1, 0, 0,
3351 -1, 0, 0,
3352 };
3353
3354 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3355 {
3356 int r = idx_r + dxyz[n][0];
3357 int g = idx_g + dxyz[n][1];
3358 int b = idx_b + dxyz[n][2];
3359
3360 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3361 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3362 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3363
3364 unsigned int index = colorcube_index (r, g, b);
3365
3366 if (rgb24_color[index] == color)
3367 {
3368 rgb24_seqno[index] = ++rgb24_sequence;
3369 return index + minTermCOLOR24;
3370 }
3371
3372 // minor issue: could update index 0 few more times
3373 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3374 {
3375 idx = index;
3376 goto update;
3377 }
3378
3379 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3380 // but also handles wrap around values good enough
3381 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3382 idx = index;
3383 }
3384
3385update:
3386 rgb24_color[idx] = color;
3387 rgb24_seqno[idx] = ++rgb24_sequence;
3388
3389 idx += minTermCOLOR24;
3390 pix_colors_focused [idx].free (this);
3391 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3392 update_fade_color (idx, false);
3393
3394 return idx;
3395}
3396
3328void 3397void
3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3398rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3330{ 3399{
3331 if (str[0] == '?' && !str[1]) 3400 if (str[0] == '?' && !str[1])
3332 { 3401 {
3402 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3403 return;
3404
3333 rgba c; 3405 rgba c;
3334 pix_colors_focused[color].get (c); 3406 pix_colors_focused[color].get (c);
3407 color -= minCOLOR;
3335 3408
3336#if XFT 3409#if XFT
3337 if (c.a != rgba::MAX_CC) 3410 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); 3411 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3339 else 3412 else
3340#endif 3413#endif
3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3414 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3342 } 3415 }
3343 else 3416 else
3344 set_window_color (color, str); 3417 set_window_color (color, str);
3345} 3418}
3346 3419
… …
3469 break; 3542 break;
3470#endif 3543#endif
3471 case URxvt_Color_border: 3544 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp); 3545 process_color_seq (op, Color_border, str, resp);
3473 break; 3546 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 3547
3543 case XTerm_logfile: 3548 case XTerm_logfile:
3544 // TODO, when secure mode? 3549 // TODO, when secure mode?
3545 break; 3550 break;
3546 3551
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3692 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
… …
3701#endif 3707#endif
3702 { 1000, PrivMode_MouseX11 }, 3708 { 1000, PrivMode_MouseX11 },
3703 { 1002, PrivMode_MouseBtnEvent }, 3709 { 1002, PrivMode_MouseBtnEvent },
3704 { 1003, PrivMode_MouseAnyEvent }, 3710 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS 3711#if ENABLE_FRILLS
3712 { 1004, PrivMode_FocusEvent },
3706 { 1005, PrivMode_ExtModeMouse }, 3713 { 1005, PrivMode_ExtMouseUTF8 },
3714 { 1006, PrivMode_ExtMouseSGR },
3707#endif 3715#endif
3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3716 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3709 { 1011, PrivMode_Keypress }, // rxvt extension 3717 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS 3718#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3719 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3712#endif 3720#endif
3713 // 1035 enable modifiers for alt, numlock NYI 3721 // 1035 enable modifiers for alt, numlock NYI
3714 // 1036 send ESC for meta keys NYI 3722 // 1036 send ESC for meta keys NYI
3715 // 1037 send DEL for keypad delete NYI 3723 // 1037 send DEL for keypad delete NYI
3716 { 1047, PrivMode_Screen }, 3724 { 1047, PrivMode_Screen },
… …
3720 { 2004, PrivMode_BracketPaste }, 3728 { 2004, PrivMode_BracketPaste },
3721 }; 3729 };
3722 3730
3723 if (nargs == 0) 3731 if (nargs == 0)
3724 return; 3732 return;
3733
3734 // DECRQM
3735 if (mode == 'p')
3736 {
3737 int status = 0;
3738 if (nargs != 1)
3739 return;
3740
3741 for (j = 0; j < ecb_array_length (argtopriv); j++)
3742 if (argtopriv[j].argval == arg[0])
3743 {
3744 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3745 break;
3746 }
3747
3748 tt_printf ("\33[?%d;%d$y", arg[0], status);
3749 return;
3750 }
3725 3751
3726 /* make lo/hi boolean */ 3752 /* make lo/hi boolean */
3727 if (mode == 'l') 3753 if (mode == 'l')
3728 mode = 0; /* reset */ 3754 mode = 0; /* reset */
3729 else if (mode == 'h') 3755 else if (mode == 'h')
… …
3798 scrollBar.map (state); 3824 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3825 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3826 scr_touch (true);
3801 break; 3827 break;
3802#endif 3828#endif
3829#ifdef CURSOR_BLINK
3830 case 12:
3831 cursor_blink_reset ();
3832 break;
3833#endif
3803 case 25: /* visible/invisible cursor */ 3834 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3835 scr_cursor_visible (state);
3805 break; 3836 break;
3806 /* case 35: - shift keys */ 3837 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3838 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 3943 //case 19: // ninth alt font
3913 //case 20: // gothic 3944 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3945 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 3946 rendset = 0, rendstyle = RS_Bold;
3916 break; 3947 break;
3917 case 22: // normal intensity 3948 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 3949 rendset = 0, rendstyle = RS_Bold;
3919 break; 3950 break;
3920 case 23: // disable italic 3951 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 3952 rendset = 0, rendstyle = RS_Italic;
3922 break; 3953 break;
3923 case 24: 3954 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 3955 rendset = 0, rendstyle = RS_Uline;
3925 break; 3956 break;
3926 case 25: 3957 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 3958 rendset = 0, rendstyle = RS_Blink;
3928 break; 3959 break;
3929 case 26: // variable spacing (iso 8613) 3960 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 3961 rendset = 0, rendstyle = RS_Blink;
3931 break; 3962 break;
3932 case 27: 3963 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 3964 rendset = 0, rendstyle = RS_RVid;
3934 break; 3965 break;
3935 //case 28: // visible. NYI 3966 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 3967 //case 29: // not crossed-out
3937 } 3968 }
… …
3952 case 35: 3983 case 35:
3953 case 36: 3984 case 36:
3954 case 37: 3985 case 37:
3955 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3986 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3956 break; 3987 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 */ 3988 case 39: /* default fg */
3965 scr_color (Color_fg, Color_fg); 3989 scr_color (Color_fg, Color_fg);
3966 break; 3990 break;
3967 3991
3968 case 40: 3992 case 40:
… …
3973 case 45: 3997 case 45:
3974 case 46: 3998 case 46:
3975 case 47: 3999 case 47:
3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4000 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3977 break; 4001 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 */ 4002 case 49: /* default bg */
3986 scr_color (Color_bg, Color_bg); 4003 scr_color (Color_bg, Color_bg);
4004 break;
4005
4006 case 38: // set fg color, ISO 8613-6
4007 case 48: // set bg color, ISO 8613-6
4008 {
4009 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4010 unsigned int idx;
4011
4012 if (nargs > i + 2 && arg[i + 1] == 5)
4013 {
4014 idx = minCOLOR + arg[i + 2];
4015 i += 2;
4016
4017 scr_color (idx, fgbg);
4018 }
4019 else if (nargs > i + 4 && arg[i + 1] == 2)
4020 {
4021 unsigned int r = arg[i + 2];
4022 unsigned int g = arg[i + 3];
4023 unsigned int b = arg[i + 4];
4024 unsigned int a = 0xff;
4025
4026 idx = map_rgb24_color (r, g, b, a);
4027
4028 i += 4;
4029
4030 scr_color (idx, fgbg);
4031 }
4032 }
3987 break; 4033 break;
3988 4034
3989 //case 50: // not variable spacing 4035 //case 50: // not variable spacing
3990 4036
3991#if !ENABLE_MINIMAL 4037#if !ENABLE_MINIMAL
… …
4015} 4061}
4016 4062
4017void 4063void
4018rxvt_term::set_cursor_style (int style) 4064rxvt_term::set_cursor_style (int style)
4019{ 4065{
4020 if (!IN_RANGE_INC (style, 0, 4)) 4066 if (!IN_RANGE_INC (style, 0, 6))
4021 return; 4067 return;
4022 4068
4069 if (style == 0)
4070 style = 1;
4071
4072 cursor_type = (style - 1) / 2;
4023 set_option (Opt_cursorUnderline, style >= 3); 4073 set_option (Opt_cursorUnderline, cursor_type == 1);
4024 4074
4025#ifdef CURSOR_BLINK 4075#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1)); 4076 set_option (Opt_cursorBlink, style & 1);
4027 cursor_blink_reset (); 4077 cursor_blink_reset ();
4028#endif 4078#endif
4029 4079
4030 want_refresh = 1; 4080 want_refresh = 1;
4031} 4081}

Diff Legend

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