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.580 by root, Thu Jun 30 17:22:54 2016 UTC vs.
Revision 1.600 by sf-exg, Sun Feb 19 08:48:42 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 /* 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));
… …
1858 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);
1859 } 1832 }
1860#endif 1833#endif
1861} 1834}
1862 1835
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1864void ecb_hot 1837void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1839{
1867 make_current (); 1840 make_current ();
1868 1841
… …
1878 * 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.
1879 */ 1852 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1855 {
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)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1857 }
1892 1858
1893 break; 1859 break;
1894 } 1860 }
… …
2185 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2186 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2187 > multiClickTime / 2))) 2153 > multiClickTime / 2)))
2188 { 2154 {
2189 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2190 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2191 mouse_report (ev); 2157 mouse_report (ev);
2192 } 2158 }
2193#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2194 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2195 mouse_report (ev); 2161 mouse_report (ev);
2196#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2197 return; 2163 return;
2198 } 2164 }
2199 2165
… …
2386 } 2352 }
2387} 2353}
2388 2354
2389// read the next character 2355// read the next character
2390wchar_t ecb_hot 2356wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2392{ 2358{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2360 {
2395 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2398 2364
2399 wchar_t wc; 2365 wchar_t wc;
2400 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);
2401 2367
… …
2422 return NOCHAR; 2388 return NOCHAR;
2423} 2389}
2424 2390
2425// read the next octet 2391// read the next octet
2426uint32_t ecb_hot 2392uint32_t ecb_hot
2427rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2428{ 2394{
2429 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2430 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2431 : NOCHAR; 2397 : NOCHAR;
2432} 2398}
2433 2399
2434static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2435 2401
2436wchar_t ecb_hot 2402wchar_t ecb_hot
2437rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2438{ 2404{
2439 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2440 2406
2441 if (c == NOCHAR) 2407 if (c == NOCHAR)
2442 throw out_of_input; 2408 throw out_of_input;
2443 2409
2444 return c; 2410 return c;
2445} 2411}
2446 2412
2447uint32_t ecb_hot 2413uint32_t ecb_hot
2448rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2449{ 2415{
2450 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2451 2417
2452 if (c == NOCHAR) 2418 if (c == NOCHAR)
2453 throw out_of_input; 2419 throw out_of_input;
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2694 }
2729 break; 2695 break;
2730 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2703 break;
2704#endif
2737 2705
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2708 scr_set_tab (1);
2741 break; 2709 break;
… …
2899 break; 2867 break;
2900 2868
2901 case '?': 2869 case '?':
2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2903 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);
2904 break; 2874 break;
2905 2875
2906 case '!': 2876 case '!':
2907 if (ch == CSI_70) 2877 if (ch == CSI_70)
2908 { 2878 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset (); 2880 scr_soft_reset ();
2911 2881
2912 static const int pm_h[] = { 7, 25 }; 2882 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 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2914 2884
2915 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);
2916 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);
2917 } 2887 }
2918 break; 2888 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2920 break;
2951 2921
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2924#ifdef ISO6429
2955 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2928#endif
… …
3049 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3050 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3051 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3052 break; 3022 break;
3053 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3024 {
3025 string_term st;
3026 st.v[0] = CHAR_ST;
3027 st.v[1] = '\0';
3054 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3028 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3055 break; 3029 break;
3030 }
3056 } 3031 }
3057 break; 3032 break;
3058 3033
3059 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3034 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3060 switch (arg[0]) 3035 switch (arg[0])
… …
3245/* 3220/*
3246 * get input up until STRING TERMINATOR (or BEL) 3221 * get input up until STRING TERMINATOR (or BEL)
3247 * ends_how is terminator used. returned input must be free()'d 3222 * ends_how is terminator used. returned input must be free()'d
3248 */ 3223 */
3249char * 3224char *
3250rxvt_term::get_to_st (unicode_t &ends_how) 3225rxvt_term::get_to_st (string_term &st)
3251{ 3226{
3252 unicode_t ch; 3227 unicode_t ch;
3253 bool seen_esc = false; 3228 bool seen_esc = false;
3254 unsigned int n = 0; 3229 unsigned int n = 0;
3255 wchar_t string[CBUFSIZ]; 3230 wchar_t string[CBUFSIZ];
… …
3284 string[n++] = ch; 3259 string[n++] = ch;
3285 } 3260 }
3286 3261
3287 string[n++] = '\0'; 3262 string[n++] = '\0';
3288 3263
3289 ends_how = (ch == 0x5c ? C0_ESC : ch); 3264 n = 0;
3265 if (ch == 0x5c)
3266 st.v[n++] = C0_ESC;
3267 st.v[n++] = ch;
3268 st.v[n] = '\0';
3290 3269
3291 return rxvt_wcstombs (string); 3270 return rxvt_wcstombs (string);
3292} 3271}
3293 3272
3294/*----------------------------------------------------------------------*/ 3273/*----------------------------------------------------------------------*/
… …
3300{ 3279{
3301 /* 3280 /*
3302 * Not handled yet 3281 * Not handled yet
3303 */ 3282 */
3304 3283
3305 unicode_t eh; 3284 string_term st;
3306 char *s = get_to_st (eh); 3285 char *s = get_to_st (st);
3307 if (s) 3286 if (s)
3308 free (s); 3287 free (s);
3309 3288
3310 return; 3289 return;
3311} 3290}
… …
3323 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3302 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3324 arg = arg * 10 + (ch - '0'); 3303 arg = arg * 10 + (ch - '0');
3325 3304
3326 if (ch == ';') 3305 if (ch == ';')
3327 { 3306 {
3328 unicode_t eh; 3307 string_term st;
3329 char *s = get_to_st (eh); 3308 char *s = get_to_st (st);
3330 3309
3331 if (s) 3310 if (s)
3332 { 3311 {
3333 process_xterm_seq (arg, s, eh); 3312 process_xterm_seq (arg, s, st);
3334 free (s); 3313 free (s);
3335 } 3314 }
3336 } 3315 }
3337} 3316}
3338 3317
… …
3362 b &= 0xff; 3341 b &= 0xff;
3363 a &= 0xff; 3342 a &= 0xff;
3364 3343
3365 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; 3344 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3366 3345
3367 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3368 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3369 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3370 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3371
3372 /* we allow one of the 6 directly neighbouring colours */ 3346 /* we allow one of the 6 closest neighbouring colours */
3373 /* to replace the current color, if they not used recently */ 3347 /* to replace the current color, if they not used recently */
3348 #if 0
3374 static const signed char dxyz[][3] = { 3349 static const unsigned char dxyz[][3] = {
3375 0, 0, 0, 3350 0, 0, 0,
3376 0, 0, +1, 3351 0, 0, 4,
3377 0, 0, -1, 3352 0, 4, 4,
3353 4, 4, 0,
3354 4, 0, 4,
3378 0, +1, 0, 3355 0, 4, 0,
3379 0, -1, 0,
3380 +1, 0, 0, 3356 4, 0, 0,
3381 -1, 0, 0,
3382 }; 3357 };
3358 #else
3359 // silly compressed verlapping triplets version of above
3360 static const unsigned char dxyz[] = {
3361 0, 0, 0, 4, 4, 0, 4, 0, 0,
3362 };
3363 #endif
3383 3364
3365 static const unsigned char color_level[8][32] = {
3366 // neighbour index
3367 {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},
3368 {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},
3369 {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},
3370 {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},
3371 // Red_levels/Green_levels/Blue_levels index
3372 {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},
3373 {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},
3374 {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},
3375 {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},
3376 };
3377
3378 unsigned int idx;
3379
3384 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3380 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3385 { 3381 {
3386 int r = idx_r + dxyz[n][0]; 3382 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3387 int g = idx_g + dxyz[n][1]; 3383 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3388 int b = idx_b + dxyz[n][2]; 3384 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3389
3390 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3391 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3392 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3393
3394 unsigned int index = colorcube_index (r, g, b); 3385 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3386
3387 if (n == 0)
3388 idx = index;
3395 3389
3396 if (rgb24_color[index] == color) 3390 if (rgb24_color[index] == color)
3397 { 3391 {
3398 rgb24_seqno[index] = ++rgb24_sequence; 3392 rgb24_seqno[index] = ++rgb24_sequence;
3399 return index + minTermCOLOR24; 3393 return index + minTermCOLOR24;
… …
3405 idx = index; 3399 idx = index;
3406 goto update; 3400 goto update;
3407 } 3401 }
3408 3402
3409 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3403 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3410 // but also handles wrap around values good enough 3404 // but also handles wrap around values well enough
3411 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3405 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3412 idx = index; 3406 idx = index;
3413 } 3407 }
3414 3408
3415update: 3409update:
3416 rgb24_color[idx] = color; 3410 rgb24_color[idx] = color;
… …
3423 3417
3424 return idx; 3418 return idx;
3425} 3419}
3426 3420
3427void 3421void
3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3422rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3429{ 3423{
3430 if (str[0] == '?' && !str[1]) 3424 if (str[0] == '?' && !str[1])
3431 { 3425 {
3432 rgba c; 3426 rgba c;
3433 pix_colors_focused[color].get (c); 3427 pix_colors_focused[color].get (c);
3428 char rgba_str[32];
3434 3429
3435#if XFT 3430#if XFT
3436 if (c.a != rgba::MAX_CC) 3431 if (c.a != rgba::MAX_CC)
3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp); 3432 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3438 else 3433 else
3439#endif 3434#endif
3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3435 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3436
3437 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3438 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3439 else
3440 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3441 } 3441 }
3442 else 3442 else
3443 set_window_color (color, str); 3443 set_window_color (color, str);
3444} 3444}
3445 3445
3446/* 3446/*
3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3448 */ 3448 */
3449void 3449void
3450rxvt_term::process_xterm_seq (int op, char *str, char resp) 3450rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3451{ 3451{
3452 int color; 3452 int color;
3453 char *buf, *name; 3453 char *buf, *name;
3454 bool query = str[0] == '?' && !str[1]; 3454 bool query = str[0] == '?' && !str[1];
3455 int saveop = op; 3455 int saveop = op;
… …
3490 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3491 && actual_type != None 3491 && actual_type != None
3492 && actual_format == 8) 3492 && actual_format == 8)
3493 str = (const char *)(value); 3493 str = (const char *)(value);
3494 3494
3495 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3495 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3496 3496
3497 XFree (value); 3497 XFree (value);
3498 } 3498 }
3499 else 3499 else
3500 { 3500 {
… …
3524 break; 3524 break;
3525 3525
3526 if ((buf = strchr (name, ';')) != NULL) 3526 if ((buf = strchr (name, ';')) != NULL)
3527 *buf++ = '\0'; 3527 *buf++ = '\0';
3528 3528
3529 process_color_seq (op, color, name, resp); 3529 process_color_seq (op, color, name, st);
3530 } 3530 }
3531 break; 3531 break;
3532 case Rxvt_restoreFG: 3532 case Rxvt_restoreFG:
3533 case XTerm_Color00: 3533 case XTerm_Color00:
3534 process_color_seq (op, Color_fg, str, resp); 3534 process_color_seq (op, Color_fg, str, st);
3535 break; 3535 break;
3536 case Rxvt_restoreBG: 3536 case Rxvt_restoreBG:
3537 case XTerm_Color01: 3537 case XTerm_Color01:
3538 process_color_seq (op, Color_bg, str, resp); 3538 process_color_seq (op, Color_bg, str, st);
3539 break; 3539 break;
3540#ifndef NO_CURSORCOLOR 3540#ifndef NO_CURSORCOLOR
3541 case XTerm_Color_cursor: 3541 case XTerm_Color_cursor:
3542 process_color_seq (op, Color_cursor, str, resp); 3542 process_color_seq (op, Color_cursor, str, st);
3543 break; 3543 break;
3544#endif 3544#endif
3545 case XTerm_Color_pointer_fg: 3545 case XTerm_Color_pointer_fg:
3546 process_color_seq (op, Color_pointer_fg, str, resp); 3546 process_color_seq (op, Color_pointer_fg, str, st);
3547 break; 3547 break;
3548 case XTerm_Color_pointer_bg: 3548 case XTerm_Color_pointer_bg:
3549 process_color_seq (op, Color_pointer_bg, str, resp); 3549 process_color_seq (op, Color_pointer_bg, str, st);
3550 break; 3550 break;
3551#ifdef OPTION_HC 3551#ifdef OPTION_HC
3552 case XTerm_Color_HC: 3552 case XTerm_Color_HC:
3553 process_color_seq (op, Color_HC, str, resp); 3553 process_color_seq (op, Color_HC, str, st);
3554 break; 3554 break;
3555 case XTerm_Color_HTC: 3555 case XTerm_Color_HTC:
3556 process_color_seq (op, Color_HTC, str, resp); 3556 process_color_seq (op, Color_HTC, str, st);
3557 break; 3557 break;
3558#endif 3558#endif
3559#ifndef NO_BOLD_UNDERLINE_REVERSE 3559#ifndef NO_BOLD_UNDERLINE_REVERSE
3560 case URxvt_Color_BD: 3560 case URxvt_Color_BD:
3561 process_color_seq (op, Color_BD, str, resp); 3561 process_color_seq (op, Color_BD, str, st);
3562 break; 3562 break;
3563 case URxvt_Color_UL: 3563 case URxvt_Color_UL:
3564 process_color_seq (op, Color_UL, str, resp); 3564 process_color_seq (op, Color_UL, str, st);
3565 break; 3565 break;
3566 case URxvt_Color_IT: 3566 case URxvt_Color_IT:
3567 process_color_seq (op, Color_IT, str, resp); 3567 process_color_seq (op, Color_IT, str, st);
3568 break; 3568 break;
3569#endif 3569#endif
3570 case URxvt_Color_border: 3570 case URxvt_Color_border:
3571 process_color_seq (op, Color_border, str, resp); 3571 process_color_seq (op, Color_border, str, st);
3572 break; 3572 break;
3573
3574#if BG_IMAGE_FROM_ROOT
3575 case URxvt_Color_tint:
3576 process_color_seq (op, Color_tint, str, resp);
3577 {
3578 bool changed = false;
3579
3580 if (ISSET_PIXCOLOR (Color_tint))
3581 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3582
3583 if (changed)
3584 update_background ();
3585 }
3586
3587 break;
3588#endif
3589
3590#if BG_IMAGE_FROM_FILE
3591 case Rxvt_Pixmap:
3592 if (!strcmp (str, "?"))
3593 {
3594 char str[256];
3595 int h_scale = fimage.h_scale;
3596 int v_scale = fimage.v_scale;
3597 int h_align = fimage.h_align;
3598 int v_align = fimage.v_align;
3599
3600 sprintf (str, "[%dx%d+%d+%d]",
3601 h_scale, v_scale,
3602 h_align, v_align);
3603 process_xterm_seq (XTerm_title, str, CHAR_ST);
3604 }
3605 else
3606 {
3607 bool changed = false;
3608
3609 if (*str != ';')
3610 {
3611 try
3612 {
3613 fimage.set_file_geometry (this, str);
3614 changed = true;
3615 }
3616 catch (const class rxvt_failure_exception &e)
3617 {
3618 }
3619 }
3620 else
3621 {
3622 str++;
3623 if (fimage.set_geometry (str, true))
3624 changed = true;
3625 }
3626
3627 if (changed)
3628 {
3629 if (bg_window_position_sensitive ())
3630 {
3631 int x, y;
3632 get_window_origin (x, y);
3633 parent_x = x;
3634 parent_y = y;
3635 }
3636 update_background ();
3637 }
3638 }
3639 break;
3640#endif
3641 3573
3642 case XTerm_logfile: 3574 case XTerm_logfile:
3643 // TODO, when secure mode? 3575 // TODO, when secure mode?
3644 break; 3576 break;
3645 3577
… …
3662 case URxvt_boldFont: 3594 case URxvt_boldFont:
3663 case URxvt_italicFont: 3595 case URxvt_italicFont:
3664 case URxvt_boldItalicFont: 3596 case URxvt_boldItalicFont:
3665#endif 3597#endif
3666 if (query) 3598 if (query)
3667 tt_printf ("\33]%d;%-.250s%c", saveop, 3599 tt_printf ("\33]%d;%-.250s%s", saveop,
3668 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3600 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3669 ? fontset[op - URxvt_font]->fontdesc : "", 3601 ? fontset[op - URxvt_font]->fontdesc : "",
3670 resp); 3602 st.v);
3671 else 3603 else
3672 { 3604 {
3673 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3605 const char *&res = rs[Rs_font + (op - URxvt_font)];
3674 3606
3675 res = strdup (str); 3607 res = strdup (str);
… …
3678 } 3610 }
3679 break; 3611 break;
3680 3612
3681 case URxvt_version: 3613 case URxvt_version:
3682 if (query) 3614 if (query)
3683 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3615 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3684 op, 3616 op,
3685 rs[Rs_name], VERSION[0], VERSION[2], 3617 rs[Rs_name], VERSION[0], VERSION[2],
3686 resp); 3618 st.v);
3687 break; 3619 break;
3688 3620
3689#if !ENABLE_MINIMAL 3621#if !ENABLE_MINIMAL
3622 case URxvt_cellinfo:
3623 if (query)
3624 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3625 fwidth, fheight, fbase,
3626 st.v);
3627 break;
3628
3690 case URxvt_locale: 3629 case URxvt_locale:
3691 if (query) 3630 if (query)
3692 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3631 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3693 else 3632 else
3694 { 3633 {
3695 set_locale (str); 3634 set_locale (str);
3696 pty->set_utf8_mode (enc_utf8); 3635 pty->set_utf8_mode (enc_utf8);
3697 init_xlocale (); 3636 init_xlocale ();
… …
3712 break; 3651 break;
3713#endif 3652#endif
3714 3653
3715#if ENABLE_PERL 3654#if ENABLE_PERL
3716 case URxvt_perl: 3655 case URxvt_perl:
3717 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3656 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3718 break; 3657 break;
3719#endif 3658#endif
3720 } 3659 }
3721} 3660}
3722/*----------------------------------------------------------------------*/ 3661/*----------------------------------------------------------------------*/
… …
3802 { 1000, PrivMode_MouseX11 }, 3741 { 1000, PrivMode_MouseX11 },
3803 { 1002, PrivMode_MouseBtnEvent }, 3742 { 1002, PrivMode_MouseBtnEvent },
3804 { 1003, PrivMode_MouseAnyEvent }, 3743 { 1003, PrivMode_MouseAnyEvent },
3805#if ENABLE_FRILLS 3744#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent }, 3745 { 1004, PrivMode_FocusEvent },
3807 { 1005, PrivMode_ExtModeMouse }, 3746 { 1005, PrivMode_ExtMouseUTF8 },
3747 { 1006, PrivMode_ExtMouseSGR },
3808#endif 3748#endif
3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3749 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3810 { 1011, PrivMode_Keypress }, // rxvt extension 3750 { 1011, PrivMode_Keypress }, // rxvt extension
3811#if ENABLE_FRILLS 3751#if ENABLE_FRILLS
3812 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3752 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3813#endif 3753#endif
3814 // 1035 enable modifiers for alt, numlock NYI 3754 // 1035 enable modifiers for alt, numlock NYI
3815 // 1036 send ESC for meta keys NYI 3755 // 1036 send ESC for meta keys NYI
3816 // 1037 send DEL for keypad delete NYI 3756 // 1037 send DEL for keypad delete NYI
3817 { 1047, PrivMode_Screen }, 3757 { 1047, PrivMode_Screen },
3818 // 1048 save and restore cursor, implemented in code 3758 // 1048 save and restore cursor, implemented in code
3819 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3759 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3820 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3760 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3761#if ENABLE_FRILLS
3821 { 2004, PrivMode_BracketPaste }, 3762 { 2004, PrivMode_BracketPaste },
3763#endif
3822 }; 3764 };
3823 3765
3824 if (nargs == 0) 3766 if (nargs == 0)
3825 return; 3767 return;
3768
3769 // DECRQM
3770 if (mode == 'p')
3771 {
3772 int status = 0;
3773 if (nargs != 1)
3774 return;
3775
3776 for (j = 0; j < ecb_array_length (argtopriv); j++)
3777 if (argtopriv[j].argval == arg[0])
3778 {
3779 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3780 break;
3781 }
3782
3783 tt_printf ("\33[?%d;%d$y", arg[0], status);
3784 return;
3785 }
3826 3786
3827 /* make lo/hi boolean */ 3787 /* make lo/hi boolean */
3828 if (mode == 'l') 3788 if (mode == 'l')
3829 mode = 0; /* reset */ 3789 mode = 0; /* reset */
3830 else if (mode == 'h') 3790 else if (mode == 'h')
… …
4081 case 38: // set fg color, ISO 8613-6 4041 case 38: // set fg color, ISO 8613-6
4082 case 48: // set bg color, ISO 8613-6 4042 case 48: // set bg color, ISO 8613-6
4083 { 4043 {
4084 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; 4044 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4085 unsigned int idx; 4045 unsigned int idx;
4086 4046
4087 if (nargs > i + 2 && arg[i + 1] == 5) 4047 if (nargs > i + 2 && arg[i + 1] == 5)
4088 { 4048 {
4089 idx = minCOLOR + arg[i + 2]; 4049 idx = minCOLOR + arg[i + 2];
4090 i += 2; 4050 i += 2;
4051
4052 scr_color (idx, fgbg);
4091 } 4053 }
4092 else if (nargs > i + 4 && arg[i + 1] == 2) 4054 else if (nargs > i + 4 && arg[i + 1] == 2)
4093 { 4055 {
4094 unsigned int r = arg[i + 2]; 4056 unsigned int r = arg[i + 2];
4095 unsigned int g = arg[i + 3]; 4057 unsigned int g = arg[i + 3];
… …
4097 unsigned int a = 0xff; 4059 unsigned int a = 0xff;
4098 4060
4099 idx = map_rgb24_color (r, g, b, a); 4061 idx = map_rgb24_color (r, g, b, a);
4100 4062
4101 i += 4; 4063 i += 4;
4064
4065 scr_color (idx, fgbg);
4102 } 4066 }
4103
4104 scr_color (idx, fgbg);
4105 } 4067 }
4106 break; 4068 break;
4107 4069
4108 //case 50: // not variable spacing 4070 //case 50: // not variable spacing
4109 4071

Diff Legend

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