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.568 by sf-exg, Tue Oct 13 08:10:43 2015 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,2015 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
… …
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
… …
1277#endif 1279#endif
1278 1280
1279void 1281void
1280rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1281{ 1283{
1282 int button_number, key_state = 0; 1284 int button_number, state = 0;
1283 int x, y; 1285 int x, y;
1284 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1285 1287
1286 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1287 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1288 1290
1289 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1290 { 1292 {
1291 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1292 return; 1294 return;
1293 1295
1294 mouse_row = x; 1296 mouse_row = x;
1295 mouse_col = y; 1297 mouse_col = y;
1296 code += 32; 1298 state += 32;
1297 } 1299 }
1298 1300
1299 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1300 button_number = 3; 1302 button_number = 3;
1301 else 1303 else
1302 { 1304 {
1303 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1304 /* 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;
1305 if (button_number >= 3) 1310 else if (button_number >= 3)
1306 button_number += 64 - 3; 1311 button_number += 64 - 3;
1307 } 1312 }
1308 1313
1309 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1310 { 1315 {
1311 /* 1316 /*
1312 * do not report ButtonRelease 1317 * do not report ButtonRelease
1313 * no state info allowed 1318 * no state info allowed
1314 */ 1319 */
1315 key_state = 0; 1320 if (release)
1316 if (button_number == 3)
1317 return; 1321 return;
1318 } 1322 }
1319 else 1323 else
1320 { 1324 {
1321 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1327 * 8 = Meta
1324 * 16 = Control 1328 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1330 * 32 = Double Click
1327 */ 1331 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1337#endif
1334 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1335 1341
1336#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1344 if (state & 16)
1339 fputc ('C', stderr); 1345 fputc ('C', stderr);
1340 if (key_state & 4) 1346 if (state & 4)
1341 fputc ('S', stderr); 1347 fputc ('S', stderr);
1342 if (key_state & 8) 1348 if (state & 8)
1343 fputc ('A', stderr); 1349 fputc ('A', stderr);
1344 if (key_state & 32) 1350 if (state & 32)
1345 fputc ('2', stderr); 1351 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1353 button_number,
1348 x, 1354 x,
1349 y); 1355 y);
1350#endif 1356#endif
1351 1357
1352#if ENABLE_FRILLS 1358#if ENABLE_FRILLS
1353 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)
1354 tt_printf ("\033[%d;%d;%dM", 1366 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1367 code,
1356 x, 1368 x,
1357 y); 1369 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1370 else if (priv_modes & PrivMode_ExtMouseUTF8)
1371 if (code < 128)
1359 tt_printf ("\033[M%c%lc%lc", 1372 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1373 code,
1361 wint_t (32 + x), 1374 wint_t (32 + x),
1362 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));
1363 else 1382 else
1364#endif 1383#endif
1365 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1385 code,
1367 32 + x, 1386 32 + x,
1368 32 + y); 1387 32 + y);
1369} 1388}
1370 1389
1371/*{{{ process an X event */ 1390/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1502 ;
1484 1503
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1504 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1505
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change) 1506 if (want_position_change)
1498 { 1507 {
1499 int x, y; 1508 int x, y;
1500 1509
1501 if (ev.xconfigure.send_event) 1510 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1518 if (x != parent_x || y != parent_y)
1510 { 1519 {
1511 parent_x = x; 1520 parent_x = x;
1512 parent_y = y; 1521 parent_y = y;
1513 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));
1514 moved = true;
1515 } 1523 }
1516 } 1524 }
1517 1525
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1527 {
1520 seen_resize = 1; 1528 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1530 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1531
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1533 }
1533 break; 1534 break;
1534 1535
… …
1543 case SelectionRequest: 1544 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1545 break; 1546 break;
1546 1547
1547 case MapNotify: 1548 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1559 mapped = 1; 1549 mapped = 1;
1560#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1551 text_blink_ev.start ();
1562#endif 1552#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1787 } 1777 }
1788#endif 1778#endif
1789#if ENABLE_FRILLS 1779#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell)) 1780 if (option (Opt_urgentOnBell))
1791 set_urgency (0); 1781 set_urgency (0);
1782
1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1792#endif 1785#endif
1793 1786
1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 } 1788 }
1796} 1789}
… …
1804 want_refresh = 1; 1797 want_refresh = 1;
1805 1798
1806#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1808 set_urgency (0); 1801 set_urgency (0);
1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1809#endif 1805#endif
1810#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf) 1807 if (iso14755buf)
1812 { 1808 {
1813 iso14755buf = 0; 1809 iso14755buf = 0;
… …
1852 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);
1853 } 1849 }
1854#endif 1850#endif
1855} 1851}
1856 1852
1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1853#if ENABLE_PERL
1858void ecb_hot 1854void ecb_hot
1859rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1860{ 1856{
1861 make_current (); 1857 make_current ();
1862 1858
… …
1872 * 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.
1873 */ 1869 */
1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1876 { 1872 {
1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1885 } 1874 }
1886 1875
1887 break; 1876 break;
1888 } 1877 }
… …
2169 2158
2170 if (reportmode) 2159 if (reportmode)
2171 { 2160 {
2172 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2173 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2174 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2175 return; 2164 return;
2176#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2177 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2178 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2179 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2180 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2181 > multiClickTime / 2))) 2170 > multiClickTime / 2)))
2182 { 2171 {
2183 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2184 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2185 mouse_report (ev); 2174 mouse_report (ev);
2186 } 2175 }
2187#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2188 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2189 mouse_report (ev);
2190#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2191 return; 2181 return;
2192 } 2182 }
2193 2183
2194 /* 2184 /*
… …
2380 } 2370 }
2381} 2371}
2382 2372
2383// read the next character 2373// read the next character
2384wchar_t ecb_hot 2374wchar_t ecb_hot
2385rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2386{ 2376{
2387 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2388 { 2378 {
2389 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2391 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2392 2382
2393 wchar_t wc; 2383 wchar_t wc;
2394 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);
2395 2385
… …
2416 return NOCHAR; 2406 return NOCHAR;
2417} 2407}
2418 2408
2419// read the next octet 2409// read the next octet
2420uint32_t ecb_hot 2410uint32_t ecb_hot
2421rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2422{ 2412{
2423 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2424 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2425 : NOCHAR; 2415 : NOCHAR;
2426} 2416}
2427 2417
2428static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2429 2419
2430wchar_t ecb_hot 2420wchar_t ecb_hot
2431rxvt_term::cmd_getc () THROW ((class out_of_input)) 2421rxvt_term::cmd_getc ()
2432{ 2422{
2433 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2434 2424
2435 if (c == NOCHAR) 2425 if (c == NOCHAR)
2436 throw out_of_input; 2426 throw out_of_input;
2437 2427
2438 return c; 2428 return c;
2439} 2429}
2440 2430
2441uint32_t ecb_hot 2431uint32_t ecb_hot
2442rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2443{ 2433{
2444 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2445 2435
2446 if (c == NOCHAR) 2436 if (c == NOCHAR)
2447 throw out_of_input; 2437 throw out_of_input;
… …
2720 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2722 } 2712 }
2723 break; 2713 break;
2724 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2725 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2726 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2727 // used by original rxvt for rob nations own graphics mode 2718 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q') 2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2730 break; 2721 break;
2722#endif
2731 2723
2732 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2733 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2734 scr_set_tab (1); 2726 scr_set_tab (1);
2735 break; 2727 break;
… …
2893 break; 2885 break;
2894 2886
2895 case '?': 2887 case '?':
2896 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2897 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);
2898 break; 2892 break;
2899 2893
2900 case '!': 2894 case '!':
2901 if (ch == CSI_70) 2895 if (ch == CSI_70)
2902 { 2896 {
2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2904 scr_soft_reset (); 2898 scr_soft_reset ();
2905 2899
2906 static const int pm_h[] = { 7, 25 }; 2900 static const int pm_h[] = { 7, 25 };
2907 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 };
2908 2902
2909 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);
2910 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);
2911 } 2905 }
2912 break; 2906 break;
… …
2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2943 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2944 break; 2938 break;
2945 2939
2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2948#ifdef ISO6429 2942#ifdef ISO6429
2949 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2950#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2951 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2952#endif 2946#endif
… …
3043 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
3044 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
3045 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3046 break; 3040 break;
3047 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';
3048 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3049 break; 3047 break;
3048 }
3050 } 3049 }
3051 break; 3050 break;
3052 3051
3053 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3054 switch (arg[0]) 3053 switch (arg[0])
… …
3239/* 3238/*
3240 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3241 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3242 */ 3241 */
3243char * 3242char *
3244rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3245{ 3244{
3246 unicode_t ch; 3245 unicode_t ch;
3247 bool seen_esc = false; 3246 bool seen_esc = false;
3248 unsigned int n = 0; 3247 unsigned int n = 0;
3249 wchar_t string[CBUFSIZ]; 3248 wchar_t string[CBUFSIZ];
… …
3278 string[n++] = ch; 3277 string[n++] = ch;
3279 } 3278 }
3280 3279
3281 string[n++] = '\0'; 3280 string[n++] = '\0';
3282 3281
3283 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';
3284 3287
3285 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3286} 3289}
3287 3290
3288/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3294{ 3297{
3295 /* 3298 /*
3296 * Not handled yet 3299 * Not handled yet
3297 */ 3300 */
3298 3301
3299 unicode_t eh; 3302 string_term st;
3300 char *s = get_to_st (eh); 3303 char *s = get_to_st (st);
3301 if (s) 3304 if (s)
3302 free (s); 3305 free (s);
3303 3306
3304 return; 3307 return;
3305} 3308}
… …
3317 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3318 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3319 3322
3320 if (ch == ';') 3323 if (ch == ';')
3321 { 3324 {
3322 unicode_t eh; 3325 string_term st;
3323 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3324 3327
3325 if (s) 3328 if (s)
3326 { 3329 {
3327 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3328 free (s); 3331 free (s);
3329 } 3332 }
3330 } 3333 }
3331} 3334}
3332 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
3333void 3439void
3334rxvt_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)
3335{ 3441{
3336 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3337 { 3443 {
3338 rgba c; 3444 rgba c;
3339 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3340 3447
3341#if XFT 3448#if XFT
3342 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3343 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp); 3450 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3344 else 3451 else
3345#endif 3452#endif
3346 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);
3347 } 3459 }
3348 else 3460 else
3349 set_window_color (color, str); 3461 set_window_color (color, str);
3350} 3462}
3351 3463
3352/* 3464/*
3353 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3354 */ 3466 */
3355void 3467void
3356rxvt_term::process_xterm_seq (int op, char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3357{ 3469{
3358 int color; 3470 int color;
3359 char *buf, *name; 3471 char *buf, *name;
3360 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3361 int saveop = op; 3473 int saveop = op;
… …
3396 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3397 && actual_type != None 3509 && actual_type != None
3398 && actual_format == 8) 3510 && actual_format == 8)
3399 str = (const char *)(value); 3511 str = (const char *)(value);
3400 3512
3401 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);
3402 3514
3403 XFree (value); 3515 XFree (value);
3404 } 3516 }
3405 else 3517 else
3406 { 3518 {
… …
3430 break; 3542 break;
3431 3543
3432 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3433 *buf++ = '\0'; 3545 *buf++ = '\0';
3434 3546
3435 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3436 } 3548 }
3437 break; 3549 break;
3438 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3439 case XTerm_Color00: 3551 case XTerm_Color00:
3440 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3441 break; 3553 break;
3442 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3443 case XTerm_Color01: 3555 case XTerm_Color01:
3444 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3445 break; 3557 break;
3446#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3447 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3448 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3449 break; 3561 break;
3450#endif 3562#endif
3451 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3452 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3453 break; 3565 break;
3454 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3455 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3456 break; 3568 break;
3457#ifdef OPTION_HC 3569#ifdef OPTION_HC
3458 case XTerm_Color_HC: 3570 case XTerm_Color_HC:
3459 process_color_seq (op, Color_HC, str, resp); 3571 process_color_seq (op, Color_HC, str, st);
3460 break; 3572 break;
3461 case XTerm_Color_HTC: 3573 case XTerm_Color_HTC:
3462 process_color_seq (op, Color_HTC, str, resp); 3574 process_color_seq (op, Color_HTC, str, st);
3463 break; 3575 break;
3464#endif 3576#endif
3465#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3466 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3467 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3468 break; 3580 break;
3469 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3470 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3471 break; 3583 break;
3472 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3473 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3474 break; 3586 break;
3475#endif 3587#endif
3476 case URxvt_Color_border: 3588 case URxvt_Color_border:
3477 process_color_seq (op, Color_border, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3478 break; 3590 break;
3479
3480#if BG_IMAGE_FROM_ROOT
3481 case URxvt_Color_tint:
3482 process_color_seq (op, Color_tint, str, resp);
3483 {
3484 bool changed = false;
3485
3486 if (ISSET_PIXCOLOR (Color_tint))
3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3488
3489 if (changed)
3490 update_background ();
3491 }
3492
3493 break;
3494#endif
3495
3496#if BG_IMAGE_FROM_FILE
3497 case Rxvt_Pixmap:
3498 if (!strcmp (str, "?"))
3499 {
3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3505
3506 sprintf (str, "[%dx%d+%d+%d]",
3507 h_scale, v_scale,
3508 h_align, v_align);
3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3510 }
3511 else
3512 {
3513 bool changed = false;
3514
3515 if (*str != ';')
3516 {
3517 try
3518 {
3519 fimage.set_file_geometry (this, str);
3520 changed = true;
3521 }
3522 catch (const class rxvt_failure_exception &e)
3523 {
3524 }
3525 }
3526 else
3527 {
3528 str++;
3529 if (fimage.set_geometry (str, true))
3530 changed = true;
3531 }
3532
3533 if (changed)
3534 {
3535 if (bg_window_position_sensitive ())
3536 {
3537 int x, y;
3538 get_window_origin (x, y);
3539 parent_x = x;
3540 parent_y = y;
3541 }
3542 update_background ();
3543 }
3544 }
3545 break;
3546#endif
3547 3591
3548 case XTerm_logfile: 3592 case XTerm_logfile:
3549 // TODO, when secure mode? 3593 // TODO, when secure mode?
3550 break; 3594 break;
3551 3595
… …
3568 case URxvt_boldFont: 3612 case URxvt_boldFont:
3569 case URxvt_italicFont: 3613 case URxvt_italicFont:
3570 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3571#endif 3615#endif
3572 if (query) 3616 if (query)
3573 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3574 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3575 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3576 resp); 3620 st.v);
3577 else 3621 else
3578 { 3622 {
3579 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3580 3624
3581 res = strdup (str); 3625 res = strdup (str);
… …
3584 } 3628 }
3585 break; 3629 break;
3586 3630
3587 case URxvt_version: 3631 case URxvt_version:
3588 if (query) 3632 if (query)
3589 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3590 op, 3634 op,
3591 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3592 resp); 3636 st.v);
3593 break; 3637 break;
3594 3638
3595#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
3596 case URxvt_locale: 3647 case URxvt_locale:
3597 if (query) 3648 if (query)
3598 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);
3599 else 3650 else
3600 { 3651 {
3601 set_locale (str); 3652 set_locale (str);
3602 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3603 init_xlocale (); 3654 init_xlocale ();
… …
3618 break; 3669 break;
3619#endif 3670#endif
3620 3671
3621#if ENABLE_PERL 3672#if ENABLE_PERL
3622 case URxvt_perl: 3673 case URxvt_perl:
3623 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));
3624 break; 3675 break;
3625#endif 3676#endif
3626 } 3677 }
3627} 3678}
3628/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3707#endif 3758#endif
3708 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3709 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3710 { 1003, PrivMode_MouseAnyEvent }, 3761 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS 3762#if ENABLE_FRILLS
3763 { 1004, PrivMode_FocusEvent },
3712 { 1005, PrivMode_ExtModeMouse }, 3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3713#endif 3766#endif
3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS 3769#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3718#endif 3771#endif
3719 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3720 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3721 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3722 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3723 // 1048 save and restore cursor, implemented in code 3776 // 1048 save and restore cursor, implemented in code
3724 { 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 */
3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3726 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3727 }; 3782 };
3728 3783
3729 if (nargs == 0) 3784 if (nargs == 0)
3730 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 }
3731 3804
3732 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3733 if (mode == 'l') 3806 if (mode == 'l')
3734 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3735 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3963 case 35: 4036 case 35:
3964 case 36: 4037 case 36:
3965 case 37: 4038 case 37:
3966 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3967 break; 4040 break;
3968 case 38: // set fg color, ISO 8613-6
3969 if (nargs > i + 2 && arg[i + 1] == 5)
3970 {
3971 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3972 i += 2;
3973 }
3974 break;
3975 case 39: /* default fg */ 4041 case 39: /* default fg */
3976 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
3977 break; 4043 break;
3978 4044
3979 case 40: 4045 case 40:
… …
3984 case 45: 4050 case 45:
3985 case 46: 4051 case 46:
3986 case 47: 4052 case 47:
3987 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3988 break; 4054 break;
3989 case 48: // set bg color, ISO 8613-6
3990 if (nargs > i + 2 && arg[i + 1] == 5)
3991 {
3992 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3993 i += 2;
3994 }
3995 break;
3996 case 49: /* default bg */ 4055 case 49: /* default bg */
3997 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 }
3998 break; 4086 break;
3999 4087
4000 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
4001 4089
4002#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL

Diff Legend

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