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.601 by sf-exg, Sat May 6 06:47:29 2023 UTC

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

Diff Legend

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