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.557 by sf-exg, Thu Aug 21 15:58:29 2014 UTC vs.
Revision 1.601 by sf-exg, Sat May 6 06:47:29 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
… …
1016/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1017void 1017void
1018rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1019{ 1019{
1020 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1022 1022
1023 display->flush (); 1023 display->flush ();
1024} 1024}
1025 1025
1026void 1026void
… …
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 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1302 if (button_number >= 3) 1304 else if (button_number >= 3)
1303 button_number += 64 - 3; 1305 button_number += 64 - 3;
1304 }
1305 1306
1306 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1307 { 1308 {
1308 /* 1309 /*
1309 * do not report ButtonRelease 1310 * do not report ButtonRelease
1310 * no state info allowed 1311 * no state info allowed
1311 */ 1312 */
1312 key_state = 0; 1313 if (release)
1313 if (button_number == 3)
1314 return; 1314 return;
1315 } 1315 }
1316 else 1316 else
1317 { 1317 {
1318 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1320 * 8 = Meta 1320 * 8 = Meta
1321 * 16 = Control 1321 * 16 = Control
1322 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1323 * 32 = Double Click 1323 * 32 = Double Click
1324 */ 1324 */
1325 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1326 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1327 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1328#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1329 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1330#endif 1330#endif
1331 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1332 1334
1333#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1334 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1335 if (key_state & 16) 1337 if (state & 16)
1336 fputc ('C', stderr); 1338 fputc ('C', stderr);
1337 if (key_state & 4) 1339 if (state & 4)
1338 fputc ('S', stderr); 1340 fputc ('S', stderr);
1339 if (key_state & 8) 1341 if (state & 8)
1340 fputc ('A', stderr); 1342 fputc ('A', stderr);
1341 if (key_state & 32) 1343 if (state & 32)
1342 fputc ('2', stderr); 1344 fputc ('2', stderr);
1343 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1344 button_number, 1346 button_number,
1345 x, 1347 x,
1346 y); 1348 y);
1347#endif 1349#endif
1348 1350
1349#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight) 1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1351 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state, 1360 code,
1353 x, 1361 x,
1354 y); 1362 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1356 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state, 1366 code,
1358 wint_t (32 + x), 1367 wint_t (32 + x),
1359 wint_t (32 + y)); 1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1360 else 1375 else
1361#endif 1376#endif
1362 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1363 code + button_number + key_state, 1378 code,
1364 32 + x, 1379 32 + x,
1365 32 + y); 1380 32 + y);
1366} 1381}
1367 1382
1368/*{{{ process an X event */ 1383/*{{{ process an X event */
… …
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1495 ;
1481 1496
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483 1498
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) 1499 if (want_position_change)
1495 { 1500 {
1496 int x, y; 1501 int x, y;
1497 1502
1498 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
… …
1506 if (x != parent_x || y != parent_y) 1511 if (x != parent_x || y != parent_y)
1507 { 1512 {
1508 parent_x = x; 1513 parent_x = x;
1509 parent_y = y; 1514 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 } 1516 }
1513 } 1517 }
1514 1518
1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1516 { 1520 {
1517 seen_resize = 1; 1521 seen_resize = 1;
1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1519 } 1523 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1527 1524
1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 } 1526 }
1530 break; 1527 break;
1531 1528
… …
1540 case SelectionRequest: 1537 case SelectionRequest:
1541 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1542 break; 1539 break;
1543 1540
1544 case MapNotify: 1541 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; 1542 mapped = 1;
1557#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1558 text_blink_ev.start (); 1544 text_blink_ev.start ();
1559#endif 1545#endif
1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1609 case MotionNotify: 1595 case MotionNotify:
1610#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1597 if (hidden_pointer)
1612 pointer_unblank (); 1598 pointer_unblank ();
1613#endif 1599#endif
1600 if (!bypass_keystate
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1616 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1605 break;
1619 1606
1620 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1632 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1621 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1636 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1638 { 1626 {
1639#endif
1640#if ISO_14755 1627#if ISO_14755
1641 // 5.4 1628 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 { 1630 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1693 * shouldn't be scrolling 1680 * shouldn't be scrolling
1694 */ 1681 */
1695 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1696 } 1683 }
1697#endif 1684#endif
1698#ifdef MOUSE_THRESHOLD
1699 } 1685 }
1700#endif
1701 } 1686 }
1702 } 1687 }
1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1704 { 1689 {
1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1779#endif 1764#endif
1780#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1782 { 1767 {
1783 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1769 scr_recolor ();
1785 } 1770 }
1786#endif 1771#endif
1787#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1790#endif 1778#endif
1791 1779
1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 } 1781 }
1794} 1782}
… …
1802 want_refresh = 1; 1790 want_refresh = 1;
1803 1791
1804#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1805 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1806 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1807#endif 1798#endif
1808#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1809 if (iso14755buf) 1800 if (iso14755buf)
1810 { 1801 {
1811 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1826#endif 1817#endif
1827#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1829 { 1820 {
1830 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1822 scr_recolor ();
1832 } 1823 }
1833#endif 1824#endif
1834 1825
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1827 }
1837} 1828}
1838 1829
1839void ecb_cold 1830void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1832{
1842#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1844 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1845 rgba c; 1839 rgba c;
1846 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1842 }
1849#endif 1843#endif
1850} 1844}
1851 1845
1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1846#if ENABLE_PERL
1853void ecb_hot 1847void ecb_hot
1854rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1855{ 1849{
1856 make_current (); 1850 make_current ();
1857 1851
… …
1867 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1868 */ 1862 */
1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1871 { 1865 {
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)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 } 1867 }
1881 1868
1882 break; 1869 break;
1883 } 1870 }
… …
2164 2151
2165 if (reportmode) 2152 if (reportmode)
2166 { 2153 {
2167 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2168 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2169 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2170 return; 2157 return;
2171#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2172 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2173 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2174 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2175 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2176 > multiClickTime / 2))) 2163 > multiClickTime / 2)))
2177 { 2164 {
2178 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2179 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2180 mouse_report (ev); 2167 mouse_report (ev);
2181 } 2168 }
2182#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2183 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2184 mouse_report (ev); 2171 mouse_report (ev);
2185#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2186 return; 2173 return;
2187 } 2174 }
2188 2175
… …
2375 } 2362 }
2376} 2363}
2377 2364
2378// read the next character 2365// read the next character
2379wchar_t ecb_hot 2366wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2381{ 2368{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2370 {
2384 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2386 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2387 2374
2388 wchar_t wc; 2375 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2377
… …
2411 return NOCHAR; 2398 return NOCHAR;
2412} 2399}
2413 2400
2414// read the next octet 2401// read the next octet
2415uint32_t ecb_hot 2402uint32_t ecb_hot
2416rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2417{ 2404{
2418 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2419 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2420 : NOCHAR; 2407 : NOCHAR;
2421} 2408}
2422 2409
2423static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2424 2411
2425wchar_t ecb_hot 2412wchar_t ecb_hot
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2427{ 2414{
2428 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2429 2416
2430 if (c == NOCHAR) 2417 if (c == NOCHAR)
2431 throw out_of_input; 2418 throw out_of_input;
2432 2419
2433 return c; 2420 return c;
2434} 2421}
2435 2422
2436uint32_t ecb_hot 2423uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2438{ 2425{
2439 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2440 2427
2441 if (c == NOCHAR) 2428 if (c == NOCHAR)
2442 throw out_of_input; 2429 throw out_of_input;
… …
2571 scr_charset_choose (0); 2558 scr_charset_choose (0);
2572 break; 2559 break;
2573 2560
2574#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2562 // 8-bit controls
2576 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2577 process_dcs_seq (); 2564 process_dcs_seq ();
2578 break; 2565 break;
2579 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2580 process_csi_seq (); 2567 process_csi_seq ();
2581 break; 2568 break;
2582 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2583 process_osc_seq (); 2570 process_osc_seq ();
2584 break; 2571 break;
2585#endif 2572#endif
2586 } 2573 }
2587} 2574}
… …
2715 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2717 } 2704 }
2718 break; 2705 break;
2719 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2720 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2721 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2722 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2725 break; 2713 break;
2714#endif
2726 2715
2727 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2728 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2729 scr_set_tab (1); 2718 scr_set_tab (1);
2730 break; 2719 break;
… …
2888 break; 2877 break;
2889 2878
2890 case '?': 2879 case '?':
2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2892 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2893 break; 2884 break;
2894 2885
2895 case '!': 2886 case '!':
2896 if (ch == CSI_70) 2887 if (ch == CSI_70)
2897 { 2888 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset (); 2890 scr_soft_reset ();
2900 2891
2901 static const int pm_h[] = { 7, 25 }; 2892 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 }; 2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2903 2894
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2895 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); 2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2906 } 2897 }
2907 break; 2898 break;
… …
2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2938 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2939 break; 2930 break;
2940 2931
2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2943#ifdef ISO6429 2934#ifdef ISO6429
2944 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2945#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2946 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2947#endif 2938#endif
… …
3038 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3039 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3040 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3041 break; 3032 break;
3042 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3043 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3044 break; 3039 break;
3040 }
3045 } 3041 }
3046 break; 3042 break;
3047 3043
3048 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3049 switch (arg[0]) 3045 switch (arg[0])
… …
3234/* 3230/*
3235 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3236 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3237 */ 3233 */
3238char * 3234char *
3239rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3240{ 3236{
3241 unicode_t ch; 3237 unicode_t ch;
3242 bool seen_esc = false; 3238 bool seen_esc = false;
3243 unsigned int n = 0; 3239 unsigned int n = 0;
3244 wchar_t string[CBUFSIZ]; 3240 wchar_t string[CBUFSIZ];
… …
3273 string[n++] = ch; 3269 string[n++] = ch;
3274 } 3270 }
3275 3271
3276 string[n++] = '\0'; 3272 string[n++] = '\0';
3277 3273
3278 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3279 3279
3280 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3281} 3281}
3282 3282
3283/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3289{ 3289{
3290 /* 3290 /*
3291 * Not handled yet 3291 * Not handled yet
3292 */ 3292 */
3293 3293
3294 unicode_t eh; 3294 string_term st;
3295 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3296 if (s) 3296 if (s)
3297 free (s); 3297 free (s);
3298 3298
3299 return; 3299 return;
3300} 3300}
… …
3312 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3313 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3314 3314
3315 if (ch == ';') 3315 if (ch == ';')
3316 { 3316 {
3317 unicode_t eh; 3317 string_term st;
3318 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3319 3319
3320 if (s) 3320 if (s)
3321 { 3321 {
3322 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3323 free (s); 3323 free (s);
3324 } 3324 }
3325 } 3325 }
3326} 3326}
3327 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {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},
3378 {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},
3379 {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},
3380 {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},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {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},
3383 {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},
3384 {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},
3385 {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},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3328void 3431void
3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3330{ 3433{
3331 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3332 { 3435 {
3333 rgba c; 3436 rgba c;
3334 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3335 3439
3336#if XFT 3440#if XFT
3337 if (c.a != rgba::MAX_CC) 3441 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); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3339 else 3443 else
3340#endif 3444#endif
3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3342 } 3451 }
3343 else 3452 else
3344 set_window_color (color, str); 3453 set_window_color (color, str);
3345} 3454}
3346 3455
3347/* 3456/*
3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3349 */ 3458 */
3350void 3459void
3351rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3352{ 3461{
3353 int color; 3462 int color;
3354 char *buf, *name; 3463 char *buf, *name;
3355 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3356 int saveop = op; 3465 int saveop = op;
… …
3391 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3392 && actual_type != None 3501 && actual_type != None
3393 && actual_format == 8) 3502 && actual_format == 8)
3394 str = (const char *)(value); 3503 str = (const char *)(value);
3395 3504
3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3397 3506
3398 XFree (value); 3507 XFree (value);
3399 } 3508 }
3400 else 3509 else
3401 { 3510 {
… …
3425 break; 3534 break;
3426 3535
3427 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3428 *buf++ = '\0'; 3537 *buf++ = '\0';
3429 3538
3430 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3431 } 3540 }
3432 break; 3541 break;
3433 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3434 case XTerm_Color00: 3543 case XTerm_Color00:
3435 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3436 break; 3545 break;
3437 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3438 case XTerm_Color01: 3547 case XTerm_Color01:
3439 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3440 break; 3549 break;
3441#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3442 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3443 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3444 break; 3553 break;
3445#endif 3554#endif
3446 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3447 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3448 break; 3557 break;
3449 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3450 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3451 break; 3560 break;
3452#ifdef OPTION_HC 3561#ifdef OPTION_HC
3453 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3455 break; 3564 break;
3456 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3458 break; 3567 break;
3459#endif 3568#endif
3460#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3461 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3462 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3463 break; 3572 break;
3464 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3465 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3466 break; 3575 break;
3467 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3468 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3469 break; 3578 break;
3470#endif 3579#endif
3471 case URxvt_Color_border: 3580 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3473 break; 3582 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 3583
3543 case XTerm_logfile: 3584 case XTerm_logfile:
3544 // TODO, when secure mode? 3585 // TODO, when secure mode?
3545 break; 3586 break;
3546 3587
… …
3563 case URxvt_boldFont: 3604 case URxvt_boldFont:
3564 case URxvt_italicFont: 3605 case URxvt_italicFont:
3565 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3566#endif 3607#endif
3567 if (query) 3608 if (query)
3568 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3569 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3570 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3571 resp); 3612 st.v);
3572 else 3613 else
3573 { 3614 {
3574 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3575 3616
3576 res = strdup (str); 3617 res = strdup (str);
… …
3579 } 3620 }
3580 break; 3621 break;
3581 3622
3582 case URxvt_version: 3623 case URxvt_version:
3583 if (query) 3624 if (query)
3584 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3585 op, 3626 op,
3586 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3587 resp); 3628 st.v);
3588 break; 3629 break;
3589 3630
3590#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3591 case URxvt_locale: 3639 case URxvt_locale:
3592 if (query) 3640 if (query)
3593 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3594 else 3642 else
3595 { 3643 {
3596 set_locale (str); 3644 set_locale (str);
3597 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3598 init_xlocale (); 3646 init_xlocale ();
… …
3613 break; 3661 break;
3614#endif 3662#endif
3615 3663
3616#if ENABLE_PERL 3664#if ENABLE_PERL
3617 case URxvt_perl: 3665 case URxvt_perl:
3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3619 break; 3667 break;
3620#endif 3668#endif
3621 } 3669 }
3622} 3670}
3623/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
… …
3701#endif 3750#endif
3702 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3703 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3704 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3706 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3707#endif 3758#endif
3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3709 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3712#endif 3763#endif
3713 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3714 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3715 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3716 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3717 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3720 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3721 }; 3774 };
3722 3775
3723 if (nargs == 0) 3776 if (nargs == 0)
3724 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3725 3796
3726 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3727 if (mode == 'l') 3798 if (mode == 'l')
3728 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3729 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3798 scrollBar.map (state); 3869 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3871 scr_touch (true);
3801 break; 3872 break;
3802#endif 3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3877 break;
3878#endif
3803 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3805 break; 3881 break;
3806 /* case 35: - shift keys */ 3882 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3883 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3913 //case 20: // gothic 3989 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3916 break; 3992 break;
3917 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3919 break; 3995 break;
3920 case 23: // disable italic 3996 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3922 break; 3998 break;
3923 case 24: 3999 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3925 break; 4001 break;
3926 case 25: 4002 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3928 break; 4004 break;
3929 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3931 break; 4007 break;
3932 case 27: 4008 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3934 break; 4010 break;
3935 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3937 } 4013 }
… …
3952 case 35: 4028 case 35:
3953 case 36: 4029 case 36:
3954 case 37: 4030 case 37:
3955 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3956 break; 4032 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 */ 4033 case 39: /* default fg */
3965 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3966 break; 4035 break;
3967 4036
3968 case 40: 4037 case 40:
… …
3973 case 45: 4042 case 45:
3974 case 46: 4043 case 46:
3975 case 47: 4044 case 47:
3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3977 break; 4046 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 */ 4047 case 49: /* default bg */
3986 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
3987 break; 4078 break;
3988 4079
3989 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3990 4081
3991#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL

Diff Legend

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