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.579 by root, Thu Jun 30 17:03:45 2016 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 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,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 }
1298
1299 if (MEvent.button == AnyButton)
1300 button_number = 3;
1301 else
1302 { 1299 }
1300
1303 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1304 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1305 if (button_number >= 3) 1306 else if (button_number >= 3)
1306 button_number += 64 - 3; 1307 button_number += 64 - 3;
1307 }
1308 1308
1309 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1310 { 1310 {
1311 /* 1311 /*
1312 * do not report ButtonRelease 1312 * do not report ButtonRelease
1313 * no state info allowed 1313 * no state info allowed
1314 */ 1314 */
1315 key_state = 0; 1315 if (release)
1316 if (button_number == 3)
1317 return; 1316 return;
1318 } 1317 }
1319 else 1318 else
1320 { 1319 {
1321 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1322 * 8 = Meta
1324 * 16 = Control 1323 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1325 * 32 = Double Click
1327 */ 1326 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1332#endif
1334 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1335 1336
1336#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1339 if (state & 16)
1339 fputc ('C', stderr); 1340 fputc ('C', stderr);
1340 if (key_state & 4) 1341 if (state & 4)
1341 fputc ('S', stderr); 1342 fputc ('S', stderr);
1342 if (key_state & 8) 1343 if (state & 8)
1343 fputc ('A', stderr); 1344 fputc ('A', stderr);
1344 if (key_state & 32) 1345 if (state & 32)
1345 fputc ('2', stderr); 1346 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1348 button_number,
1348 x, 1349 x,
1349 y); 1350 y);
1350#endif 1351#endif
1351 1352
1352#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1361 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1362 code,
1356 x, 1363 x,
1357 y); 1364 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1359 tt_printf ("\033[M%c%lc%lc", 1367 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1368 code,
1361 wint_t (32 + x), 1369 wint_t (32 + x),
1362 wint_t (32 + y)); 1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1363 else 1377 else
1364#endif 1378#endif
1365 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1380 code,
1367 32 + x, 1381 32 + x,
1368 32 + y); 1382 32 + y);
1369} 1383}
1370 1384
1371/*{{{ process an X event */ 1385/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1497 ;
1484 1498
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1500
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) 1501 if (want_position_change)
1498 { 1502 {
1499 int x, y; 1503 int x, y;
1500 1504
1501 if (ev.xconfigure.send_event) 1505 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1513 if (x != parent_x || y != parent_y)
1510 { 1514 {
1511 parent_x = x; 1515 parent_x = x;
1512 parent_y = y; 1516 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 } 1518 }
1516 } 1519 }
1517 1520
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1522 {
1520 seen_resize = 1; 1523 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1525 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1526
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1528 }
1533 break; 1529 break;
1534 1530
… …
1543 case SelectionRequest: 1539 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1545 break; 1541 break;
1546 1542
1547 case MapNotify: 1543 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; 1544 mapped = 1;
1560#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1546 text_blink_ev.start ();
1562#endif 1547#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1859 } 1844 }
1860#endif 1845#endif
1861} 1846}
1862 1847
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1848#if ENABLE_PERL
1864void ecb_hot 1849void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1851{
1867 make_current (); 1852 make_current ();
1868 1853
… …
1878 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1879 */ 1864 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1867 {
1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1869 }
1892 1870
1893 break; 1871 break;
1894 } 1872 }
… …
2175 2153
2176 if (reportmode) 2154 if (reportmode)
2177 { 2155 {
2178 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2179 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2180 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2181 return; 2159 return;
2182#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2183 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2184 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2185 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2186 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2187 > multiClickTime / 2))) 2165 > multiClickTime / 2)))
2188 { 2166 {
2189 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2190 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2191 mouse_report (ev); 2169 mouse_report (ev);
2192 } 2170 }
2193#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2194 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2195 mouse_report (ev); 2173 mouse_report (ev);
2196#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2197 return; 2175 return;
2198 } 2176 }
2199 2177
… …
2386 } 2364 }
2387} 2365}
2388 2366
2389// read the next character 2367// read the next character
2390wchar_t ecb_hot 2368wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2392{ 2370{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2372 {
2395 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2398 2376
2399 wchar_t wc; 2377 wchar_t wc;
2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2401 2379
… …
2422 return NOCHAR; 2400 return NOCHAR;
2423} 2401}
2424 2402
2425// read the next octet 2403// read the next octet
2426uint32_t ecb_hot 2404uint32_t ecb_hot
2427rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2428{ 2406{
2429 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2430 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2431 : NOCHAR; 2409 : NOCHAR;
2432} 2410}
2433 2411
2434static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2435 2413
2436wchar_t ecb_hot 2414wchar_t ecb_hot
2437rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc ()
2438{ 2416{
2439 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2440 2418
2441 if (c == NOCHAR) 2419 if (c == NOCHAR)
2442 throw out_of_input; 2420 throw out_of_input;
2443 2421
2444 return c; 2422 return c;
2445} 2423}
2446 2424
2447uint32_t ecb_hot 2425uint32_t ecb_hot
2448rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2449{ 2427{
2450 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2451 2429
2452 if (c == NOCHAR) 2430 if (c == NOCHAR)
2453 throw out_of_input; 2431 throw out_of_input;
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2706 }
2729 break; 2707 break;
2730 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2712 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2715 break;
2716#endif
2737 2717
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2720 scr_set_tab (1);
2741 break; 2721 break;
… …
2899 break; 2879 break;
2900 2880
2901 case '?': 2881 case '?':
2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2903 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2904 break; 2886 break;
2905 2887
2906 case '!': 2888 case '!':
2907 if (ch == CSI_70) 2889 if (ch == CSI_70)
2908 { 2890 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset (); 2892 scr_soft_reset ();
2911 2893
2912 static const int pm_h[] = { 7, 25 }; 2894 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2914 2896
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2917 } 2899 }
2918 break; 2900 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2932 break;
2951 2933
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2936#ifdef ISO6429
2955 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2940#endif
… …
3049 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3050 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
3051 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3052 break; 3034 break;
3053 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3054 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3055 break; 3041 break;
3042 }
3056 } 3043 }
3057 break; 3044 break;
3058 3045
3059 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3060 switch (arg[0]) 3047 switch (arg[0])
… …
3245/* 3232/*
3246 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3247 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3248 */ 3235 */
3249char * 3236char *
3250rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3251{ 3238{
3252 unicode_t ch; 3239 unicode_t ch;
3253 bool seen_esc = false; 3240 bool seen_esc = false;
3254 unsigned int n = 0; 3241 unsigned int n = 0;
3255 wchar_t string[CBUFSIZ]; 3242 wchar_t string[CBUFSIZ];
… …
3284 string[n++] = ch; 3271 string[n++] = ch;
3285 } 3272 }
3286 3273
3287 string[n++] = '\0'; 3274 string[n++] = '\0';
3288 3275
3289 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3290 3281
3291 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3292} 3283}
3293 3284
3294/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3300{ 3291{
3301 /* 3292 /*
3302 * Not handled yet 3293 * Not handled yet
3303 */ 3294 */
3304 3295
3305 unicode_t eh; 3296 string_term st;
3306 char *s = get_to_st (eh); 3297 char *s = get_to_st (st);
3307 if (s) 3298 if (s)
3308 free (s); 3299 free (s);
3309 3300
3310 return; 3301 return;
3311} 3302}
… …
3323 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3324 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3325 3316
3326 if (ch == ';') 3317 if (ch == ';')
3327 { 3318 {
3328 unicode_t eh; 3319 string_term st;
3329 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3330 3321
3331 if (s) 3322 if (s)
3332 { 3323 {
3333 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3334 free (s); 3325 free (s);
3335 } 3326 }
3336 } 3327 }
3337} 3328}
3338 3329
… …
3350 idx_b; 3341 idx_b;
3351} 3342}
3352 3343
3353/* 3344/*
3354 * Find the nearest color slot in the hidden color cube, 3345 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color. 3346 * adapt its value to the 32bit RGBA color.
3356 */ 3347 */
3357unsigned int 3348unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) 3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{ 3350{
3360 r &= 0xff; 3351 r &= 0xff;
3361 g &= 0xff; 3352 g &= 0xff;
3362 b &= 0xff; 3353 b &= 0xff;
3354 a &= 0xff;
3363 3355
3364 unsigned int color = (r << 16) | (g << 8) | b; 3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369 3357
3370 /* we allow one of the 6 directly neighbouring colours */ 3358 /* we allow one of the 6 closest neighbouring colours */
3371 /* to replace the current color, if they not used recently */ 3359 /* to replace the current color, if they not used recently */
3360 #if 0
3372 static const signed char dxyz[][3] = { 3361 static const unsigned char dxyz[][3] = {
3373 0, 0, 0, 3362 0, 0, 0,
3374 0, 0, +1, 3363 0, 0, 4,
3375 0, 0, -1, 3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3376 0, +1, 0, 3367 0, 4, 0,
3377 0, -1, 0,
3378 +1, 0, 0, 3368 4, 0, 0,
3379 -1, 0, 0,
3380 }; 3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3381 3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {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},
3380 {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},
3381 {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},
3382 {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},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {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},
3385 {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},
3386 {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},
3387 {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},
3388 };
3389
3390 unsigned int idx;
3391
3382 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3383 { 3393 {
3384 int r = idx_r + dxyz[n][0]; 3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3385 int g = idx_r + dxyz[n][1]; 3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3386 int b = idx_r + dxyz[n][2]; 3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3387
3388 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3389 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3390 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3391
3392 unsigned int index = colorcube_index (r, g, b); 3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3393 3401
3394 if (rgb24_color[index] == color) 3402 if (rgb24_color[index] == color)
3395 { 3403 {
3396 rgb24_seqno[index] = ++rgb24_sequence; 3404 rgb24_seqno[index] = ++rgb24_sequence;
3397 return index + minTermCOLOR24; 3405 return index + minTermCOLOR24;
… …
3403 idx = index; 3411 idx = index;
3404 goto update; 3412 goto update;
3405 } 3413 }
3406 3414
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough 3416 // but also handles wrap around values well enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3410 idx = index; 3418 idx = index;
3411 } 3419 }
3412 3420
3413update: 3421update:
3414 rgb24_color[idx] = color; 3422 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence; 3423 rgb24_seqno[idx] = ++rgb24_sequence;
3416 3424
3417 idx += minTermCOLOR24; 3425 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this); 3426 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101)); 3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3420 update_fade_color (idx, false); 3428 update_fade_color (idx, false);
3421 3429
3422 return idx; 3430 return idx;
3423} 3431}
3424 3432
3425void 3433void
3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3427{ 3435{
3428 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3429 { 3437 {
3430 rgba c; 3438 rgba c;
3431 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3432 3441
3433#if XFT 3442#if XFT
3434 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3436 else 3445 else
3437#endif 3446#endif
3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3439 } 3453 }
3440 else 3454 else
3441 set_window_color (color, str); 3455 set_window_color (color, str);
3442} 3456}
3443 3457
3444/* 3458/*
3445 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3446 */ 3460 */
3447void 3461void
3448rxvt_term::process_xterm_seq (int op, char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3449{ 3463{
3450 int color; 3464 int color;
3451 char *buf, *name; 3465 char *buf, *name;
3452 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3453 int saveop = op; 3467 int saveop = op;
… …
3488 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3489 && actual_type != None 3503 && actual_type != None
3490 && actual_format == 8) 3504 && actual_format == 8)
3491 str = (const char *)(value); 3505 str = (const char *)(value);
3492 3506
3493 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3494 3508
3495 XFree (value); 3509 XFree (value);
3496 } 3510 }
3497 else 3511 else
3498 { 3512 {
… …
3522 break; 3536 break;
3523 3537
3524 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3525 *buf++ = '\0'; 3539 *buf++ = '\0';
3526 3540
3527 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3528 } 3542 }
3529 break; 3543 break;
3530 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3531 case XTerm_Color00: 3545 case XTerm_Color00:
3532 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3533 break; 3547 break;
3534 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3535 case XTerm_Color01: 3549 case XTerm_Color01:
3536 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3537 break; 3551 break;
3538#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3539 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3540 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3541 break; 3555 break;
3542#endif 3556#endif
3543 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3544 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3545 break; 3559 break;
3546 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3547 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3548 break; 3562 break;
3549#ifdef OPTION_HC 3563#ifdef OPTION_HC
3550 case XTerm_Color_HC: 3564 case XTerm_Color_HC:
3551 process_color_seq (op, Color_HC, str, resp); 3565 process_color_seq (op, Color_HC, str, st);
3552 break; 3566 break;
3553 case XTerm_Color_HTC: 3567 case XTerm_Color_HTC:
3554 process_color_seq (op, Color_HTC, str, resp); 3568 process_color_seq (op, Color_HTC, str, st);
3555 break; 3569 break;
3556#endif 3570#endif
3557#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3558 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3559 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3560 break; 3574 break;
3561 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3562 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3563 break; 3577 break;
3564 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3565 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3566 break; 3580 break;
3567#endif 3581#endif
3568 case URxvt_Color_border: 3582 case URxvt_Color_border:
3569 process_color_seq (op, Color_border, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3570 break; 3584 break;
3571
3572#if BG_IMAGE_FROM_ROOT
3573 case URxvt_Color_tint:
3574 process_color_seq (op, Color_tint, str, resp);
3575 {
3576 bool changed = false;
3577
3578 if (ISSET_PIXCOLOR (Color_tint))
3579 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3580
3581 if (changed)
3582 update_background ();
3583 }
3584
3585 break;
3586#endif
3587
3588#if BG_IMAGE_FROM_FILE
3589 case Rxvt_Pixmap:
3590 if (!strcmp (str, "?"))
3591 {
3592 char str[256];
3593 int h_scale = fimage.h_scale;
3594 int v_scale = fimage.v_scale;
3595 int h_align = fimage.h_align;
3596 int v_align = fimage.v_align;
3597
3598 sprintf (str, "[%dx%d+%d+%d]",
3599 h_scale, v_scale,
3600 h_align, v_align);
3601 process_xterm_seq (XTerm_title, str, CHAR_ST);
3602 }
3603 else
3604 {
3605 bool changed = false;
3606
3607 if (*str != ';')
3608 {
3609 try
3610 {
3611 fimage.set_file_geometry (this, str);
3612 changed = true;
3613 }
3614 catch (const class rxvt_failure_exception &e)
3615 {
3616 }
3617 }
3618 else
3619 {
3620 str++;
3621 if (fimage.set_geometry (str, true))
3622 changed = true;
3623 }
3624
3625 if (changed)
3626 {
3627 if (bg_window_position_sensitive ())
3628 {
3629 int x, y;
3630 get_window_origin (x, y);
3631 parent_x = x;
3632 parent_y = y;
3633 }
3634 update_background ();
3635 }
3636 }
3637 break;
3638#endif
3639 3585
3640 case XTerm_logfile: 3586 case XTerm_logfile:
3641 // TODO, when secure mode? 3587 // TODO, when secure mode?
3642 break; 3588 break;
3643 3589
… …
3660 case URxvt_boldFont: 3606 case URxvt_boldFont:
3661 case URxvt_italicFont: 3607 case URxvt_italicFont:
3662 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3663#endif 3609#endif
3664 if (query) 3610 if (query)
3665 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3666 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3667 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3668 resp); 3614 st.v);
3669 else 3615 else
3670 { 3616 {
3671 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3672 3618
3673 res = strdup (str); 3619 res = strdup (str);
… …
3676 } 3622 }
3677 break; 3623 break;
3678 3624
3679 case URxvt_version: 3625 case URxvt_version:
3680 if (query) 3626 if (query)
3681 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3682 op, 3628 op,
3683 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3684 resp); 3630 st.v);
3685 break; 3631 break;
3686 3632
3687#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3688 case URxvt_locale: 3641 case URxvt_locale:
3689 if (query) 3642 if (query)
3690 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3691 else 3644 else
3692 { 3645 {
3693 set_locale (str); 3646 set_locale (str);
3694 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3695 init_xlocale (); 3648 init_xlocale ();
… …
3710 break; 3663 break;
3711#endif 3664#endif
3712 3665
3713#if ENABLE_PERL 3666#if ENABLE_PERL
3714 case URxvt_perl: 3667 case URxvt_perl:
3715 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3716 break; 3669 break;
3717#endif 3670#endif
3718 } 3671 }
3719} 3672}
3720/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3800 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3801 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3802 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3803#if ENABLE_FRILLS 3756#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent }, 3757 { 1004, PrivMode_FocusEvent },
3805 { 1005, PrivMode_ExtModeMouse }, 3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3806#endif 3760#endif
3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3808 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3809#if ENABLE_FRILLS 3763#if ENABLE_FRILLS
3810 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3811#endif 3765#endif
3812 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3813 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3814 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3815 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3816 // 1048 save and restore cursor, implemented in code 3770 // 1048 save and restore cursor, implemented in code
3817 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3818 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3819 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3820 }; 3776 };
3821 3777
3822 if (nargs == 0) 3778 if (nargs == 0)
3823 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3824 3798
3825 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3826 if (mode == 'l') 3800 if (mode == 'l')
3827 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3828 else if (mode == 'h') 3802 else if (mode == 'h')
… …
4056 case 35: 4030 case 35:
4057 case 36: 4031 case 36:
4058 case 37: 4032 case 37:
4059 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4060 break; 4034 break;
4061 case 38: // set fg color, ISO 8613-6
4062 if (nargs > i + 2 && arg[i + 1] == 5)
4063 {
4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4065 i += 2;
4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
4076 break;
4077 case 39: /* default fg */ 4035 case 39: /* default fg */
4078 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
4079 break; 4037 break;
4080 4038
4081 case 40: 4039 case 40:
… …
4086 case 45: 4044 case 45:
4087 case 46: 4045 case 46:
4088 case 47: 4046 case 47:
4089 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4090 break; 4048 break;
4091 case 48: // set bg color, ISO 8613-6
4092 if (nargs > i + 2 && arg[i + 1] == 5)
4093 {
4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
4105 }
4106 break;
4107 case 49: /* default bg */ 4049 case 49: /* default bg */
4108 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
4109 break; 4080 break;
4110 4081
4111 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
4112 4083
4113#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL

Diff Legend

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