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.558 by root, Tue Sep 2 16:28:34 2014 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 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.
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
1016/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1017void 1019void
1018rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1019{ 1021{
1020 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1022 1024
1023 display->flush (); 1025 display->flush ();
1024} 1026}
1025 1027
1026void 1028void
… …
1034 1036
1035#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1036void 1038void
1037rxvt_term::cursor_blink_reset () 1039rxvt_term::cursor_blink_reset ()
1038{ 1040{
1041 if (!focus)
1042 return;
1043
1039 if (hidden_cursor) 1044 if (hidden_cursor)
1040 { 1045 {
1041 hidden_cursor = 0; 1046 hidden_cursor = 0;
1042 want_refresh = 1; 1047 want_refresh = 1;
1043 } 1048 }
1044 1049
1045 if (option (Opt_cursorBlink)) 1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again (); 1051 cursor_blink_ev.again ();
1047 else 1052 else
1048 cursor_blink_ev.stop (); 1053 cursor_blink_ev.stop ();
1049} 1054}
1050 1055
… …
1239 1244
1240void ecb_cold 1245void ecb_cold
1241rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1242{ 1247{
1243 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1244 recolour_cursor (); 1249 recolor_cursor ();
1245 1250
1246#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1247 hidden_pointer = 0; 1252 hidden_pointer = 0;
1248 1253
1249 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
… …
1274#endif 1279#endif
1275 1280
1276void 1281void
1277rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1278{ 1283{
1279 int button_number, key_state = 0; 1284 int button_number, state = 0;
1280 int x, y; 1285 int x, y;
1281 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1282 1287
1283 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1284 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1285 1290
1286 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1287 { 1292 {
1288 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1289 return; 1294 return;
1290 1295
1291 mouse_row = x; 1296 mouse_row = x;
1292 mouse_col = y; 1297 mouse_col = y;
1293 code += 32; 1298 state += 32;
1294 } 1299 }
1295 1300
1296 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1297 button_number = 3; 1302 button_number = 3;
1298 else 1303 else
1299 { 1304 {
1300 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1301 /* add 0x3D for wheel events, like xterm does */ 1306 if (button_number > 10)
1307 return;
1308 else if (button_number >= 7)
1309 button_number += 128 - 7;
1302 if (button_number >= 3) 1310 else if (button_number >= 3)
1303 button_number += 64 - 3; 1311 button_number += 64 - 3;
1304 } 1312 }
1305 1313
1306 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1307 { 1315 {
1308 /* 1316 /*
1309 * do not report ButtonRelease 1317 * do not report ButtonRelease
1310 * no state info allowed 1318 * no state info allowed
1311 */ 1319 */
1312 key_state = 0; 1320 if (release)
1313 if (button_number == 3)
1314 return; 1321 return;
1315 } 1322 }
1316 else 1323 else
1317 { 1324 {
1318 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1320 * 8 = Meta 1327 * 8 = Meta
1321 * 16 = Control 1328 * 16 = Control
1322 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1323 * 32 = Double Click 1330 * 32 = Double Click
1324 */ 1331 */
1325 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1326 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1327 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1328#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1329 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1330#endif 1337#endif
1331 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1332 1341
1333#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1334 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1335 if (key_state & 16) 1344 if (state & 16)
1336 fputc ('C', stderr); 1345 fputc ('C', stderr);
1337 if (key_state & 4) 1346 if (state & 4)
1338 fputc ('S', stderr); 1347 fputc ('S', stderr);
1339 if (key_state & 8) 1348 if (state & 8)
1340 fputc ('A', stderr); 1349 fputc ('A', stderr);
1341 if (key_state & 32) 1350 if (state & 32)
1342 fputc ('2', stderr); 1351 fputc ('2', stderr);
1343 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1344 button_number, 1353 button_number,
1345 x, 1354 x,
1346 y); 1355 y);
1347#endif 1356#endif
1348 1357
1349#if ENABLE_FRILLS 1358#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight) 1359 if (priv_modes & PrivMode_ExtMouseSGR)
1360 tt_printf ("\033[<%d;%d;%d%c",
1361 button_number + state,
1362 x,
1363 y,
1364 release ? 'm' : 'M');
1365 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1351 tt_printf ("\033[%d;%d;%dM", 1366 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state, 1367 code,
1353 x, 1368 x,
1354 y); 1369 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse) 1370 else if (priv_modes & PrivMode_ExtMouseUTF8)
1371 if (code < 128)
1356 tt_printf ("\033[M%c%lc%lc", 1372 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state, 1373 code,
1358 wint_t (32 + x), 1374 wint_t (32 + x),
1359 wint_t (32 + y)); 1375 wint_t (32 + y));
1376 else
1377 tt_printf ("\033[M%c%c%lc%lc",
1378 0xc0 + (code >> 6),
1379 0x80 + (code & 0x3f),
1380 wint_t (32 + x),
1381 wint_t (32 + y));
1360 else 1382 else
1361#endif 1383#endif
1362 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1363 code + button_number + key_state, 1385 code,
1364 32 + x, 1386 32 + x,
1365 32 + y); 1387 32 + y);
1366} 1388}
1367 1389
1368/*{{{ process an X event */ 1390/*{{{ process an X event */
… …
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1502 ;
1481 1503
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1504 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483 1505
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) 1506 if (want_position_change)
1495 { 1507 {
1496 int x, y; 1508 int x, y;
1497 1509
1498 if (ev.xconfigure.send_event) 1510 if (ev.xconfigure.send_event)
… …
1506 if (x != parent_x || y != parent_y) 1518 if (x != parent_x || y != parent_y)
1507 { 1519 {
1508 parent_x = x; 1520 parent_x = x;
1509 parent_y = y; 1521 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 } 1523 }
1513 } 1524 }
1514 1525
1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1516 { 1527 {
1517 seen_resize = 1; 1528 seen_resize = 1;
1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1519 } 1530 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1527 1531
1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 } 1533 }
1530 break; 1534 break;
1531 1535
… …
1540 case SelectionRequest: 1544 case SelectionRequest:
1541 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1542 break; 1546 break;
1543 1547
1544 case MapNotify: 1548 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; 1549 mapped = 1;
1557#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1558 text_blink_ev.start (); 1551 text_blink_ev.start ();
1559#endif 1552#endif
1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1609 case MotionNotify: 1602 case MotionNotify:
1610#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1604 if (hidden_pointer)
1612 pointer_unblank (); 1605 pointer_unblank ();
1613#endif 1606#endif
1607 if (!bypass_keystate
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1608 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent) 1609 || priv_modes & PrivMode_MouseAnyEvent))
1616 mouse_report (ev.xbutton); 1610 mouse_report (ev.xbutton);
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1611 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1612 break;
1619 1613
1620 if (ev.xany.window == vt) 1614 if (ev.xany.window == vt)
… …
1632 &unused_root_x, &unused_root_y, 1626 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1627 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1628 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1636 /* deal with a `jumpy' mouse */ 1630 /* deal with a `jumpy' mouse */
1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1631 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1632#endif
1638 { 1633 {
1639#endif
1640#if ISO_14755 1634#if ISO_14755
1641 // 5.4 1635 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1636 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 { 1637 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1638 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1693 * shouldn't be scrolling 1687 * shouldn't be scrolling
1694 */ 1688 */
1695 sel_scroll_ev.stop(); 1689 sel_scroll_ev.stop();
1696 } 1690 }
1697#endif 1691#endif
1698#ifdef MOUSE_THRESHOLD
1699 } 1692 }
1700#endif
1701 } 1693 }
1702 } 1694 }
1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1695 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1704 { 1696 {
1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1697 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1779#endif 1771#endif
1780#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1782 { 1774 {
1783 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1776 scr_recolor ();
1785 } 1777 }
1786#endif 1778#endif
1787#if ENABLE_FRILLS 1779#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1780 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1781 set_urgency (0);
1782
1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1790#endif 1785#endif
1791 1786
1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 } 1788 }
1794} 1789}
… …
1802 want_refresh = 1; 1797 want_refresh = 1;
1803 1798
1804#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1805 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1806 set_urgency (0); 1801 set_urgency (0);
1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1807#endif 1805#endif
1808#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1809 if (iso14755buf) 1807 if (iso14755buf)
1810 { 1808 {
1811 iso14755buf = 0; 1809 iso14755buf = 0;
… …
1826#endif 1824#endif
1827#if OFF_FOCUS_FADING 1825#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1826 if (rs[Rs_fade])
1829 { 1827 {
1830 pix_colors = pix_colors_unfocused; 1828 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1829 scr_recolor ();
1832 } 1830 }
1833#endif 1831#endif
1834 1832
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1833 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1834 }
1837} 1835}
1838 1836
1839void ecb_cold 1837void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1838rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1839{
1842#if OFF_FOCUS_FADING 1840#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1841 if (rs[Rs_fade])
1844 { 1842 {
1843 if (!first_time)
1844 pix_colors_focused [idx].free (this);
1845
1845 rgba c; 1846 rgba c;
1846 pix_colors [Color_fade].get (c); 1847 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1848 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1849 }
1849#endif 1850#endif
1850} 1851}
1851 1852
1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1853#if ENABLE_PERL
1853void ecb_hot 1854void ecb_hot
1854rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1855{ 1856{
1856 make_current (); 1857 make_current ();
1857 1858
… …
1867 * use the property to determine the pixmap. We use it later on. 1868 * use the property to determine the pixmap. We use it later on.
1868 */ 1869 */
1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1871 { 1872 {
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)); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 } 1874 }
1881 1875
1882 break; 1876 break;
1883 } 1877 }
… …
2164 2158
2165 if (reportmode) 2159 if (reportmode)
2166 { 2160 {
2167 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2168 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2169 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2170 return; 2164 return;
2171#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2172 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2173 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2174 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2175 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2176 > multiClickTime / 2))) 2170 > multiClickTime / 2)))
2177 { 2171 {
2178 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2179 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2180 mouse_report (ev); 2174 mouse_report (ev);
2181 } 2175 }
2182#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2183 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2184 mouse_report (ev);
2185#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2186 return; 2181 return;
2187 } 2182 }
2188 2183
2189 /* 2184 /*
… …
2375 } 2370 }
2376} 2371}
2377 2372
2378// read the next character 2373// read the next character
2379wchar_t ecb_hot 2374wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2381{ 2376{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2378 {
2384 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2386 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2387 2382
2388 wchar_t wc; 2383 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2384 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2385
… …
2411 return NOCHAR; 2406 return NOCHAR;
2412} 2407}
2413 2408
2414// read the next octet 2409// read the next octet
2415uint32_t ecb_hot 2410uint32_t ecb_hot
2416rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2417{ 2412{
2418 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2419 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2420 : NOCHAR; 2415 : NOCHAR;
2421} 2416}
2422 2417
2423static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2424 2419
2425wchar_t ecb_hot 2420wchar_t ecb_hot
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2421rxvt_term::cmd_getc ()
2427{ 2422{
2428 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2429 2424
2430 if (c == NOCHAR) 2425 if (c == NOCHAR)
2431 throw out_of_input; 2426 throw out_of_input;
2432 2427
2433 return c; 2428 return c;
2434} 2429}
2435 2430
2436uint32_t ecb_hot 2431uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2438{ 2433{
2439 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2440 2435
2441 if (c == NOCHAR) 2436 if (c == NOCHAR)
2442 throw out_of_input; 2437 throw out_of_input;
… …
2571 scr_charset_choose (0); 2566 scr_charset_choose (0);
2572 break; 2567 break;
2573 2568
2574#ifdef EIGHT_BIT_CONTROLS 2569#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2570 // 8-bit controls
2576 case 0x90: /* DCS */ 2571 case 0x90: /* DCS */
2577 process_dcs_seq (); 2572 process_dcs_seq ();
2578 break; 2573 break;
2579 case 0x9b: /* CSI */ 2574 case 0x9b: /* CSI */
2580 process_csi_seq (); 2575 process_csi_seq ();
2581 break; 2576 break;
2582 case 0x9d: /* OSC */ 2577 case 0x9d: /* OSC */
2583 process_osc_seq (); 2578 process_osc_seq ();
2584 break; 2579 break;
2585#endif 2580#endif
2586 } 2581 }
2587} 2582}
… …
2715 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2717 } 2712 }
2718 break; 2713 break;
2719 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2720 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2721 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2722 // used by original rxvt for rob nations own graphics mode 2718 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q') 2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2725 break; 2721 break;
2722#endif
2726 2723
2727 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2728 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2729 scr_set_tab (1); 2726 scr_set_tab (1);
2730 break; 2727 break;
… …
2888 break; 2885 break;
2889 2886
2890 case '?': 2887 case '?':
2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2892 process_terminal_mode (ch, priv, nargs, arg); 2889 process_terminal_mode (ch, priv, nargs, arg);
2890 if (prev_ch == '$' && ch == 'p')
2891 process_terminal_mode (ch, priv, nargs, arg);
2893 break; 2892 break;
2894 2893
2895 case '!': 2894 case '!':
2896 if (ch == CSI_70) 2895 if (ch == CSI_70)
2897 { 2896 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset (); 2898 scr_soft_reset ();
2900 2899
2901 static const int pm_h[] = { 7, 25 }; 2900 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 }; 2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2903 2902
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2903 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); 2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2906 } 2905 }
2907 break; 2906 break;
… …
2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2938 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2939 break; 2938 break;
2940 2939
2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2943#ifdef ISO6429 2942#ifdef ISO6429
2944 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2945#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2946 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2947#endif 2946#endif
… …
3038 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
3039 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
3040 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3041 break; 3040 break;
3042 case 8: /* unofficial extension */ 3041 case 8: /* unofficial extension */
3042 {
3043 string_term st;
3044 st.v[0] = CHAR_ST;
3045 st.v[1] = '\0';
3043 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3044 break; 3047 break;
3048 }
3045 } 3049 }
3046 break; 3050 break;
3047 3051
3048 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3049 switch (arg[0]) 3053 switch (arg[0])
… …
3234/* 3238/*
3235 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3236 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3237 */ 3241 */
3238char * 3242char *
3239rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3240{ 3244{
3241 unicode_t ch; 3245 unicode_t ch;
3242 bool seen_esc = false; 3246 bool seen_esc = false;
3243 unsigned int n = 0; 3247 unsigned int n = 0;
3244 wchar_t string[CBUFSIZ]; 3248 wchar_t string[CBUFSIZ];
… …
3273 string[n++] = ch; 3277 string[n++] = ch;
3274 } 3278 }
3275 3279
3276 string[n++] = '\0'; 3280 string[n++] = '\0';
3277 3281
3278 ends_how = (ch == 0x5c ? C0_ESC : ch); 3282 n = 0;
3283 if (ch == 0x5c)
3284 st.v[n++] = C0_ESC;
3285 st.v[n++] = ch;
3286 st.v[n] = '\0';
3279 3287
3280 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3281} 3289}
3282 3290
3283/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3289{ 3297{
3290 /* 3298 /*
3291 * Not handled yet 3299 * Not handled yet
3292 */ 3300 */
3293 3301
3294 unicode_t eh; 3302 string_term st;
3295 char *s = get_to_st (eh); 3303 char *s = get_to_st (st);
3296 if (s) 3304 if (s)
3297 free (s); 3305 free (s);
3298 3306
3299 return; 3307 return;
3300} 3308}
… …
3312 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3313 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3314 3322
3315 if (ch == ';') 3323 if (ch == ';')
3316 { 3324 {
3317 unicode_t eh; 3325 string_term st;
3318 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3319 3327
3320 if (s) 3328 if (s)
3321 { 3329 {
3322 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3323 free (s); 3331 free (s);
3324 } 3332 }
3325 } 3333 }
3326} 3334}
3327 3335
3336static unsigned int
3337colorcube_index (unsigned int idx_r,
3338 unsigned int idx_g,
3339 unsigned int idx_b)
3340{
3341 assert (idx_r < Red_levels);
3342 assert (idx_g < Green_levels);
3343 assert (idx_b < Blue_levels);
3344
3345 return idx_r * Blue_levels * Green_levels +
3346 idx_g * Blue_levels +
3347 idx_b;
3348}
3349
3350/*
3351 * Find the nearest color slot in the hidden color cube,
3352 * adapt its value to the 32bit RGBA color.
3353 */
3354unsigned int
3355rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3356{
3357 r &= 0xff;
3358 g &= 0xff;
3359 b &= 0xff;
3360 a &= 0xff;
3361
3362 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3363
3364 /* we allow one of the 6 closest neighbouring colours */
3365 /* to replace the current color, if they not used recently */
3366 #if 0
3367 static const unsigned char dxyz[][3] = {
3368 0, 0, 0,
3369 0, 0, 4,
3370 0, 4, 4,
3371 4, 4, 0,
3372 4, 0, 4,
3373 0, 4, 0,
3374 4, 0, 0,
3375 };
3376 #else
3377 // silly compressed verlapping triplets version of above
3378 static const unsigned char dxyz[] = {
3379 0, 0, 0, 4, 4, 0, 4, 0, 0,
3380 };
3381 #endif
3382
3383 static const unsigned char color_level[8][32] = {
3384 // neighbour index
3385 {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},
3386 {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},
3387 {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},
3388 {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},
3389 // Red_levels/Green_levels/Blue_levels index
3390 {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},
3391 {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},
3392 {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},
3393 {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},
3394 };
3395
3396 unsigned int idx;
3397
3398 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3399 {
3400 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3401 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3402 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3403 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3404
3405 if (n == 0)
3406 idx = index;
3407
3408 if (rgb24_color[index] == color)
3409 {
3410 rgb24_seqno[index] = ++rgb24_sequence;
3411 return index + minTermCOLOR24;
3412 }
3413
3414 // minor issue: could update index 0 few more times
3415 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3416 {
3417 idx = index;
3418 goto update;
3419 }
3420
3421 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3422 // but also handles wrap around values well enough
3423 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3424 idx = index;
3425 }
3426
3427update:
3428 rgb24_color[idx] = color;
3429 rgb24_seqno[idx] = ++rgb24_sequence;
3430
3431 idx += minTermCOLOR24;
3432 pix_colors_focused [idx].free (this);
3433 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3434 update_fade_color (idx, false);
3435
3436 return idx;
3437}
3438
3328void 3439void
3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3440rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3330{ 3441{
3331 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3332 { 3443 {
3333 rgba c; 3444 rgba c;
3334 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3335 3447
3336#if XFT 3448#if XFT
3337 if (c.a != rgba::MAX_CC) 3449 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); 3450 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3339 else 3451 else
3340#endif 3452#endif
3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3453 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3454
3455 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3456 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3457 else
3458 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3342 } 3459 }
3343 else 3460 else
3344 set_window_color (color, str); 3461 set_window_color (color, str);
3345} 3462}
3346 3463
3347/* 3464/*
3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3349 */ 3466 */
3350void 3467void
3351rxvt_term::process_xterm_seq (int op, char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3352{ 3469{
3353 int color; 3470 int color;
3354 char *buf, *name; 3471 char *buf, *name;
3355 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3356 int saveop = op; 3473 int saveop = op;
… …
3391 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3392 && actual_type != None 3509 && actual_type != None
3393 && actual_format == 8) 3510 && actual_format == 8)
3394 str = (const char *)(value); 3511 str = (const char *)(value);
3395 3512
3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3397 3514
3398 XFree (value); 3515 XFree (value);
3399 } 3516 }
3400 else 3517 else
3401 { 3518 {
… …
3425 break; 3542 break;
3426 3543
3427 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3428 *buf++ = '\0'; 3545 *buf++ = '\0';
3429 3546
3430 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3431 } 3548 }
3432 break; 3549 break;
3433 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3434 case XTerm_Color00: 3551 case XTerm_Color00:
3435 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3436 break; 3553 break;
3437 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3438 case XTerm_Color01: 3555 case XTerm_Color01:
3439 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3440 break; 3557 break;
3441#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3442 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3443 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3444 break; 3561 break;
3445#endif 3562#endif
3446 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3447 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3448 break; 3565 break;
3449 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3450 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3451 break; 3568 break;
3452#ifdef OPTION_HC 3569#ifdef OPTION_HC
3453 case XTerm_Color_HC: 3570 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp); 3571 process_color_seq (op, Color_HC, str, st);
3455 break; 3572 break;
3456 case XTerm_Color_HTC: 3573 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp); 3574 process_color_seq (op, Color_HTC, str, st);
3458 break; 3575 break;
3459#endif 3576#endif
3460#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3461 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3462 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3463 break; 3580 break;
3464 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3465 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3466 break; 3583 break;
3467 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3468 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3469 break; 3586 break;
3470#endif 3587#endif
3471 case URxvt_Color_border: 3588 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3473 break; 3590 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 3591
3543 case XTerm_logfile: 3592 case XTerm_logfile:
3544 // TODO, when secure mode? 3593 // TODO, when secure mode?
3545 break; 3594 break;
3546 3595
… …
3563 case URxvt_boldFont: 3612 case URxvt_boldFont:
3564 case URxvt_italicFont: 3613 case URxvt_italicFont:
3565 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3566#endif 3615#endif
3567 if (query) 3616 if (query)
3568 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3569 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3570 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3571 resp); 3620 st.v);
3572 else 3621 else
3573 { 3622 {
3574 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3575 3624
3576 res = strdup (str); 3625 res = strdup (str);
… …
3579 } 3628 }
3580 break; 3629 break;
3581 3630
3582 case URxvt_version: 3631 case URxvt_version:
3583 if (query) 3632 if (query)
3584 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3585 op, 3634 op,
3586 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3587 resp); 3636 st.v);
3588 break; 3637 break;
3589 3638
3590#if !ENABLE_MINIMAL 3639#if !ENABLE_MINIMAL
3640 case URxvt_cellinfo:
3641 if (query)
3642 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3643 fwidth, fheight, fbase,
3644 st.v);
3645 break;
3646
3591 case URxvt_locale: 3647 case URxvt_locale:
3592 if (query) 3648 if (query)
3593 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3649 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3594 else 3650 else
3595 { 3651 {
3596 set_locale (str); 3652 set_locale (str);
3597 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3598 init_xlocale (); 3654 init_xlocale ();
… …
3613 break; 3669 break;
3614#endif 3670#endif
3615 3671
3616#if ENABLE_PERL 3672#if ENABLE_PERL
3617 case URxvt_perl: 3673 case URxvt_perl:
3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3619 break; 3675 break;
3620#endif 3676#endif
3621 } 3677 }
3622} 3678}
3623/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3736 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3737 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3738 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3739 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3740 { 9, PrivMode_MouseX10 },
3741 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3742 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3743 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3744 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3746 { scrollBar_esc, PrivMode_scrollBar },
… …
3701#endif 3758#endif
3702 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3703 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3704 { 1003, PrivMode_MouseAnyEvent }, 3761 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS 3762#if ENABLE_FRILLS
3763 { 1004, PrivMode_FocusEvent },
3706 { 1005, PrivMode_ExtModeMouse }, 3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3707#endif 3766#endif
3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3709 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS 3769#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3712#endif 3771#endif
3713 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3714 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3715 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3716 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3717 // 1048 save and restore cursor, implemented in code 3776 // 1048 save and restore cursor, implemented in code
3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3777 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3720 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3721 }; 3782 };
3722 3783
3723 if (nargs == 0) 3784 if (nargs == 0)
3724 return; 3785 return;
3786
3787 // DECRQM
3788 if (mode == 'p')
3789 {
3790 int status = 0;
3791 if (nargs != 1)
3792 return;
3793
3794 for (j = 0; j < ecb_array_length (argtopriv); j++)
3795 if (argtopriv[j].argval == arg[0])
3796 {
3797 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3798 break;
3799 }
3800
3801 tt_printf ("\33[?%d;%d$y", arg[0], status);
3802 return;
3803 }
3725 3804
3726 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3727 if (mode == 'l') 3806 if (mode == 'l')
3728 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3729 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3798 scrollBar.map (state); 3877 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3878 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3879 scr_touch (true);
3801 break; 3880 break;
3802#endif 3881#endif
3882#ifdef CURSOR_BLINK
3883 case 12:
3884 cursor_blink_reset ();
3885 break;
3886#endif
3803 case 25: /* visible/invisible cursor */ 3887 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3888 scr_cursor_visible (state);
3805 break; 3889 break;
3806 /* case 35: - shift keys */ 3890 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3891 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 3996 //case 19: // ninth alt font
3913 //case 20: // gothic 3997 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3998 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 3999 rendset = 0, rendstyle = RS_Bold;
3916 break; 4000 break;
3917 case 22: // normal intensity 4001 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 4002 rendset = 0, rendstyle = RS_Bold;
3919 break; 4003 break;
3920 case 23: // disable italic 4004 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 4005 rendset = 0, rendstyle = RS_Italic;
3922 break; 4006 break;
3923 case 24: 4007 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 4008 rendset = 0, rendstyle = RS_Uline;
3925 break; 4009 break;
3926 case 25: 4010 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 4011 rendset = 0, rendstyle = RS_Blink;
3928 break; 4012 break;
3929 case 26: // variable spacing (iso 8613) 4013 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 4014 rendset = 0, rendstyle = RS_Blink;
3931 break; 4015 break;
3932 case 27: 4016 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 4017 rendset = 0, rendstyle = RS_RVid;
3934 break; 4018 break;
3935 //case 28: // visible. NYI 4019 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 4020 //case 29: // not crossed-out
3937 } 4021 }
… …
3952 case 35: 4036 case 35:
3953 case 36: 4037 case 36:
3954 case 37: 4038 case 37:
3955 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3956 break; 4040 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 */ 4041 case 39: /* default fg */
3965 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
3966 break; 4043 break;
3967 4044
3968 case 40: 4045 case 40:
… …
3973 case 45: 4050 case 45:
3974 case 46: 4051 case 46:
3975 case 47: 4052 case 47:
3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3977 break; 4054 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 */ 4055 case 49: /* default bg */
3986 scr_color (Color_bg, Color_bg); 4056 scr_color (Color_bg, Color_bg);
4057 break;
4058
4059 case 38: // set fg color, ISO 8613-6
4060 case 48: // set bg color, ISO 8613-6
4061 {
4062 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4063 unsigned int idx;
4064
4065 if (nargs > i + 2 && arg[i + 1] == 5)
4066 {
4067 idx = minCOLOR + arg[i + 2];
4068 i += 2;
4069
4070 scr_color (idx, fgbg);
4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int a = 0xff;
4078
4079 idx = map_rgb24_color (r, g, b, a);
4080
4081 i += 4;
4082
4083 scr_color (idx, fgbg);
4084 }
4085 }
3987 break; 4086 break;
3988 4087
3989 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
3990 4089
3991#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL

Diff Legend

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