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.600 by sf-exg, Sun Feb 19 08:48:42 2023 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
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-2021 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.
… …
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
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
… …
1018/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1019void 1017void
1020rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1021{ 1019{
1022 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1023 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1024 1022
1025 display->flush (); 1023 display->flush ();
1026} 1024}
1027 1025
1028void 1026void
… …
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))
… …
1276#endif 1277#endif
1277 1278
1278void 1279void
1279rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1280{ 1281{
1281 int button_number, key_state = 0; 1282 int button_number, state = 0;
1282 int x, y; 1283 int x, y;
1283 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1284 1285
1285 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1286 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1287 1288
1288 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1290 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1291 return; 1292 return;
1292 1293
1293 mouse_row = x; 1294 mouse_row = x;
1294 mouse_col = y; 1295 mouse_col = y;
1295 code += 32; 1296 state += 32;
1296 }
1297
1298 if (MEvent.button == AnyButton)
1299 button_number = 3;
1300 else
1301 { 1297 }
1298
1302 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1303 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1304 if (button_number >= 3) 1301 if (button_number >= 3)
1305 button_number += 64 - 3; 1302 button_number += 64 - 3;
1306 }
1307 1303
1308 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1309 { 1305 {
1310 /* 1306 /*
1311 * do not report ButtonRelease 1307 * do not report ButtonRelease
1312 * no state info allowed 1308 * no state info allowed
1313 */ 1309 */
1314 key_state = 0; 1310 if (release)
1315 if (button_number == 3)
1316 return; 1311 return;
1317 } 1312 }
1318 else 1313 else
1319 { 1314 {
1320 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1322 * 8 = Meta 1317 * 8 = Meta
1323 * 16 = Control 1318 * 16 = Control
1324 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1325 * 32 = Double Click 1320 * 32 = Double Click
1326 */ 1321 */
1327 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1328 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1329 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1330#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1331 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1332#endif 1327#endif
1333 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1334 1331
1335#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1336 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1337 if (key_state & 16) 1334 if (state & 16)
1338 fputc ('C', stderr); 1335 fputc ('C', stderr);
1339 if (key_state & 4) 1336 if (state & 4)
1340 fputc ('S', stderr); 1337 fputc ('S', stderr);
1341 if (key_state & 8) 1338 if (state & 8)
1342 fputc ('A', stderr); 1339 fputc ('A', stderr);
1343 if (key_state & 32) 1340 if (state & 32)
1344 fputc ('2', stderr); 1341 fputc ('2', stderr);
1345 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1346 button_number, 1343 button_number,
1347 x, 1344 x,
1348 y); 1345 y);
1349#endif 1346#endif
1350 1347
1351#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1352 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)
1353 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1354 code + button_number + key_state, 1357 code,
1355 x, 1358 x,
1356 y); 1359 y);
1357 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1358 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1359 code + button_number + key_state, 1362 code,
1360 wint_t (32 + x), 1363 wint_t (32 + x),
1361 wint_t (32 + y)); 1364 wint_t (32 + y));
1362 else 1365 else
1363#endif 1366#endif
1364 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1365 code + button_number + key_state, 1368 code,
1366 32 + x, 1369 32 + x,
1367 32 + y); 1370 32 + y);
1368} 1371}
1369 1372
1370/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1485 ;
1483 1486
1484 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1485 1488
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) 1489 if (want_position_change)
1497 { 1490 {
1498 int x, y; 1491 int x, y;
1499 1492
1500 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1508 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1509 { 1502 {
1510 parent_x = x; 1503 parent_x = x;
1511 parent_y = y; 1504 parent_y = y;
1512 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));
1513 moved = true;
1514 } 1506 }
1515 } 1507 }
1516 1508
1517 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1518 { 1510 {
1519 seen_resize = 1; 1511 seen_resize = 1;
1520 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1521 } 1513 }
1522 else
1523 {
1524#ifdef HAVE_BG_PIXMAP
1525 if (moved)
1526 update_background ();
1527#endif
1528 }
1529 1514
1530 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 } 1516 }
1532 break; 1517 break;
1533 1518
… …
1542 case SelectionRequest: 1527 case SelectionRequest:
1543 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1544 break; 1529 break;
1545 1530
1546 case MapNotify: 1531 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; 1532 mapped = 1;
1559#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1560 text_blink_ev.start (); 1534 text_blink_ev.start ();
1561#endif 1535#endif
1562 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1611 case MotionNotify: 1585 case MotionNotify:
1612#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1613 if (hidden_pointer) 1587 if (hidden_pointer)
1614 pointer_unblank (); 1588 pointer_unblank ();
1615#endif 1589#endif
1590 if (!bypass_keystate
1616 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1617 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1618 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1619 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1620 break; 1595 break;
1621 1596
1622 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1634 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1636 &ev.xbutton.state); 1611 &ev.xbutton.state);
1637#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1638 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1639 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1640 { 1616 {
1641#endif
1642#if ISO_14755 1617#if ISO_14755
1643 // 5.4 1618 // 5.4
1644 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1645 { 1620 {
1646 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1695 * shouldn't be scrolling 1670 * shouldn't be scrolling
1696 */ 1671 */
1697 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1698 } 1673 }
1699#endif 1674#endif
1700#ifdef MOUSE_THRESHOLD
1701 } 1675 }
1702#endif
1703 } 1676 }
1704 } 1677 }
1705 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)
1706 { 1679 {
1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1781#endif 1754#endif
1782#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1784 { 1757 {
1785 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1786 scr_recolour (); 1759 scr_recolor ();
1787 } 1760 }
1788#endif 1761#endif
1789#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1791 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1792#endif 1768#endif
1793 1769
1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 } 1771 }
1796} 1772}
… …
1804 want_refresh = 1; 1780 want_refresh = 1;
1805 1781
1806#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1808 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1809#endif 1788#endif
1810#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf) 1790 if (iso14755buf)
1812 { 1791 {
1813 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1828#endif 1807#endif
1829#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1831 { 1810 {
1832 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1833 scr_recolour (); 1812 scr_recolor ();
1834 } 1813 }
1835#endif 1814#endif
1836 1815
1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1838 } 1817 }
1839} 1818}
1840 1819
1841void ecb_cold 1820void ecb_cold
1842rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1843{ 1822{
1844#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1845 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1846 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1847 rgba c; 1829 rgba c;
1848 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1849 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);
1850 } 1832 }
1851#endif 1833#endif
1852} 1834}
1853 1835
1854#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1855void ecb_hot 1837void ecb_hot
1856rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1857{ 1839{
1858 make_current (); 1840 make_current ();
1859 1841
… …
1869 * 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.
1870 */ 1852 */
1871 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1872 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1873 { 1855 {
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)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1882 } 1857 }
1883 1858
1884 break; 1859 break;
1885 } 1860 }
… …
1913 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1914 return; 1889 return;
1915 } 1890 }
1916#endif 1891#endif
1917 1892
1918 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1919 1894
1920 if (reportmode) 1895 if (reportmode)
1921 { 1896 {
1922 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1923 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
… …
2173#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2174 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2175 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2176 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2177 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2178 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2179 { 2154 {
2180 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2181 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2182 mouse_report (ev); 2157 mouse_report (ev);
2183 } 2158 }
2184#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2185 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2186 mouse_report (ev); 2161 mouse_report (ev);
2187#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2188 return; 2163 return;
2189 } 2164 }
2190 2165
… …
2377 } 2352 }
2378} 2353}
2379 2354
2380// read the next character 2355// read the next character
2381wchar_t ecb_hot 2356wchar_t ecb_hot
2382rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2383{ 2358{
2384 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2385 { 2360 {
2386 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2387 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2388 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2389 2364
2390 wchar_t wc; 2365 wchar_t wc;
2391 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);
2392 2367
… …
2413 return NOCHAR; 2388 return NOCHAR;
2414} 2389}
2415 2390
2416// read the next octet 2391// read the next octet
2417uint32_t ecb_hot 2392uint32_t ecb_hot
2418rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2419{ 2394{
2420 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2421 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2422 : NOCHAR; 2397 : NOCHAR;
2423} 2398}
2424 2399
2425static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2426 2401
2427wchar_t ecb_hot 2402wchar_t ecb_hot
2428rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2429{ 2404{
2430 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2431 2406
2432 if (c == NOCHAR) 2407 if (c == NOCHAR)
2433 throw out_of_input; 2408 throw out_of_input;
2434 2409
2435 return c; 2410 return c;
2436} 2411}
2437 2412
2438uint32_t ecb_hot 2413uint32_t ecb_hot
2439rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2440{ 2415{
2441 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2442 2417
2443 if (c == NOCHAR) 2418 if (c == NOCHAR)
2444 throw out_of_input; 2419 throw out_of_input;
… …
2573 scr_charset_choose (0); 2548 scr_charset_choose (0);
2574 break; 2549 break;
2575 2550
2576#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2577 // 8-bit controls 2552 // 8-bit controls
2578 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2579 process_dcs_seq (); 2554 process_dcs_seq ();
2580 break; 2555 break;
2581 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2582 process_csi_seq (); 2557 process_csi_seq ();
2583 break; 2558 break;
2584 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2585 process_osc_seq (); 2560 process_osc_seq ();
2586 break; 2561 break;
2587#endif 2562#endif
2588 } 2563 }
2589} 2564}
… …
2717 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2718 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2719 } 2694 }
2720 break; 2695 break;
2721 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2722 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2723 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2724 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2725 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2726 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2727 break; 2703 break;
2704#endif
2728 2705
2729 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2730 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2731 scr_set_tab (1); 2708 scr_set_tab (1);
2732 break; 2709 break;
… …
2890 break; 2867 break;
2891 2868
2892 case '?': 2869 case '?':
2893 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2894 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);
2895 break; 2874 break;
2896 2875
2897 case '!': 2876 case '!':
2898 if (ch == CSI_70) 2877 if (ch == CSI_70)
2899 { 2878 {
2900 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2901 scr_soft_reset (); 2880 scr_soft_reset ();
2902 2881
2903 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2904 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 };
2905 2884
2906 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);
2907 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);
2908 } 2887 }
2909 break; 2888 break;
… …
2939 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2940 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2941 break; 2920 break;
2942 2921
2943 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2944 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2945#ifdef ISO6429 2924#ifdef ISO6429
2946 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2947#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2948 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2949#endif 2928#endif
… …
3040 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3041 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3042 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3043 break; 3022 break;
3044 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3024 {
3025 string_term st;
3026 st.v[0] = CHAR_ST;
3027 st.v[1] = '\0';
3045 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3028 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3046 break; 3029 break;
3030 }
3047 } 3031 }
3048 break; 3032 break;
3049 3033
3050 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3034 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3051 switch (arg[0]) 3035 switch (arg[0])
… …
3094 scr_insert_mode (1); 3078 scr_insert_mode (1);
3095 else if (arg[0] == 20) 3079 else if (arg[0] == 20)
3096 priv_modes |= PrivMode_LFNL; 3080 priv_modes |= PrivMode_LFNL;
3097 break; 3081 break;
3098 3082
3099 case CSI_71: // DESCUSR: set cursor style 3083 case CSI_71: // DECSCUSR: set cursor style
3100 if (prev_ch == ' ') 3084 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]); 3085 set_cursor_style (arg[0]);
3102 break; 3086 break;
3103 3087
3104 /* 3088 /*
… …
3236/* 3220/*
3237 * get input up until STRING TERMINATOR (or BEL) 3221 * get input up until STRING TERMINATOR (or BEL)
3238 * ends_how is terminator used. returned input must be free()'d 3222 * ends_how is terminator used. returned input must be free()'d
3239 */ 3223 */
3240char * 3224char *
3241rxvt_term::get_to_st (unicode_t &ends_how) 3225rxvt_term::get_to_st (string_term &st)
3242{ 3226{
3243 unicode_t ch; 3227 unicode_t ch;
3244 bool seen_esc = false; 3228 bool seen_esc = false;
3245 unsigned int n = 0; 3229 unsigned int n = 0;
3246 wchar_t string[CBUFSIZ]; 3230 wchar_t string[CBUFSIZ];
… …
3275 string[n++] = ch; 3259 string[n++] = ch;
3276 } 3260 }
3277 3261
3278 string[n++] = '\0'; 3262 string[n++] = '\0';
3279 3263
3280 ends_how = (ch == 0x5c ? C0_ESC : ch); 3264 n = 0;
3265 if (ch == 0x5c)
3266 st.v[n++] = C0_ESC;
3267 st.v[n++] = ch;
3268 st.v[n] = '\0';
3281 3269
3282 return rxvt_wcstombs (string); 3270 return rxvt_wcstombs (string);
3283} 3271}
3284 3272
3285/*----------------------------------------------------------------------*/ 3273/*----------------------------------------------------------------------*/
… …
3291{ 3279{
3292 /* 3280 /*
3293 * Not handled yet 3281 * Not handled yet
3294 */ 3282 */
3295 3283
3296 unicode_t eh; 3284 string_term st;
3297 char *s = get_to_st (eh); 3285 char *s = get_to_st (st);
3298 if (s) 3286 if (s)
3299 free (s); 3287 free (s);
3300 3288
3301 return; 3289 return;
3302} 3290}
… …
3314 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3302 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3315 arg = arg * 10 + (ch - '0'); 3303 arg = arg * 10 + (ch - '0');
3316 3304
3317 if (ch == ';') 3305 if (ch == ';')
3318 { 3306 {
3319 unicode_t eh; 3307 string_term st;
3320 char *s = get_to_st (eh); 3308 char *s = get_to_st (st);
3321 3309
3322 if (s) 3310 if (s)
3323 { 3311 {
3324 process_xterm_seq (arg, s, eh); 3312 process_xterm_seq (arg, s, st);
3325 free (s); 3313 free (s);
3326 } 3314 }
3327 } 3315 }
3328} 3316}
3329 3317
3318static unsigned int
3319colorcube_index (unsigned int idx_r,
3320 unsigned int idx_g,
3321 unsigned int idx_b)
3322{
3323 assert (idx_r < Red_levels);
3324 assert (idx_g < Green_levels);
3325 assert (idx_b < Blue_levels);
3326
3327 return idx_r * Blue_levels * Green_levels +
3328 idx_g * Blue_levels +
3329 idx_b;
3330}
3331
3332/*
3333 * Find the nearest color slot in the hidden color cube,
3334 * adapt its value to the 32bit RGBA color.
3335 */
3336unsigned int
3337rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3338{
3339 r &= 0xff;
3340 g &= 0xff;
3341 b &= 0xff;
3342 a &= 0xff;
3343
3344 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3345
3346 /* we allow one of the 6 closest neighbouring colours */
3347 /* to replace the current color, if they not used recently */
3348 #if 0
3349 static const unsigned char dxyz[][3] = {
3350 0, 0, 0,
3351 0, 0, 4,
3352 0, 4, 4,
3353 4, 4, 0,
3354 4, 0, 4,
3355 0, 4, 0,
3356 4, 0, 0,
3357 };
3358 #else
3359 // silly compressed verlapping triplets version of above
3360 static const unsigned char dxyz[] = {
3361 0, 0, 0, 4, 4, 0, 4, 0, 0,
3362 };
3363 #endif
3364
3365 static const unsigned char color_level[8][32] = {
3366 // neighbour index
3367 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3368 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3369 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3370 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3371 // Red_levels/Green_levels/Blue_levels index
3372 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3373 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3374 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3375 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3376 };
3377
3378 unsigned int idx;
3379
3380 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3381 {
3382 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3383 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3384 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3385 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3386
3387 if (n == 0)
3388 idx = index;
3389
3390 if (rgb24_color[index] == color)
3391 {
3392 rgb24_seqno[index] = ++rgb24_sequence;
3393 return index + minTermCOLOR24;
3394 }
3395
3396 // minor issue: could update index 0 few more times
3397 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3398 {
3399 idx = index;
3400 goto update;
3401 }
3402
3403 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3404 // but also handles wrap around values well enough
3405 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3406 idx = index;
3407 }
3408
3409update:
3410 rgb24_color[idx] = color;
3411 rgb24_seqno[idx] = ++rgb24_sequence;
3412
3413 idx += minTermCOLOR24;
3414 pix_colors_focused [idx].free (this);
3415 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3416 update_fade_color (idx, false);
3417
3418 return idx;
3419}
3420
3330void 3421void
3331rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3422rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3332{ 3423{
3333 if (str[0] == '?' && !str[1]) 3424 if (str[0] == '?' && !str[1])
3334 { 3425 {
3335 rgba c; 3426 rgba c;
3336 pix_colors_focused[color].get (c); 3427 pix_colors_focused[color].get (c);
3428 char rgba_str[32];
3337 3429
3338#if XFT 3430#if XFT
3339 if (c.a != rgba::MAX_CC) 3431 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); 3432 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3341 else 3433 else
3342#endif 3434#endif
3343 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3435 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3436
3437 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3438 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3439 else
3440 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3344 } 3441 }
3345 else 3442 else
3346 set_window_color (color, str); 3443 set_window_color (color, str);
3347} 3444}
3348 3445
3349/* 3446/*
3350 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3351 */ 3448 */
3352void 3449void
3353rxvt_term::process_xterm_seq (int op, char *str, char resp) 3450rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3354{ 3451{
3355 int color; 3452 int color;
3356 char *buf, *name; 3453 char *buf, *name;
3357 bool query = str[0] == '?' && !str[1]; 3454 bool query = str[0] == '?' && !str[1];
3358 int saveop = op; 3455 int saveop = op;
… …
3393 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3394 && actual_type != None 3491 && actual_type != None
3395 && actual_format == 8) 3492 && actual_format == 8)
3396 str = (const char *)(value); 3493 str = (const char *)(value);
3397 3494
3398 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3495 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3399 3496
3400 XFree (value); 3497 XFree (value);
3401 } 3498 }
3402 else 3499 else
3403 { 3500 {
… …
3427 break; 3524 break;
3428 3525
3429 if ((buf = strchr (name, ';')) != NULL) 3526 if ((buf = strchr (name, ';')) != NULL)
3430 *buf++ = '\0'; 3527 *buf++ = '\0';
3431 3528
3432 process_color_seq (op, color, name, resp); 3529 process_color_seq (op, color, name, st);
3433 } 3530 }
3434 break; 3531 break;
3435 case Rxvt_restoreFG: 3532 case Rxvt_restoreFG:
3436 case XTerm_Color00: 3533 case XTerm_Color00:
3437 process_color_seq (op, Color_fg, str, resp); 3534 process_color_seq (op, Color_fg, str, st);
3438 break; 3535 break;
3439 case Rxvt_restoreBG: 3536 case Rxvt_restoreBG:
3440 case XTerm_Color01: 3537 case XTerm_Color01:
3441 process_color_seq (op, Color_bg, str, resp); 3538 process_color_seq (op, Color_bg, str, st);
3442 break; 3539 break;
3443#ifndef NO_CURSORCOLOR 3540#ifndef NO_CURSORCOLOR
3444 case XTerm_Color_cursor: 3541 case XTerm_Color_cursor:
3445 process_color_seq (op, Color_cursor, str, resp); 3542 process_color_seq (op, Color_cursor, str, st);
3446 break; 3543 break;
3447#endif 3544#endif
3448 case XTerm_Color_pointer_fg: 3545 case XTerm_Color_pointer_fg:
3449 process_color_seq (op, Color_pointer_fg, str, resp); 3546 process_color_seq (op, Color_pointer_fg, str, st);
3450 break; 3547 break;
3451 case XTerm_Color_pointer_bg: 3548 case XTerm_Color_pointer_bg:
3452 process_color_seq (op, Color_pointer_bg, str, resp); 3549 process_color_seq (op, Color_pointer_bg, str, st);
3453 break; 3550 break;
3454#ifdef OPTION_HC 3551#ifdef OPTION_HC
3455 case XTerm_Color_HC: 3552 case XTerm_Color_HC:
3456 process_color_seq (op, Color_HC, str, resp); 3553 process_color_seq (op, Color_HC, str, st);
3457 break; 3554 break;
3458 case XTerm_Color_HTC: 3555 case XTerm_Color_HTC:
3459 process_color_seq (op, Color_HTC, str, resp); 3556 process_color_seq (op, Color_HTC, str, st);
3460 break; 3557 break;
3461#endif 3558#endif
3462#ifndef NO_BOLD_UNDERLINE_REVERSE 3559#ifndef NO_BOLD_UNDERLINE_REVERSE
3463 case URxvt_Color_BD: 3560 case URxvt_Color_BD:
3464 process_color_seq (op, Color_BD, str, resp); 3561 process_color_seq (op, Color_BD, str, st);
3465 break; 3562 break;
3466 case URxvt_Color_UL: 3563 case URxvt_Color_UL:
3467 process_color_seq (op, Color_UL, str, resp); 3564 process_color_seq (op, Color_UL, str, st);
3468 break; 3565 break;
3469 case URxvt_Color_IT: 3566 case URxvt_Color_IT:
3470 process_color_seq (op, Color_IT, str, resp); 3567 process_color_seq (op, Color_IT, str, st);
3471 break; 3568 break;
3472#endif 3569#endif
3473 case URxvt_Color_border: 3570 case URxvt_Color_border:
3474 process_color_seq (op, Color_border, str, resp); 3571 process_color_seq (op, Color_border, str, st);
3475 break; 3572 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 3573
3545 case XTerm_logfile: 3574 case XTerm_logfile:
3546 // TODO, when secure mode? 3575 // TODO, when secure mode?
3547 break; 3576 break;
3548 3577
… …
3565 case URxvt_boldFont: 3594 case URxvt_boldFont:
3566 case URxvt_italicFont: 3595 case URxvt_italicFont:
3567 case URxvt_boldItalicFont: 3596 case URxvt_boldItalicFont:
3568#endif 3597#endif
3569 if (query) 3598 if (query)
3570 tt_printf ("\33]%d;%-.250s%c", saveop, 3599 tt_printf ("\33]%d;%-.250s%s", saveop,
3571 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3600 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3572 ? fontset[op - URxvt_font]->fontdesc : "", 3601 ? fontset[op - URxvt_font]->fontdesc : "",
3573 resp); 3602 st.v);
3574 else 3603 else
3575 { 3604 {
3576 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3605 const char *&res = rs[Rs_font + (op - URxvt_font)];
3577 3606
3578 res = strdup (str); 3607 res = strdup (str);
… …
3581 } 3610 }
3582 break; 3611 break;
3583 3612
3584 case URxvt_version: 3613 case URxvt_version:
3585 if (query) 3614 if (query)
3586 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3615 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3587 op, 3616 op,
3588 rs[Rs_name], VERSION[0], VERSION[2], 3617 rs[Rs_name], VERSION[0], VERSION[2],
3589 resp); 3618 st.v);
3590 break; 3619 break;
3591 3620
3592#if !ENABLE_MINIMAL 3621#if !ENABLE_MINIMAL
3622 case URxvt_cellinfo:
3623 if (query)
3624 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3625 fwidth, fheight, fbase,
3626 st.v);
3627 break;
3628
3593 case URxvt_locale: 3629 case URxvt_locale:
3594 if (query) 3630 if (query)
3595 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3631 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3596 else 3632 else
3597 { 3633 {
3598 set_locale (str); 3634 set_locale (str);
3599 pty->set_utf8_mode (enc_utf8); 3635 pty->set_utf8_mode (enc_utf8);
3600 init_xlocale (); 3636 init_xlocale ();
… …
3615 break; 3651 break;
3616#endif 3652#endif
3617 3653
3618#if ENABLE_PERL 3654#if ENABLE_PERL
3619 case URxvt_perl: 3655 case URxvt_perl:
3620 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3656 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3621 break; 3657 break;
3622#endif 3658#endif
3623 } 3659 }
3624} 3660}
3625/*----------------------------------------------------------------------*/ 3661/*----------------------------------------------------------------------*/
… …
3682 { 5, PrivMode_rVideo }, // DECSCNM 3718 { 5, PrivMode_rVideo }, // DECSCNM
3683 { 6, PrivMode_relOrigin }, // DECOM 3719 { 6, PrivMode_relOrigin }, // DECOM
3684 { 7, PrivMode_Autowrap }, // DECAWM 3720 { 7, PrivMode_Autowrap }, // DECAWM
3685 // 8, auto-repeat keys // DECARM 3721 // 8, auto-repeat keys // DECARM
3686 { 9, PrivMode_MouseX10 }, 3722 { 9, PrivMode_MouseX10 },
3723 { 12, PrivMode_BlinkingCursor },
3687 // 18 end FF to printer after print screen 3724 // 18 end FF to printer after print screen
3688 // 19 Print screen prints full screen/scroll region 3725 // 19 Print screen prints full screen/scroll region
3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3726 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3690#ifdef scrollBar_esc 3727#ifdef scrollBar_esc
3691 { scrollBar_esc, PrivMode_scrollBar }, 3728 { scrollBar_esc, PrivMode_scrollBar },
… …
3703#endif 3740#endif
3704 { 1000, PrivMode_MouseX11 }, 3741 { 1000, PrivMode_MouseX11 },
3705 { 1002, PrivMode_MouseBtnEvent }, 3742 { 1002, PrivMode_MouseBtnEvent },
3706 { 1003, PrivMode_MouseAnyEvent }, 3743 { 1003, PrivMode_MouseAnyEvent },
3707#if ENABLE_FRILLS 3744#if ENABLE_FRILLS
3745 { 1004, PrivMode_FocusEvent },
3708 { 1005, PrivMode_ExtModeMouse }, 3746 { 1005, PrivMode_ExtMouseUTF8 },
3747 { 1006, PrivMode_ExtMouseSGR },
3709#endif 3748#endif
3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3749 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3711 { 1011, PrivMode_Keypress }, // rxvt extension 3750 { 1011, PrivMode_Keypress }, // rxvt extension
3712#if ENABLE_FRILLS 3751#if ENABLE_FRILLS
3713 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3752 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3714#endif 3753#endif
3715 // 1035 enable modifiers for alt, numlock NYI 3754 // 1035 enable modifiers for alt, numlock NYI
3716 // 1036 send ESC for meta keys NYI 3755 // 1036 send ESC for meta keys NYI
3717 // 1037 send DEL for keypad delete NYI 3756 // 1037 send DEL for keypad delete NYI
3718 { 1047, PrivMode_Screen }, 3757 { 1047, PrivMode_Screen },
3719 // 1048 save and restore cursor, implemented in code 3758 // 1048 save and restore cursor, implemented in code
3720 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3759 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3721 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3760 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3761#if ENABLE_FRILLS
3722 { 2004, PrivMode_BracketPaste }, 3762 { 2004, PrivMode_BracketPaste },
3763#endif
3723 }; 3764 };
3724 3765
3725 if (nargs == 0) 3766 if (nargs == 0)
3726 return; 3767 return;
3768
3769 // DECRQM
3770 if (mode == 'p')
3771 {
3772 int status = 0;
3773 if (nargs != 1)
3774 return;
3775
3776 for (j = 0; j < ecb_array_length (argtopriv); j++)
3777 if (argtopriv[j].argval == arg[0])
3778 {
3779 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3780 break;
3781 }
3782
3783 tt_printf ("\33[?%d;%d$y", arg[0], status);
3784 return;
3785 }
3727 3786
3728 /* make lo/hi boolean */ 3787 /* make lo/hi boolean */
3729 if (mode == 'l') 3788 if (mode == 'l')
3730 mode = 0; /* reset */ 3789 mode = 0; /* reset */
3731 else if (mode == 'h') 3790 else if (mode == 'h')
… …
3800 scrollBar.map (state); 3859 scrollBar.map (state);
3801 resize_all_windows (0, 0, 0); 3860 resize_all_windows (0, 0, 0);
3802 scr_touch (true); 3861 scr_touch (true);
3803 break; 3862 break;
3804#endif 3863#endif
3864#ifdef CURSOR_BLINK
3865 case 12:
3866 cursor_blink_reset ();
3867 break;
3868#endif
3805 case 25: /* visible/invisible cursor */ 3869 case 25: /* visible/invisible cursor */
3806 scr_cursor_visible (state); 3870 scr_cursor_visible (state);
3807 break; 3871 break;
3808 /* case 35: - shift keys */ 3872 /* case 35: - shift keys */
3809 /* case 40: - 80 <--> 132 mode */ 3873 /* case 40: - 80 <--> 132 mode */
… …
3914 //case 19: // ninth alt font 3978 //case 19: // ninth alt font
3915 //case 20: // gothic 3979 //case 20: // gothic
3916 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3980 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3917 rendset = 0, rendstyle = RS_Bold; 3981 rendset = 0, rendstyle = RS_Bold;
3918 break; 3982 break;
3919 case 22: // normal intensity 3983 case 22: // bold off (vt220)
3920 rendset = 0, rendstyle = RS_Bold; 3984 rendset = 0, rendstyle = RS_Bold;
3921 break; 3985 break;
3922 case 23: // disable italic 3986 case 23: // disable italic
3923 rendset = 0, rendstyle = RS_Italic; 3987 rendset = 0, rendstyle = RS_Italic;
3924 break; 3988 break;
3925 case 24: 3989 case 24: // underline off (vt220)
3926 rendset = 0, rendstyle = RS_Uline; 3990 rendset = 0, rendstyle = RS_Uline;
3927 break; 3991 break;
3928 case 25: 3992 case 25: // blink off (vt220)
3929 rendset = 0, rendstyle = RS_Blink; 3993 rendset = 0, rendstyle = RS_Blink;
3930 break; 3994 break;
3931 case 26: // variable spacing (iso 8613) 3995 case 26: // variable spacing (iso 8613)
3932 rendset = 0, rendstyle = RS_Blink; 3996 rendset = 0, rendstyle = RS_Blink;
3933 break; 3997 break;
3934 case 27: 3998 case 27: // reverse off (vt220)
3935 rendset = 0, rendstyle = RS_RVid; 3999 rendset = 0, rendstyle = RS_RVid;
3936 break; 4000 break;
3937 //case 28: // visible. NYI 4001 //case 28: // visible. NYI
3938 //case 29: // not crossed-out 4002 //case 29: // not crossed-out
3939 } 4003 }
… …
3954 case 35: 4018 case 35:
3955 case 36: 4019 case 36:
3956 case 37: 4020 case 37:
3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4021 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3958 break; 4022 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 */ 4023 case 39: /* default fg */
3967 scr_color (Color_fg, Color_fg); 4024 scr_color (Color_fg, Color_fg);
3968 break; 4025 break;
3969 4026
3970 case 40: 4027 case 40:
… …
3975 case 45: 4032 case 45:
3976 case 46: 4033 case 46:
3977 case 47: 4034 case 47:
3978 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4035 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3979 break; 4036 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 */ 4037 case 49: /* default bg */
3988 scr_color (Color_bg, Color_bg); 4038 scr_color (Color_bg, Color_bg);
4039 break;
4040
4041 case 38: // set fg color, ISO 8613-6
4042 case 48: // set bg color, ISO 8613-6
4043 {
4044 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4045 unsigned int idx;
4046
4047 if (nargs > i + 2 && arg[i + 1] == 5)
4048 {
4049 idx = minCOLOR + arg[i + 2];
4050 i += 2;
4051
4052 scr_color (idx, fgbg);
4053 }
4054 else if (nargs > i + 4 && arg[i + 1] == 2)
4055 {
4056 unsigned int r = arg[i + 2];
4057 unsigned int g = arg[i + 3];
4058 unsigned int b = arg[i + 4];
4059 unsigned int a = 0xff;
4060
4061 idx = map_rgb24_color (r, g, b, a);
4062
4063 i += 4;
4064
4065 scr_color (idx, fgbg);
4066 }
4067 }
3989 break; 4068 break;
3990 4069
3991 //case 50: // not variable spacing 4070 //case 50: // not variable spacing
3992 4071
3993#if !ENABLE_MINIMAL 4072#if !ENABLE_MINIMAL
… …
4017} 4096}
4018 4097
4019void 4098void
4020rxvt_term::set_cursor_style (int style) 4099rxvt_term::set_cursor_style (int style)
4021{ 4100{
4022 if (!IN_RANGE_INC (style, 0, 4)) 4101 if (!IN_RANGE_INC (style, 0, 6))
4023 return; 4102 return;
4024 4103
4104 if (style == 0)
4105 style = 1;
4106
4107 cursor_type = (style - 1) / 2;
4025 set_option (Opt_cursorUnderline, style >= 3); 4108 set_option (Opt_cursorUnderline, cursor_type == 1);
4026 4109
4027#ifdef CURSOR_BLINK 4110#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1)); 4111 set_option (Opt_cursorBlink, style & 1);
4029 cursor_blink_reset (); 4112 cursor_blink_reset ();
4030#endif 4113#endif
4031 4114
4032 want_refresh = 1; 4115 want_refresh = 1;
4033} 4116}

Diff Legend

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