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.598 by sf-exg, Sun Sep 18 20:32:17 2022 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
… …
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 /* add 0x3D for wheel events, like xterm does */
1305 if (button_number >= 3) 1301 if (button_number >= 3)
1306 button_number += 64 - 3; 1302 button_number += 64 - 3;
1307 }
1308 1303
1309 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1310 { 1305 {
1311 /* 1306 /*
1312 * do not report ButtonRelease 1307 * do not report ButtonRelease
1313 * no state info allowed 1308 * no state info allowed
1314 */ 1309 */
1315 key_state = 0; 1310 if (release)
1316 if (button_number == 3)
1317 return; 1311 return;
1318 } 1312 }
1319 else 1313 else
1320 { 1314 {
1321 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1317 * 8 = Meta
1324 * 16 = Control 1318 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1320 * 32 = Double Click
1327 */ 1321 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1327#endif
1334 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1335 1331
1336#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1334 if (state & 16)
1339 fputc ('C', stderr); 1335 fputc ('C', stderr);
1340 if (key_state & 4) 1336 if (state & 4)
1341 fputc ('S', stderr); 1337 fputc ('S', stderr);
1342 if (key_state & 8) 1338 if (state & 8)
1343 fputc ('A', stderr); 1339 fputc ('A', stderr);
1344 if (key_state & 32) 1340 if (state & 32)
1345 fputc ('2', stderr); 1341 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1343 button_number,
1348 x, 1344 x,
1349 y); 1345 y);
1350#endif 1346#endif
1351 1347
1352#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1357 code,
1356 x, 1358 x,
1357 y); 1359 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1359 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1362 code,
1361 wint_t (32 + x), 1363 wint_t (32 + x),
1362 wint_t (32 + y)); 1364 wint_t (32 + y));
1363 else 1365 else
1364#endif 1366#endif
1365 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1368 code,
1367 32 + x, 1369 32 + x,
1368 32 + y); 1370 32 + y);
1369} 1371}
1370 1372
1371/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1485 ;
1484 1486
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1488
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) 1489 if (want_position_change)
1498 { 1490 {
1499 int x, y; 1491 int x, y;
1500 1492
1501 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1510 { 1502 {
1511 parent_x = x; 1503 parent_x = x;
1512 parent_y = y; 1504 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 } 1506 }
1516 } 1507 }
1517 1508
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1510 {
1520 seen_resize = 1; 1511 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1513 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1514
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1516 }
1533 break; 1517 break;
1534 1518
… …
1543 case SelectionRequest: 1527 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1545 break; 1529 break;
1546 1530
1547 case MapNotify: 1531 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; 1532 mapped = 1;
1560#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1534 text_blink_ev.start ();
1562#endif 1535#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1787 } 1760 }
1788#endif 1761#endif
1789#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1791 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1792#endif 1768#endif
1793 1769
1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 } 1771 }
1796} 1772}
… …
1804 want_refresh = 1; 1780 want_refresh = 1;
1805 1781
1806#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1808 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1809#endif 1788#endif
1810#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf) 1790 if (iso14755buf)
1812 { 1791 {
1813 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1853 } 1832 }
1854#endif 1833#endif
1855} 1834}
1856 1835
1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1858void ecb_hot 1837void ecb_hot
1859rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1860{ 1839{
1861 make_current (); 1840 make_current ();
1862 1841
… …
1872 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1873 */ 1852 */
1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1876 { 1855 {
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)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1885 } 1857 }
1886 1858
1887 break; 1859 break;
1888 } 1860 }
… …
2179 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2180 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2181 > multiClickTime / 2))) 2153 > multiClickTime / 2)))
2182 { 2154 {
2183 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2184 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2185 mouse_report (ev); 2157 mouse_report (ev);
2186 } 2158 }
2187#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2188 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2189 mouse_report (ev); 2161 mouse_report (ev);
2190#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2191 return; 2163 return;
2192 } 2164 }
2193 2165
… …
2380 } 2352 }
2381} 2353}
2382 2354
2383// read the next character 2355// read the next character
2384wchar_t ecb_hot 2356wchar_t ecb_hot
2385rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2386{ 2358{
2387 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2388 { 2360 {
2389 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2391 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2392 2364
2393 wchar_t wc; 2365 wchar_t wc;
2394 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2395 2367
… …
2416 return NOCHAR; 2388 return NOCHAR;
2417} 2389}
2418 2390
2419// read the next octet 2391// read the next octet
2420uint32_t ecb_hot 2392uint32_t ecb_hot
2421rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2422{ 2394{
2423 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2424 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2425 : NOCHAR; 2397 : NOCHAR;
2426} 2398}
2427 2399
2428static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2429 2401
2430wchar_t ecb_hot 2402wchar_t ecb_hot
2431rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2432{ 2404{
2433 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2434 2406
2435 if (c == NOCHAR) 2407 if (c == NOCHAR)
2436 throw out_of_input; 2408 throw out_of_input;
2437 2409
2438 return c; 2410 return c;
2439} 2411}
2440 2412
2441uint32_t ecb_hot 2413uint32_t ecb_hot
2442rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2443{ 2415{
2444 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2445 2417
2446 if (c == NOCHAR) 2418 if (c == NOCHAR)
2447 throw out_of_input; 2419 throw out_of_input;
… …
2720 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2722 } 2694 }
2723 break; 2695 break;
2724 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2725 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2726 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2727 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2730 break; 2703 break;
2704#endif
2731 2705
2732 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2733 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2734 scr_set_tab (1); 2708 scr_set_tab (1);
2735 break; 2709 break;
… …
2893 break; 2867 break;
2894 2868
2895 case '?': 2869 case '?':
2896 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2897 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2898 break; 2874 break;
2899 2875
2900 case '!': 2876 case '!':
2901 if (ch == CSI_70) 2877 if (ch == CSI_70)
2902 { 2878 {
2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2904 scr_soft_reset (); 2880 scr_soft_reset ();
2905 2881
2906 static const int pm_h[] = { 7, 25 }; 2882 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 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2908 2884
2909 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2885 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); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2911 } 2887 }
2912 break; 2888 break;
… …
2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2943 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2944 break; 2920 break;
2945 2921
2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2948#ifdef ISO6429 2924#ifdef ISO6429
2949 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2950#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2951 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2952#endif 2928#endif
… …
3043 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3044 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3045 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3046 break; 3022 break;
3047 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3048 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
3049 break; 3025 break;
3050 } 3026 }
3051 break; 3027 break;
3052 3028
3053 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3328 free (s); 3304 free (s);
3329 } 3305 }
3330 } 3306 }
3331} 3307}
3332 3308
3309static unsigned int
3310colorcube_index (unsigned int idx_r,
3311 unsigned int idx_g,
3312 unsigned int idx_b)
3313{
3314 assert (idx_r < Red_levels);
3315 assert (idx_g < Green_levels);
3316 assert (idx_b < Blue_levels);
3317
3318 return idx_r * Blue_levels * Green_levels +
3319 idx_g * Blue_levels +
3320 idx_b;
3321}
3322
3323/*
3324 * Find the nearest color slot in the hidden color cube,
3325 * adapt its value to the 32bit RGBA color.
3326 */
3327unsigned int
3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3329{
3330 r &= 0xff;
3331 g &= 0xff;
3332 b &= 0xff;
3333 a &= 0xff;
3334
3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3336
3337 /* we allow one of the 6 closest neighbouring colours */
3338 /* to replace the current color, if they not used recently */
3339 #if 0
3340 static const unsigned char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, 4,
3343 0, 4, 4,
3344 4, 4, 0,
3345 4, 0, 4,
3346 0, 4, 0,
3347 4, 0, 0,
3348 };
3349 #else
3350 // silly compressed verlapping triplets version of above
3351 static const unsigned char dxyz[] = {
3352 0, 0, 0, 4, 4, 0, 4, 0, 0,
3353 };
3354 #endif
3355
3356 static const unsigned char color_level[8][32] = {
3357 // neighbour index
3358 {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},
3359 {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},
3360 {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},
3361 {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},
3362 // Red_levels/Green_levels/Blue_levels index
3363 {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},
3364 {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},
3365 {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},
3366 {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},
3367 };
3368
3369 unsigned int idx;
3370
3371 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3372 {
3373 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3374 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3375 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3376 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3377
3378 if (n == 0)
3379 idx = index;
3380
3381 if (rgb24_color[index] == color)
3382 {
3383 rgb24_seqno[index] = ++rgb24_sequence;
3384 return index + minTermCOLOR24;
3385 }
3386
3387 // minor issue: could update index 0 few more times
3388 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3389 {
3390 idx = index;
3391 goto update;
3392 }
3393
3394 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3395 // but also handles wrap around values well enough
3396 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3397 idx = index;
3398 }
3399
3400update:
3401 rgb24_color[idx] = color;
3402 rgb24_seqno[idx] = ++rgb24_sequence;
3403
3404 idx += minTermCOLOR24;
3405 pix_colors_focused [idx].free (this);
3406 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3407 update_fade_color (idx, false);
3408
3409 return idx;
3410}
3411
3333void 3412void
3334rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3413rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3335{ 3414{
3336 if (str[0] == '?' && !str[1]) 3415 if (str[0] == '?' && !str[1])
3337 { 3416 {
3338 rgba c; 3417 rgba c;
3339 pix_colors_focused[color].get (c); 3418 pix_colors_focused[color].get (c);
3419 char rgba_str[32];
3340 3420
3341#if XFT 3421#if XFT
3342 if (c.a != rgba::MAX_CC) 3422 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); 3423 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3344 else 3424 else
3345#endif 3425#endif
3346 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3426 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3427
3428 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3429 tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp);
3430 else
3431 tt_printf ("\033]%d;%s%c", report, rgba_str, resp);
3347 } 3432 }
3348 else 3433 else
3349 set_window_color (color, str); 3434 set_window_color (color, str);
3350} 3435}
3351 3436
… …
3475#endif 3560#endif
3476 case URxvt_Color_border: 3561 case URxvt_Color_border:
3477 process_color_seq (op, Color_border, str, resp); 3562 process_color_seq (op, Color_border, str, resp);
3478 break; 3563 break;
3479 3564
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
3548 case XTerm_logfile: 3565 case XTerm_logfile:
3549 // TODO, when secure mode? 3566 // TODO, when secure mode?
3550 break; 3567 break;
3551 3568
3552#if 0 3569#if 0
… …
3591 rs[Rs_name], VERSION[0], VERSION[2], 3608 rs[Rs_name], VERSION[0], VERSION[2],
3592 resp); 3609 resp);
3593 break; 3610 break;
3594 3611
3595#if !ENABLE_MINIMAL 3612#if !ENABLE_MINIMAL
3613 case URxvt_cellinfo:
3614 if (query)
3615 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3616 fwidth, fheight, fbase,
3617 resp);
3618 break;
3619
3596 case URxvt_locale: 3620 case URxvt_locale:
3597 if (query) 3621 if (query)
3598 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3622 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3599 else 3623 else
3600 { 3624 {
… …
3707#endif 3731#endif
3708 { 1000, PrivMode_MouseX11 }, 3732 { 1000, PrivMode_MouseX11 },
3709 { 1002, PrivMode_MouseBtnEvent }, 3733 { 1002, PrivMode_MouseBtnEvent },
3710 { 1003, PrivMode_MouseAnyEvent }, 3734 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS 3735#if ENABLE_FRILLS
3736 { 1004, PrivMode_FocusEvent },
3712 { 1005, PrivMode_ExtModeMouse }, 3737 { 1005, PrivMode_ExtMouseUTF8 },
3738 { 1006, PrivMode_ExtMouseSGR },
3713#endif 3739#endif
3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3740 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715 { 1011, PrivMode_Keypress }, // rxvt extension 3741 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS 3742#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3743 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3718#endif 3744#endif
3719 // 1035 enable modifiers for alt, numlock NYI 3745 // 1035 enable modifiers for alt, numlock NYI
3720 // 1036 send ESC for meta keys NYI 3746 // 1036 send ESC for meta keys NYI
3721 // 1037 send DEL for keypad delete NYI 3747 // 1037 send DEL for keypad delete NYI
3722 { 1047, PrivMode_Screen }, 3748 { 1047, PrivMode_Screen },
3723 // 1048 save and restore cursor, implemented in code 3749 // 1048 save and restore cursor, implemented in code
3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3750 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3751 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3752#if ENABLE_FRILLS
3726 { 2004, PrivMode_BracketPaste }, 3753 { 2004, PrivMode_BracketPaste },
3754#endif
3727 }; 3755 };
3728 3756
3729 if (nargs == 0) 3757 if (nargs == 0)
3730 return; 3758 return;
3759
3760 // DECRQM
3761 if (mode == 'p')
3762 {
3763 int status = 0;
3764 if (nargs != 1)
3765 return;
3766
3767 for (j = 0; j < ecb_array_length (argtopriv); j++)
3768 if (argtopriv[j].argval == arg[0])
3769 {
3770 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3771 break;
3772 }
3773
3774 tt_printf ("\33[?%d;%d$y", arg[0], status);
3775 return;
3776 }
3731 3777
3732 /* make lo/hi boolean */ 3778 /* make lo/hi boolean */
3733 if (mode == 'l') 3779 if (mode == 'l')
3734 mode = 0; /* reset */ 3780 mode = 0; /* reset */
3735 else if (mode == 'h') 3781 else if (mode == 'h')
… …
3963 case 35: 4009 case 35:
3964 case 36: 4010 case 36:
3965 case 37: 4011 case 37:
3966 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4012 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3967 break; 4013 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 */ 4014 case 39: /* default fg */
3976 scr_color (Color_fg, Color_fg); 4015 scr_color (Color_fg, Color_fg);
3977 break; 4016 break;
3978 4017
3979 case 40: 4018 case 40:
… …
3984 case 45: 4023 case 45:
3985 case 46: 4024 case 46:
3986 case 47: 4025 case 47:
3987 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4026 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3988 break; 4027 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 */ 4028 case 49: /* default bg */
3997 scr_color (Color_bg, Color_bg); 4029 scr_color (Color_bg, Color_bg);
4030 break;
4031
4032 case 38: // set fg color, ISO 8613-6
4033 case 48: // set bg color, ISO 8613-6
4034 {
4035 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4036 unsigned int idx;
4037
4038 if (nargs > i + 2 && arg[i + 1] == 5)
4039 {
4040 idx = minCOLOR + arg[i + 2];
4041 i += 2;
4042
4043 scr_color (idx, fgbg);
4044 }
4045 else if (nargs > i + 4 && arg[i + 1] == 2)
4046 {
4047 unsigned int r = arg[i + 2];
4048 unsigned int g = arg[i + 3];
4049 unsigned int b = arg[i + 4];
4050 unsigned int a = 0xff;
4051
4052 idx = map_rgb24_color (r, g, b, a);
4053
4054 i += 4;
4055
4056 scr_color (idx, fgbg);
4057 }
4058 }
3998 break; 4059 break;
3999 4060
4000 //case 50: // not variable spacing 4061 //case 50: // not variable spacing
4001 4062
4002#if !ENABLE_MINIMAL 4063#if !ENABLE_MINIMAL

Diff Legend

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