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.584 by root, Sun Jul 7 08:02:15 2019 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 */
… …
2139 2158
2140 if (reportmode) 2159 if (reportmode)
2141 { 2160 {
2142 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2145 return; 2164 return;
2146#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2147 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2148 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2149 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2150 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2151 > multiClickTime / 2))) 2170 > multiClickTime / 2)))
2152 { 2171 {
2153 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2154 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2155 mouse_report (ev); 2174 mouse_report (ev);
2156 } 2175 }
2157#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2158 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2159 mouse_report (ev);
2160#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2161 return; 2181 return;
2162 } 2182 }
2163 2183
2164 /* 2184 /*
… …
2350 } 2370 }
2351} 2371}
2352 2372
2353// read the next character 2373// read the next character
2354wchar_t ecb_hot 2374wchar_t ecb_hot
2355rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2356{ 2376{
2357 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2358 { 2378 {
2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX) 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f)) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
… …
2386 return NOCHAR; 2406 return NOCHAR;
2387} 2407}
2388 2408
2389// read the next octet 2409// read the next octet
2390uint32_t ecb_hot 2410uint32_t ecb_hot
2391rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2392{ 2412{
2393 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2394 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2395 : NOCHAR; 2415 : NOCHAR;
2396} 2416}
2397 2417
2398static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2399 2419
2400wchar_t ecb_hot 2420wchar_t ecb_hot
2401rxvt_term::cmd_getc () THROW ((class out_of_input)) 2421rxvt_term::cmd_getc ()
2402{ 2422{
2403 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2404 2424
2405 if (c == NOCHAR) 2425 if (c == NOCHAR)
2406 throw out_of_input; 2426 throw out_of_input;
2407 2427
2408 return c; 2428 return c;
2409} 2429}
2410 2430
2411uint32_t ecb_hot 2431uint32_t ecb_hot
2412rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2413{ 2433{
2414 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2415 2435
2416 if (c == NOCHAR) 2436 if (c == NOCHAR)
2417 throw out_of_input; 2437 throw out_of_input;
… …
2690 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2692 } 2712 }
2693 break; 2713 break;
2694 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2695 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2696 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2697 // used by original rxvt for rob nations own graphics mode 2718 // used by original rxvt for rob nations own graphics mode
2698 if (cmd_getc () == 'Q' && option (Opt_insecure)) 2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2700 break; 2721 break;
2722#endif
2701 2723
2702 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2703 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2704 scr_set_tab (1); 2726 scr_set_tab (1);
2705 break; 2727 break;
… …
2863 break; 2885 break;
2864 2886
2865 case '?': 2887 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 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);
2868 break; 2892 break;
2869 2893
2870 case '!': 2894 case '!':
2871 if (ch == CSI_70) 2895 if (ch == CSI_70)
2872 { 2896 {
2873 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2874 scr_soft_reset (); 2898 scr_soft_reset ();
2875 2899
2876 static const int pm_h[] = { 7, 25 }; 2900 static const int pm_h[] = { 7, 25 };
2877 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 };
2878 2902
2879 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);
2880 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);
2881 } 2905 }
2882 break; 2906 break;
… …
3013 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
3014 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
3015 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3016 break; 3040 break;
3017 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';
3018 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3019 break; 3047 break;
3048 }
3020 } 3049 }
3021 break; 3050 break;
3022 3051
3023 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3024 switch (arg[0]) 3053 switch (arg[0])
… …
3209/* 3238/*
3210 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3211 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3212 */ 3241 */
3213char * 3242char *
3214rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3215{ 3244{
3216 unicode_t ch; 3245 unicode_t ch;
3217 bool seen_esc = false; 3246 bool seen_esc = false;
3218 unsigned int n = 0; 3247 unsigned int n = 0;
3219 wchar_t string[CBUFSIZ]; 3248 wchar_t string[CBUFSIZ];
… …
3248 string[n++] = ch; 3277 string[n++] = ch;
3249 } 3278 }
3250 3279
3251 string[n++] = '\0'; 3280 string[n++] = '\0';
3252 3281
3253 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';
3254 3287
3255 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3256} 3289}
3257 3290
3258/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3264{ 3297{
3265 /* 3298 /*
3266 * Not handled yet 3299 * Not handled yet
3267 */ 3300 */
3268 3301
3269 unicode_t eh; 3302 string_term st;
3270 char *s = get_to_st (eh); 3303 char *s = get_to_st (st);
3271 if (s) 3304 if (s)
3272 free (s); 3305 free (s);
3273 3306
3274 return; 3307 return;
3275} 3308}
… …
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3289 3322
3290 if (ch == ';') 3323 if (ch == ';')
3291 { 3324 {
3292 unicode_t eh; 3325 string_term st;
3293 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3294 3327
3295 if (s) 3328 if (s)
3296 { 3329 {
3297 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3298 free (s); 3331 free (s);
3299 } 3332 }
3300 } 3333 }
3301} 3334}
3302 3335
… …
3326 b &= 0xff; 3359 b &= 0xff;
3327 a &= 0xff; 3360 a &= 0xff;
3328 3361
3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; 3362 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330 3363
3331 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3332 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3333 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3334 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3335
3336 /* we allow one of the 6 directly neighbouring colours */ 3364 /* we allow one of the 6 closest neighbouring colours */
3337 /* to replace the current color, if they not used recently */ 3365 /* to replace the current color, if they not used recently */
3366 #if 0
3338 static const signed char dxyz[][3] = { 3367 static const unsigned char dxyz[][3] = {
3339 0, 0, 0, 3368 0, 0, 0,
3340 0, 0, +1, 3369 0, 0, 4,
3341 0, 0, -1, 3370 0, 4, 4,
3371 4, 4, 0,
3372 4, 0, 4,
3342 0, +1, 0, 3373 0, 4, 0,
3343 0, -1, 0,
3344 +1, 0, 0, 3374 4, 0, 0,
3345 -1, 0, 0,
3346 }; 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
3347 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
3348 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3398 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3349 { 3399 {
3350 int r = idx_r + dxyz[n][0]; 3400 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3351 int g = idx_g + dxyz[n][1]; 3401 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3352 int b = idx_b + dxyz[n][2]; 3402 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3353
3354 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3355 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3356 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3357
3358 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;
3359 3407
3360 if (rgb24_color[index] == color) 3408 if (rgb24_color[index] == color)
3361 { 3409 {
3362 rgb24_seqno[index] = ++rgb24_sequence; 3410 rgb24_seqno[index] = ++rgb24_sequence;
3363 return index + minTermCOLOR24; 3411 return index + minTermCOLOR24;
… …
3369 idx = index; 3417 idx = index;
3370 goto update; 3418 goto update;
3371 } 3419 }
3372 3420
3373 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3421 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3374 // but also handles wrap around values good enough 3422 // but also handles wrap around values well enough
3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3423 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3376 idx = index; 3424 idx = index;
3377 } 3425 }
3378 3426
3379update: 3427update:
3380 rgb24_color[idx] = color; 3428 rgb24_color[idx] = color;
… …
3387 3435
3388 return idx; 3436 return idx;
3389} 3437}
3390 3438
3391void 3439void
3392rxvt_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)
3393{ 3441{
3394 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3395 { 3443 {
3396 rgba c; 3444 rgba c;
3397 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3398 3447
3399#if XFT 3448#if XFT
3400 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3401 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);
3402 else 3451 else
3403#endif 3452#endif
3404 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);
3405 } 3459 }
3406 else 3460 else
3407 set_window_color (color, str); 3461 set_window_color (color, str);
3408} 3462}
3409 3463
3410/* 3464/*
3411 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3412 */ 3466 */
3413void 3467void
3414rxvt_term::process_xterm_seq (int op, char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3415{ 3469{
3416 int color; 3470 int color;
3417 char *buf, *name; 3471 char *buf, *name;
3418 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3419 int saveop = op; 3473 int saveop = op;
… …
3454 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3455 && actual_type != None 3509 && actual_type != None
3456 && actual_format == 8) 3510 && actual_format == 8)
3457 str = (const char *)(value); 3511 str = (const char *)(value);
3458 3512
3459 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);
3460 3514
3461 XFree (value); 3515 XFree (value);
3462 } 3516 }
3463 else 3517 else
3464 { 3518 {
… …
3488 break; 3542 break;
3489 3543
3490 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3491 *buf++ = '\0'; 3545 *buf++ = '\0';
3492 3546
3493 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3494 } 3548 }
3495 break; 3549 break;
3496 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3497 case XTerm_Color00: 3551 case XTerm_Color00:
3498 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3499 break; 3553 break;
3500 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3501 case XTerm_Color01: 3555 case XTerm_Color01:
3502 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3503 break; 3557 break;
3504#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3505 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3506 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3507 break; 3561 break;
3508#endif 3562#endif
3509 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3510 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3511 break; 3565 break;
3512 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3513 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3514 break; 3568 break;
3515#ifdef OPTION_HC 3569#ifdef OPTION_HC
3516 case XTerm_Color_HC: 3570 case XTerm_Color_HC:
3517 process_color_seq (op, Color_HC, str, resp); 3571 process_color_seq (op, Color_HC, str, st);
3518 break; 3572 break;
3519 case XTerm_Color_HTC: 3573 case XTerm_Color_HTC:
3520 process_color_seq (op, Color_HTC, str, resp); 3574 process_color_seq (op, Color_HTC, str, st);
3521 break; 3575 break;
3522#endif 3576#endif
3523#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3524 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3525 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3526 break; 3580 break;
3527 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3528 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3529 break; 3583 break;
3530 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3531 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3532 break; 3586 break;
3533#endif 3587#endif
3534 case URxvt_Color_border: 3588 case URxvt_Color_border:
3535 process_color_seq (op, Color_border, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3536 break; 3590 break;
3537 3591
3538 case XTerm_logfile: 3592 case XTerm_logfile:
3539 // TODO, when secure mode? 3593 // TODO, when secure mode?
3540 break; 3594 break;
… …
3558 case URxvt_boldFont: 3612 case URxvt_boldFont:
3559 case URxvt_italicFont: 3613 case URxvt_italicFont:
3560 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3561#endif 3615#endif
3562 if (query) 3616 if (query)
3563 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3564 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3565 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3566 resp); 3620 st.v);
3567 else 3621 else
3568 { 3622 {
3569 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3570 3624
3571 res = strdup (str); 3625 res = strdup (str);
… …
3574 } 3628 }
3575 break; 3629 break;
3576 3630
3577 case URxvt_version: 3631 case URxvt_version:
3578 if (query) 3632 if (query)
3579 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3580 op, 3634 op,
3581 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3582 resp); 3636 st.v);
3583 break; 3637 break;
3584 3638
3585#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
3586 case URxvt_locale: 3647 case URxvt_locale:
3587 if (query) 3648 if (query)
3588 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);
3589 else 3650 else
3590 { 3651 {
3591 set_locale (str); 3652 set_locale (str);
3592 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3593 init_xlocale (); 3654 init_xlocale ();
… …
3608 break; 3669 break;
3609#endif 3670#endif
3610 3671
3611#if ENABLE_PERL 3672#if ENABLE_PERL
3612 case URxvt_perl: 3673 case URxvt_perl:
3613 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));
3614 break; 3675 break;
3615#endif 3676#endif
3616 } 3677 }
3617} 3678}
3618/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3698 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3699 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3700 { 1003, PrivMode_MouseAnyEvent }, 3761 { 1003, PrivMode_MouseAnyEvent },
3701#if ENABLE_FRILLS 3762#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent }, 3763 { 1004, PrivMode_FocusEvent },
3703 { 1005, PrivMode_ExtModeMouse }, 3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3704#endif 3766#endif
3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3706 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3707#if ENABLE_FRILLS 3769#if ENABLE_FRILLS
3708 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3709#endif 3771#endif
3710 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3711 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3712 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3713 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3714 // 1048 save and restore cursor, implemented in code 3776 // 1048 save and restore cursor, implemented in code
3715 { 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 */
3716 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3717 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3718 }; 3782 };
3719 3783
3720 if (nargs == 0) 3784 if (nargs == 0)
3721 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 }
3722 3804
3723 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3724 if (mode == 'l') 3806 if (mode == 'l')
3725 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3726 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3977 case 38: // set fg color, ISO 8613-6 4059 case 38: // set fg color, ISO 8613-6
3978 case 48: // set bg color, ISO 8613-6 4060 case 48: // set bg color, ISO 8613-6
3979 { 4061 {
3980 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; 4062 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3981 unsigned int idx; 4063 unsigned int idx;
3982 4064
3983 if (nargs > i + 2 && arg[i + 1] == 5) 4065 if (nargs > i + 2 && arg[i + 1] == 5)
3984 { 4066 {
3985 idx = minCOLOR + arg[i + 2]; 4067 idx = minCOLOR + arg[i + 2];
3986 i += 2; 4068 i += 2;
3987 4069

Diff Legend

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