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.575 by root, Thu Jun 30 16:56:41 2016 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 3 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
1016/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1017void 1019void
1018rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1019{ 1021{
1020 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1022 1024
1023 display->flush (); 1025 display->flush ();
1024} 1026}
1025 1027
1026void 1028void
… …
1277#endif 1279#endif
1278 1280
1279void 1281void
1280rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1281{ 1283{
1282 int button_number, key_state = 0; 1284 int button_number, state = 0;
1283 int x, y; 1285 int x, y;
1284 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1285 1287
1286 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1287 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1288 1290
1289 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1290 { 1292 {
1291 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1292 return; 1294 return;
1293 1295
1294 mouse_row = x; 1296 mouse_row = x;
1295 mouse_col = y; 1297 mouse_col = y;
1296 code += 32; 1298 state += 32;
1297 } 1299 }
1298 1300
1299 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1300 button_number = 3; 1302 button_number = 3;
1301 else 1303 else
1302 { 1304 {
1303 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1304 /* add 0x3D for wheel events, like xterm does */ 1306 if (button_number > 10)
1307 return;
1308 else if (button_number >= 7)
1309 button_number += 128 - 7;
1305 if (button_number >= 3) 1310 else if (button_number >= 3)
1306 button_number += 64 - 3; 1311 button_number += 64 - 3;
1307 } 1312 }
1308 1313
1309 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1310 { 1315 {
1311 /* 1316 /*
1312 * do not report ButtonRelease 1317 * do not report ButtonRelease
1313 * no state info allowed 1318 * no state info allowed
1314 */ 1319 */
1315 key_state = 0; 1320 if (release)
1316 if (button_number == 3)
1317 return; 1321 return;
1318 } 1322 }
1319 else 1323 else
1320 { 1324 {
1321 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1327 * 8 = Meta
1324 * 16 = Control 1328 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1330 * 32 = Double Click
1327 */ 1331 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1337#endif
1334 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1335 1341
1336#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1344 if (state & 16)
1339 fputc ('C', stderr); 1345 fputc ('C', stderr);
1340 if (key_state & 4) 1346 if (state & 4)
1341 fputc ('S', stderr); 1347 fputc ('S', stderr);
1342 if (key_state & 8) 1348 if (state & 8)
1343 fputc ('A', stderr); 1349 fputc ('A', stderr);
1344 if (key_state & 32) 1350 if (state & 32)
1345 fputc ('2', stderr); 1351 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1353 button_number,
1348 x, 1354 x,
1349 y); 1355 y);
1350#endif 1356#endif
1351 1357
1352#if ENABLE_FRILLS 1358#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1359 if (priv_modes & PrivMode_ExtMouseSGR)
1360 tt_printf ("\033[<%d;%d;%d%c",
1361 button_number + state,
1362 x,
1363 y,
1364 release ? 'm' : 'M');
1365 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1366 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1367 code,
1356 x, 1368 x,
1357 y); 1369 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1370 else if (priv_modes & PrivMode_ExtMouseUTF8)
1371 if (code < 128)
1359 tt_printf ("\033[M%c%lc%lc", 1372 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1373 code,
1361 wint_t (32 + x), 1374 wint_t (32 + x),
1362 wint_t (32 + y)); 1375 wint_t (32 + y));
1376 else
1377 tt_printf ("\033[M%c%c%lc%lc",
1378 0xc0 + (code >> 6),
1379 0x80 + (code & 0x3f),
1380 wint_t (32 + x),
1381 wint_t (32 + y));
1363 else 1382 else
1364#endif 1383#endif
1365 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1385 code,
1367 32 + x, 1386 32 + x,
1368 32 + y); 1387 32 + y);
1369} 1388}
1370 1389
1371/*{{{ process an X event */ 1390/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1502 ;
1484 1503
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1504 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1505
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change) 1506 if (want_position_change)
1498 { 1507 {
1499 int x, y; 1508 int x, y;
1500 1509
1501 if (ev.xconfigure.send_event) 1510 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1518 if (x != parent_x || y != parent_y)
1510 { 1519 {
1511 parent_x = x; 1520 parent_x = x;
1512 parent_y = y; 1521 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 } 1523 }
1516 } 1524 }
1517 1525
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1527 {
1520 seen_resize = 1; 1528 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1530 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1531
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1533 }
1533 break; 1534 break;
1534 1535
… …
1543 case SelectionRequest: 1544 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1545 break; 1546 break;
1546 1547
1547 case MapNotify: 1548 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1559 mapped = 1; 1549 mapped = 1;
1560#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1551 text_blink_ev.start ();
1562#endif 1552#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1848 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1859 } 1849 }
1860#endif 1850#endif
1861} 1851}
1862 1852
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1853#if ENABLE_PERL
1864void ecb_hot 1854void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1856{
1867 make_current (); 1857 make_current ();
1868 1858
… …
1878 * use the property to determine the pixmap. We use it later on. 1868 * use the property to determine the pixmap. We use it later on.
1879 */ 1869 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1872 {
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)); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1874 }
1892 1875
1893 break; 1876 break;
1894 } 1877 }
… …
2175 2158
2176 if (reportmode) 2159 if (reportmode)
2177 { 2160 {
2178 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2179 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2180 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2181 return; 2164 return;
2182#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2183 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2184 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2185 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2186 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2187 > multiClickTime / 2))) 2170 > multiClickTime / 2)))
2188 { 2171 {
2189 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2190 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2191 mouse_report (ev); 2174 mouse_report (ev);
2192 } 2175 }
2193#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2194 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2195 mouse_report (ev);
2196#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2197 return; 2181 return;
2198 } 2182 }
2199 2183
2200 /* 2184 /*
… …
2386 } 2370 }
2387} 2371}
2388 2372
2389// read the next character 2373// read the next character
2390wchar_t ecb_hot 2374wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2392{ 2376{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2378 {
2395 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2398 2382
2399 wchar_t wc; 2383 wchar_t wc;
2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2384 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2401 2385
… …
2422 return NOCHAR; 2406 return NOCHAR;
2423} 2407}
2424 2408
2425// read the next octet 2409// read the next octet
2426uint32_t ecb_hot 2410uint32_t ecb_hot
2427rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2428{ 2412{
2429 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2430 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2431 : NOCHAR; 2415 : NOCHAR;
2432} 2416}
2433 2417
2434static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2435 2419
2436wchar_t ecb_hot 2420wchar_t ecb_hot
2437rxvt_term::cmd_getc () THROW ((class out_of_input)) 2421rxvt_term::cmd_getc ()
2438{ 2422{
2439 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2440 2424
2441 if (c == NOCHAR) 2425 if (c == NOCHAR)
2442 throw out_of_input; 2426 throw out_of_input;
2443 2427
2444 return c; 2428 return c;
2445} 2429}
2446 2430
2447uint32_t ecb_hot 2431uint32_t ecb_hot
2448rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2449{ 2433{
2450 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2451 2435
2452 if (c == NOCHAR) 2436 if (c == NOCHAR)
2453 throw out_of_input; 2437 throw out_of_input;
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2712 }
2729 break; 2713 break;
2730 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2718 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2721 break;
2722#endif
2737 2723
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2726 scr_set_tab (1);
2741 break; 2727 break;
… …
2899 break; 2885 break;
2900 2886
2901 case '?': 2887 case '?':
2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2903 process_terminal_mode (ch, priv, nargs, arg); 2889 process_terminal_mode (ch, priv, nargs, arg);
2890 if (prev_ch == '$' && ch == 'p')
2891 process_terminal_mode (ch, priv, nargs, arg);
2904 break; 2892 break;
2905 2893
2906 case '!': 2894 case '!':
2907 if (ch == CSI_70) 2895 if (ch == CSI_70)
2908 { 2896 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset (); 2898 scr_soft_reset ();
2911 2899
2912 static const int pm_h[] = { 7, 25 }; 2900 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 }; 2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2914 2902
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2903 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2917 } 2905 }
2918 break; 2906 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2938 break;
2951 2939
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2942#ifdef ISO6429
2955 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2946#endif
… …
3049 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
3050 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
3051 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3052 break; 3040 break;
3053 case 8: /* unofficial extension */ 3041 case 8: /* unofficial extension */
3042 {
3043 string_term st;
3044 st.v[0] = CHAR_ST;
3045 st.v[1] = '\0';
3054 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3055 break; 3047 break;
3048 }
3056 } 3049 }
3057 break; 3050 break;
3058 3051
3059 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3060 switch (arg[0]) 3053 switch (arg[0])
… …
3245/* 3238/*
3246 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3247 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3248 */ 3241 */
3249char * 3242char *
3250rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3251{ 3244{
3252 unicode_t ch; 3245 unicode_t ch;
3253 bool seen_esc = false; 3246 bool seen_esc = false;
3254 unsigned int n = 0; 3247 unsigned int n = 0;
3255 wchar_t string[CBUFSIZ]; 3248 wchar_t string[CBUFSIZ];
… …
3284 string[n++] = ch; 3277 string[n++] = ch;
3285 } 3278 }
3286 3279
3287 string[n++] = '\0'; 3280 string[n++] = '\0';
3288 3281
3289 ends_how = (ch == 0x5c ? C0_ESC : ch); 3282 n = 0;
3283 if (ch == 0x5c)
3284 st.v[n++] = C0_ESC;
3285 st.v[n++] = ch;
3286 st.v[n] = '\0';
3290 3287
3291 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3292} 3289}
3293 3290
3294/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3300{ 3297{
3301 /* 3298 /*
3302 * Not handled yet 3299 * Not handled yet
3303 */ 3300 */
3304 3301
3305 unicode_t eh; 3302 string_term st;
3306 char *s = get_to_st (eh); 3303 char *s = get_to_st (st);
3307 if (s) 3304 if (s)
3308 free (s); 3305 free (s);
3309 3306
3310 return; 3307 return;
3311} 3308}
… …
3323 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3324 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3325 3322
3326 if (ch == ';') 3323 if (ch == ';')
3327 { 3324 {
3328 unicode_t eh; 3325 string_term st;
3329 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3330 3327
3331 if (s) 3328 if (s)
3332 { 3329 {
3333 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3334 free (s); 3331 free (s);
3335 } 3332 }
3336 } 3333 }
3337} 3334}
3338 3335
… …
3350 idx_b; 3347 idx_b;
3351} 3348}
3352 3349
3353/* 3350/*
3354 * Find the nearest color slot in the hidden color cube, 3351 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color. 3352 * adapt its value to the 32bit RGBA color.
3356 */ 3353 */
3357unsigned int 3354unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) 3355rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{ 3356{
3360 r &= 0xff; 3357 r &= 0xff;
3361 g &= 0xff; 3358 g &= 0xff;
3362 b &= 0xff; 3359 b &= 0xff;
3360 a &= 0xff;
3363 3361
3364 unsigned int color = (r << 16) | (g << 8) | b; 3362 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1));
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1));
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1));
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369 3363
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */ 3364 /* we allow one of the 6 closest neighbouring colours */
3374 /* to replace the current color, if they not used recently */ 3365 /* to replace the current color, if they not used recently */
3366 #if 0
3375 static const signed char dxyz[][3] = { 3367 static const unsigned char dxyz[][3] = {
3376 0, 0, 0, 3368 0, 0, 0,
3377 0, 0, +1, 3369 0, 0, 4,
3378 0, 0, -1, 3370 0, 4, 4,
3371 4, 4, 0,
3372 4, 0, 4,
3379 0, +1, 0, 3373 0, 4, 0,
3380 0, -1, 0,
3381 +1, 0, 0, 3374 4, 0, 0,
3382 -1, 0, 0,
3383 }; 3375 };
3376 #else
3377 // silly compressed verlapping triplets version of above
3378 static const unsigned char dxyz[] = {
3379 0, 0, 0, 4, 4, 0, 4, 0, 0,
3380 };
3381 #endif
3384 3382
3383 static const unsigned char color_level[8][32] = {
3384 // neighbour index
3385 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3386 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3387 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3388 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3389 // Red_levels/Green_levels/Blue_levels index
3390 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3391 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3392 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3393 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3394 };
3395
3396 unsigned int idx;
3397
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3398 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3386 { 3399 {
3387 int r = idx_r + dxyz[n][0]; 3400 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3388 int g = idx_r + dxyz[n][1]; 3401 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3389 int b = idx_r + dxyz[n][2]; 3402 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels))
3392 continue;
3393
3394 if (!IN_RANGE_EXC (g, 0, Green_levels))
3395 continue;
3396
3397 if (!IN_RANGE_EXC (b, 0, Blue_levels))
3398 continue;
3399
3400 unsigned int index = colorcube_index (r, g, b); 3403 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3404
3405 if (n == 0)
3406 idx = index;
3407
3408 if (rgb24_color[index] == color)
3409 {
3410 rgb24_seqno[index] = ++rgb24_sequence;
3411 return index + minTermCOLOR24;
3412 }
3401 3413
3402 // minor issue: could update index 0 few more times 3414 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0) 3415 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 { 3416 {
3405 idx = index; 3417 idx = index;
3406 goto update; 3418 goto update;
3407 } 3419 }
3408 3420
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3421 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough 3422 // but also handles wrap around values well enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3423 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3415 idx = index; 3424 idx = index;
3416 } 3425 }
3417 3426
3418update: 3427update:
3419 rgb24_color[idx] = color; 3428 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence; 3429 rgb24_seqno[idx] = ++rgb24_sequence;
3421 3430
3422 idx += minTermCOLOR24; 3431 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this); 3432 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101)); 3433 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3425 update_fade_color (idx, false); 3434 update_fade_color (idx, false);
3426 3435
3427 return idx; 3436 return idx;
3428} 3437}
3429 3438
3430void 3439void
3431rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3440rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3432{ 3441{
3433 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3434 { 3443 {
3435 rgba c; 3444 rgba c;
3436 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3437 3447
3438#if XFT 3448#if XFT
3439 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3440 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp); 3450 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3441 else 3451 else
3442#endif 3452#endif
3443 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3453 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3454
3455 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3456 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3457 else
3458 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3444 } 3459 }
3445 else 3460 else
3446 set_window_color (color, str); 3461 set_window_color (color, str);
3447} 3462}
3448 3463
3449/* 3464/*
3450 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3451 */ 3466 */
3452void 3467void
3453rxvt_term::process_xterm_seq (int op, char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3454{ 3469{
3455 int color; 3470 int color;
3456 char *buf, *name; 3471 char *buf, *name;
3457 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3458 int saveop = op; 3473 int saveop = op;
… …
3493 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3494 && actual_type != None 3509 && actual_type != None
3495 && actual_format == 8) 3510 && actual_format == 8)
3496 str = (const char *)(value); 3511 str = (const char *)(value);
3497 3512
3498 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3499 3514
3500 XFree (value); 3515 XFree (value);
3501 } 3516 }
3502 else 3517 else
3503 { 3518 {
… …
3527 break; 3542 break;
3528 3543
3529 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3530 *buf++ = '\0'; 3545 *buf++ = '\0';
3531 3546
3532 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3533 } 3548 }
3534 break; 3549 break;
3535 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3536 case XTerm_Color00: 3551 case XTerm_Color00:
3537 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3538 break; 3553 break;
3539 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3540 case XTerm_Color01: 3555 case XTerm_Color01:
3541 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3542 break; 3557 break;
3543#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3544 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3545 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3546 break; 3561 break;
3547#endif 3562#endif
3548 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3549 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3550 break; 3565 break;
3551 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3552 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3553 break; 3568 break;
3554#ifdef OPTION_HC 3569#ifdef OPTION_HC
3555 case XTerm_Color_HC: 3570 case XTerm_Color_HC:
3556 process_color_seq (op, Color_HC, str, resp); 3571 process_color_seq (op, Color_HC, str, st);
3557 break; 3572 break;
3558 case XTerm_Color_HTC: 3573 case XTerm_Color_HTC:
3559 process_color_seq (op, Color_HTC, str, resp); 3574 process_color_seq (op, Color_HTC, str, st);
3560 break; 3575 break;
3561#endif 3576#endif
3562#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3563 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3564 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3565 break; 3580 break;
3566 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3567 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3568 break; 3583 break;
3569 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3570 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3571 break; 3586 break;
3572#endif 3587#endif
3573 case URxvt_Color_border: 3588 case URxvt_Color_border:
3574 process_color_seq (op, Color_border, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3575 break; 3590 break;
3576
3577#if BG_IMAGE_FROM_ROOT
3578 case URxvt_Color_tint:
3579 process_color_seq (op, Color_tint, str, resp);
3580 {
3581 bool changed = false;
3582
3583 if (ISSET_PIXCOLOR (Color_tint))
3584 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3585
3586 if (changed)
3587 update_background ();
3588 }
3589
3590 break;
3591#endif
3592
3593#if BG_IMAGE_FROM_FILE
3594 case Rxvt_Pixmap:
3595 if (!strcmp (str, "?"))
3596 {
3597 char str[256];
3598 int h_scale = fimage.h_scale;
3599 int v_scale = fimage.v_scale;
3600 int h_align = fimage.h_align;
3601 int v_align = fimage.v_align;
3602
3603 sprintf (str, "[%dx%d+%d+%d]",
3604 h_scale, v_scale,
3605 h_align, v_align);
3606 process_xterm_seq (XTerm_title, str, CHAR_ST);
3607 }
3608 else
3609 {
3610 bool changed = false;
3611
3612 if (*str != ';')
3613 {
3614 try
3615 {
3616 fimage.set_file_geometry (this, str);
3617 changed = true;
3618 }
3619 catch (const class rxvt_failure_exception &e)
3620 {
3621 }
3622 }
3623 else
3624 {
3625 str++;
3626 if (fimage.set_geometry (str, true))
3627 changed = true;
3628 }
3629
3630 if (changed)
3631 {
3632 if (bg_window_position_sensitive ())
3633 {
3634 int x, y;
3635 get_window_origin (x, y);
3636 parent_x = x;
3637 parent_y = y;
3638 }
3639 update_background ();
3640 }
3641 }
3642 break;
3643#endif
3644 3591
3645 case XTerm_logfile: 3592 case XTerm_logfile:
3646 // TODO, when secure mode? 3593 // TODO, when secure mode?
3647 break; 3594 break;
3648 3595
… …
3665 case URxvt_boldFont: 3612 case URxvt_boldFont:
3666 case URxvt_italicFont: 3613 case URxvt_italicFont:
3667 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3668#endif 3615#endif
3669 if (query) 3616 if (query)
3670 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3671 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3672 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3673 resp); 3620 st.v);
3674 else 3621 else
3675 { 3622 {
3676 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3677 3624
3678 res = strdup (str); 3625 res = strdup (str);
… …
3681 } 3628 }
3682 break; 3629 break;
3683 3630
3684 case URxvt_version: 3631 case URxvt_version:
3685 if (query) 3632 if (query)
3686 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3687 op, 3634 op,
3688 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3689 resp); 3636 st.v);
3690 break; 3637 break;
3691 3638
3692#if !ENABLE_MINIMAL 3639#if !ENABLE_MINIMAL
3640 case URxvt_cellinfo:
3641 if (query)
3642 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3643 fwidth, fheight, fbase,
3644 st.v);
3645 break;
3646
3693 case URxvt_locale: 3647 case URxvt_locale:
3694 if (query) 3648 if (query)
3695 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3649 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3696 else 3650 else
3697 { 3651 {
3698 set_locale (str); 3652 set_locale (str);
3699 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3700 init_xlocale (); 3654 init_xlocale ();
… …
3715 break; 3669 break;
3716#endif 3670#endif
3717 3671
3718#if ENABLE_PERL 3672#if ENABLE_PERL
3719 case URxvt_perl: 3673 case URxvt_perl:
3720 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3721 break; 3675 break;
3722#endif 3676#endif
3723 } 3677 }
3724} 3678}
3725/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3805 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3806 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3807 { 1003, PrivMode_MouseAnyEvent }, 3761 { 1003, PrivMode_MouseAnyEvent },
3808#if ENABLE_FRILLS 3762#if ENABLE_FRILLS
3809 { 1004, PrivMode_FocusEvent }, 3763 { 1004, PrivMode_FocusEvent },
3810 { 1005, PrivMode_ExtModeMouse }, 3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3811#endif 3766#endif
3812 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3813 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3814#if ENABLE_FRILLS 3769#if ENABLE_FRILLS
3815 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3816#endif 3771#endif
3817 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3818 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3819 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3820 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3821 // 1048 save and restore cursor, implemented in code 3776 // 1048 save and restore cursor, implemented in code
3822 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3777 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3823 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3824 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3825 }; 3782 };
3826 3783
3827 if (nargs == 0) 3784 if (nargs == 0)
3828 return; 3785 return;
3786
3787 // DECRQM
3788 if (mode == 'p')
3789 {
3790 int status = 0;
3791 if (nargs != 1)
3792 return;
3793
3794 for (j = 0; j < ecb_array_length (argtopriv); j++)
3795 if (argtopriv[j].argval == arg[0])
3796 {
3797 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3798 break;
3799 }
3800
3801 tt_printf ("\33[?%d;%d$y", arg[0], status);
3802 return;
3803 }
3829 3804
3830 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3831 if (mode == 'l') 3806 if (mode == 'l')
3832 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3833 else if (mode == 'h') 3808 else if (mode == 'h')
… …
4061 case 35: 4036 case 35:
4062 case 36: 4037 case 36:
4063 case 37: 4038 case 37:
4064 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4065 break; 4040 break;
4066 case 38: // set fg color, ISO 8613-6
4067 if (nargs > i + 2 && arg[i + 1] == 5)
4068 {
4069 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4070 i += 2;
4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int idx = map_rgb24_color (r, g, b);
4078 scr_color (idx, Color_fg);
4079 i += 4;
4080 }
4081 break;
4082 case 39: /* default fg */ 4041 case 39: /* default fg */
4083 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
4084 break; 4043 break;
4085 4044
4086 case 40: 4045 case 40:
… …
4091 case 45: 4050 case 45:
4092 case 46: 4051 case 46:
4093 case 47: 4052 case 47:
4094 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4095 break; 4054 break;
4096 case 48: // set bg color, ISO 8613-6
4097 if (nargs > i + 2 && arg[i + 1] == 5)
4098 {
4099 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4100 i += 2;
4101 }
4102 else if (nargs > i + 4 && arg[i + 1] == 2)
4103 {
4104 unsigned int r = arg[i + 2];
4105 unsigned int g = arg[i + 3];
4106 unsigned int b = arg[i + 4];
4107 unsigned int idx = map_rgb24_color (r, g, b);
4108 scr_color (idx, Color_bg);
4109 i += 4;
4110 }
4111 break;
4112 case 49: /* default bg */ 4055 case 49: /* default bg */
4113 scr_color (Color_bg, Color_bg); 4056 scr_color (Color_bg, Color_bg);
4057 break;
4058
4059 case 38: // set fg color, ISO 8613-6
4060 case 48: // set bg color, ISO 8613-6
4061 {
4062 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4063 unsigned int idx;
4064
4065 if (nargs > i + 2 && arg[i + 1] == 5)
4066 {
4067 idx = minCOLOR + arg[i + 2];
4068 i += 2;
4069
4070 scr_color (idx, fgbg);
4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int a = 0xff;
4078
4079 idx = map_rgb24_color (r, g, b, a);
4080
4081 i += 4;
4082
4083 scr_color (idx, fgbg);
4084 }
4085 }
4114 break; 4086 break;
4115 4087
4116 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
4117 4089
4118#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL

Diff Legend

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