… | |
… | |
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 */ |
1017 | void |
1017 | void |
1018 | rxvt_term::refresh_check () |
1018 | rxvt_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 | |
1026 | void |
1026 | void |
… | |
… | |
1277 | #endif |
1277 | #endif |
1278 | |
1278 | |
1279 | void |
1279 | void |
1280 | rxvt_term::mouse_report (XButtonEvent &ev) |
1280 | rxvt_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 */ |
… | |
… | |
2149 | && (ev.button != MEvent.button |
2151 | && (ev.button != MEvent.button |
2150 | || (ev.time - MEvent.time |
2152 | || (ev.time - MEvent.time |
2151 | > multiClickTime / 2))) |
2153 | > multiClickTime / 2))) |
2152 | { |
2154 | { |
2153 | MEvent.clicks = 0; |
2155 | MEvent.clicks = 0; |
2154 | MEvent.button = AnyButton; |
2156 | MEvent.button = ev.button; |
2155 | mouse_report (ev); |
2157 | mouse_report (ev); |
2156 | } |
2158 | } |
2157 | #else /* MOUSE_REPORT_DOUBLECLICK */ |
2159 | #else /* MOUSE_REPORT_DOUBLECLICK */ |
2158 | MEvent.button = AnyButton; |
2160 | MEvent.button = ev.button; |
2159 | mouse_report (ev); |
2161 | mouse_report (ev); |
2160 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
2162 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
2161 | return; |
2163 | return; |
2162 | } |
2164 | } |
2163 | |
2165 | |
… | |
… | |
2350 | } |
2352 | } |
2351 | } |
2353 | } |
2352 | |
2354 | |
2353 | // read the next character |
2355 | // read the next character |
2354 | wchar_t ecb_hot |
2356 | wchar_t ecb_hot |
2355 | rxvt_term::next_char () NOTHROW |
2357 | rxvt_term::next_char () noexcept |
2356 | { |
2358 | { |
2357 | while (cmdbuf_ptr < cmdbuf_endp) |
2359 | while (cmdbuf_ptr < cmdbuf_endp) |
2358 | { |
2360 | { |
2359 | // assume 7-bit to be ascii ALWAYS (always true in POSIX) |
2361 | // assume 7-bit to be ascii ALWAYS (always true in POSIX) |
2360 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f)) |
2362 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f)) |
… | |
… | |
2386 | return NOCHAR; |
2388 | return NOCHAR; |
2387 | } |
2389 | } |
2388 | |
2390 | |
2389 | // read the next octet |
2391 | // read the next octet |
2390 | uint32_t ecb_hot |
2392 | uint32_t ecb_hot |
2391 | rxvt_term::next_octet () NOTHROW |
2393 | rxvt_term::next_octet () noexcept |
2392 | { |
2394 | { |
2393 | return cmdbuf_ptr < cmdbuf_endp |
2395 | return cmdbuf_ptr < cmdbuf_endp |
2394 | ? (unsigned char)*cmdbuf_ptr++ |
2396 | ? (unsigned char)*cmdbuf_ptr++ |
2395 | : NOCHAR; |
2397 | : NOCHAR; |
2396 | } |
2398 | } |
2397 | |
2399 | |
2398 | static class out_of_input out_of_input; |
2400 | static class out_of_input out_of_input; |
2399 | |
2401 | |
2400 | wchar_t ecb_hot |
2402 | wchar_t ecb_hot |
2401 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2403 | rxvt_term::cmd_getc () |
2402 | { |
2404 | { |
2403 | wchar_t c = next_char (); |
2405 | wchar_t c = next_char (); |
2404 | |
2406 | |
2405 | if (c == NOCHAR) |
2407 | if (c == NOCHAR) |
2406 | throw out_of_input; |
2408 | throw out_of_input; |
2407 | |
2409 | |
2408 | return c; |
2410 | return c; |
2409 | } |
2411 | } |
2410 | |
2412 | |
2411 | uint32_t ecb_hot |
2413 | uint32_t ecb_hot |
2412 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2414 | rxvt_term::cmd_get8 () |
2413 | { |
2415 | { |
2414 | uint32_t c = next_octet (); |
2416 | uint32_t c = next_octet (); |
2415 | |
2417 | |
2416 | if (c == NOCHAR) |
2418 | if (c == NOCHAR) |
2417 | throw out_of_input; |
2419 | throw out_of_input; |
… | |
… | |
2865 | break; |
2867 | break; |
2866 | |
2868 | |
2867 | case '?': |
2869 | case '?': |
2868 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2870 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2869 | 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); |
2870 | break; |
2874 | break; |
2871 | |
2875 | |
2872 | case '!': |
2876 | case '!': |
2873 | if (ch == CSI_70) |
2877 | if (ch == CSI_70) |
2874 | { |
2878 | { |
2875 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2879 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2876 | scr_soft_reset (); |
2880 | scr_soft_reset (); |
2877 | |
2881 | |
2878 | static const int pm_h[] = { 7, 25 }; |
2882 | static const int pm_h[] = { 7, 25 }; |
2879 | 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 }; |
2880 | |
2884 | |
2881 | 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); |
2882 | 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); |
2883 | } |
2887 | } |
2884 | break; |
2888 | break; |
… | |
… | |
3015 | case 7: /* unofficial extension */ |
3019 | case 7: /* unofficial extension */ |
3016 | if (option (Opt_insecure)) |
3020 | if (option (Opt_insecure)) |
3017 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3021 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3018 | break; |
3022 | break; |
3019 | 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'; |
3020 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3028 | process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified |
3021 | break; |
3029 | break; |
|
|
3030 | } |
3022 | } |
3031 | } |
3023 | break; |
3032 | break; |
3024 | |
3033 | |
3025 | case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ |
3034 | case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ |
3026 | switch (arg[0]) |
3035 | switch (arg[0]) |
… | |
… | |
3211 | /* |
3220 | /* |
3212 | * get input up until STRING TERMINATOR (or BEL) |
3221 | * get input up until STRING TERMINATOR (or BEL) |
3213 | * ends_how is terminator used. returned input must be free()'d |
3222 | * ends_how is terminator used. returned input must be free()'d |
3214 | */ |
3223 | */ |
3215 | char * |
3224 | char * |
3216 | rxvt_term::get_to_st (unicode_t &ends_how) |
3225 | rxvt_term::get_to_st (string_term &st) |
3217 | { |
3226 | { |
3218 | unicode_t ch; |
3227 | unicode_t ch; |
3219 | bool seen_esc = false; |
3228 | bool seen_esc = false; |
3220 | unsigned int n = 0; |
3229 | unsigned int n = 0; |
3221 | wchar_t string[CBUFSIZ]; |
3230 | wchar_t string[CBUFSIZ]; |
… | |
… | |
3250 | string[n++] = ch; |
3259 | string[n++] = ch; |
3251 | } |
3260 | } |
3252 | |
3261 | |
3253 | string[n++] = '\0'; |
3262 | string[n++] = '\0'; |
3254 | |
3263 | |
3255 | 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'; |
3256 | |
3269 | |
3257 | return rxvt_wcstombs (string); |
3270 | return rxvt_wcstombs (string); |
3258 | } |
3271 | } |
3259 | |
3272 | |
3260 | /*----------------------------------------------------------------------*/ |
3273 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3266 | { |
3279 | { |
3267 | /* |
3280 | /* |
3268 | * Not handled yet |
3281 | * Not handled yet |
3269 | */ |
3282 | */ |
3270 | |
3283 | |
3271 | unicode_t eh; |
3284 | string_term st; |
3272 | char *s = get_to_st (eh); |
3285 | char *s = get_to_st (st); |
3273 | if (s) |
3286 | if (s) |
3274 | free (s); |
3287 | free (s); |
3275 | |
3288 | |
3276 | return; |
3289 | return; |
3277 | } |
3290 | } |
… | |
… | |
3289 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3302 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3290 | arg = arg * 10 + (ch - '0'); |
3303 | arg = arg * 10 + (ch - '0'); |
3291 | |
3304 | |
3292 | if (ch == ';') |
3305 | if (ch == ';') |
3293 | { |
3306 | { |
3294 | unicode_t eh; |
3307 | string_term st; |
3295 | char *s = get_to_st (eh); |
3308 | char *s = get_to_st (st); |
3296 | |
3309 | |
3297 | if (s) |
3310 | if (s) |
3298 | { |
3311 | { |
3299 | process_xterm_seq (arg, s, eh); |
3312 | process_xterm_seq (arg, s, st); |
3300 | free (s); |
3313 | free (s); |
3301 | } |
3314 | } |
3302 | } |
3315 | } |
3303 | } |
3316 | } |
3304 | |
3317 | |
… | |
… | |
3328 | b &= 0xff; |
3341 | b &= 0xff; |
3329 | a &= 0xff; |
3342 | a &= 0xff; |
3330 | |
3343 | |
3331 | uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; |
3344 | uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; |
3332 | |
3345 | |
3333 | unsigned int idx_r = r * (Red_levels - 1) / 0xff; |
|
|
3334 | unsigned int idx_g = g * (Green_levels - 1) / 0xff; |
|
|
3335 | unsigned int idx_b = b * (Blue_levels - 1) / 0xff; |
|
|
3336 | unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); |
|
|
3337 | |
|
|
3338 | /* we allow one of the 6 directly neighbouring colours */ |
3346 | /* we allow one of the 6 closest neighbouring colours */ |
3339 | /* to replace the current color, if they not used recently */ |
3347 | /* to replace the current color, if they not used recently */ |
|
|
3348 | #if 0 |
3340 | static const signed char dxyz[][3] = { |
3349 | static const unsigned char dxyz[][3] = { |
3341 | 0, 0, 0, |
3350 | 0, 0, 0, |
3342 | 0, 0, +1, |
3351 | 0, 0, 4, |
3343 | 0, 0, -1, |
3352 | 0, 4, 4, |
|
|
3353 | 4, 4, 0, |
|
|
3354 | 4, 0, 4, |
3344 | 0, +1, 0, |
3355 | 0, 4, 0, |
3345 | 0, -1, 0, |
|
|
3346 | +1, 0, 0, |
3356 | 4, 0, 0, |
3347 | -1, 0, 0, |
|
|
3348 | }; |
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 |
3349 | |
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 | |
3350 | for (int n = 0; n < ecb_array_length (dxyz); ++n) |
3380 | for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n) |
3351 | { |
3381 | { |
3352 | int r = idx_r + dxyz[n][0]; |
3382 | unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8]; |
3353 | int g = idx_g + dxyz[n][1]; |
3383 | unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8]; |
3354 | int b = idx_b + dxyz[n][2]; |
3384 | unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8]; |
3355 | |
|
|
3356 | if (!IN_RANGE_EXC (r, 0, Red_levels )) continue; |
|
|
3357 | if (!IN_RANGE_EXC (g, 0, Green_levels)) continue; |
|
|
3358 | if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue; |
|
|
3359 | |
|
|
3360 | 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; |
3361 | |
3389 | |
3362 | if (rgb24_color[index] == color) |
3390 | if (rgb24_color[index] == color) |
3363 | { |
3391 | { |
3364 | rgb24_seqno[index] = ++rgb24_sequence; |
3392 | rgb24_seqno[index] = ++rgb24_sequence; |
3365 | return index + minTermCOLOR24; |
3393 | return index + minTermCOLOR24; |
… | |
… | |
3371 | idx = index; |
3399 | idx = index; |
3372 | goto update; |
3400 | goto update; |
3373 | } |
3401 | } |
3374 | |
3402 | |
3375 | // like (rgb24_seqno[idx] > rgb24_seqno[index]) |
3403 | // like (rgb24_seqno[idx] > rgb24_seqno[index]) |
3376 | // but also handles wrap around values good enough |
3404 | // but also handles wrap around values well enough |
3377 | if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) |
3405 | if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000) |
3378 | idx = index; |
3406 | idx = index; |
3379 | } |
3407 | } |
3380 | |
3408 | |
3381 | update: |
3409 | update: |
3382 | rgb24_color[idx] = color; |
3410 | rgb24_color[idx] = color; |
… | |
… | |
3389 | |
3417 | |
3390 | return idx; |
3418 | return idx; |
3391 | } |
3419 | } |
3392 | |
3420 | |
3393 | void |
3421 | void |
3394 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3422 | rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st) |
3395 | { |
3423 | { |
3396 | if (str[0] == '?' && !str[1]) |
3424 | if (str[0] == '?' && !str[1]) |
3397 | { |
3425 | { |
3398 | rgba c; |
3426 | rgba c; |
3399 | pix_colors_focused[color].get (c); |
3427 | pix_colors_focused[color].get (c); |
|
|
3428 | char rgba_str[32]; |
3400 | |
3429 | |
3401 | #if XFT |
3430 | #if XFT |
3402 | if (c.a != rgba::MAX_CC) |
3431 | if (c.a != rgba::MAX_CC) |
3403 | 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); |
3404 | else |
3433 | else |
3405 | #endif |
3434 | #endif |
3406 | 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); |
3407 | } |
3441 | } |
3408 | else |
3442 | else |
3409 | set_window_color (color, str); |
3443 | set_window_color (color, str); |
3410 | } |
3444 | } |
3411 | |
3445 | |
3412 | /* |
3446 | /* |
3413 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3447 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3414 | */ |
3448 | */ |
3415 | void |
3449 | void |
3416 | rxvt_term::process_xterm_seq (int op, char *str, char resp) |
3450 | rxvt_term::process_xterm_seq (int op, char *str, string_term &st) |
3417 | { |
3451 | { |
3418 | int color; |
3452 | int color; |
3419 | char *buf, *name; |
3453 | char *buf, *name; |
3420 | bool query = str[0] == '?' && !str[1]; |
3454 | bool query = str[0] == '?' && !str[1]; |
3421 | int saveop = op; |
3455 | int saveop = op; |
… | |
… | |
3456 | &nitems, &bytes_after, &value) == Success |
3490 | &nitems, &bytes_after, &value) == Success |
3457 | && actual_type != None |
3491 | && actual_type != None |
3458 | && actual_format == 8) |
3492 | && actual_format == 8) |
3459 | str = (const char *)(value); |
3493 | str = (const char *)(value); |
3460 | |
3494 | |
3461 | 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); |
3462 | |
3496 | |
3463 | XFree (value); |
3497 | XFree (value); |
3464 | } |
3498 | } |
3465 | else |
3499 | else |
3466 | { |
3500 | { |
… | |
… | |
3490 | break; |
3524 | break; |
3491 | |
3525 | |
3492 | if ((buf = strchr (name, ';')) != NULL) |
3526 | if ((buf = strchr (name, ';')) != NULL) |
3493 | *buf++ = '\0'; |
3527 | *buf++ = '\0'; |
3494 | |
3528 | |
3495 | process_color_seq (op, color, name, resp); |
3529 | process_color_seq (op, color, name, st); |
3496 | } |
3530 | } |
3497 | break; |
3531 | break; |
3498 | case Rxvt_restoreFG: |
3532 | case Rxvt_restoreFG: |
3499 | case XTerm_Color00: |
3533 | case XTerm_Color00: |
3500 | process_color_seq (op, Color_fg, str, resp); |
3534 | process_color_seq (op, Color_fg, str, st); |
3501 | break; |
3535 | break; |
3502 | case Rxvt_restoreBG: |
3536 | case Rxvt_restoreBG: |
3503 | case XTerm_Color01: |
3537 | case XTerm_Color01: |
3504 | process_color_seq (op, Color_bg, str, resp); |
3538 | process_color_seq (op, Color_bg, str, st); |
3505 | break; |
3539 | break; |
3506 | #ifndef NO_CURSORCOLOR |
3540 | #ifndef NO_CURSORCOLOR |
3507 | case XTerm_Color_cursor: |
3541 | case XTerm_Color_cursor: |
3508 | process_color_seq (op, Color_cursor, str, resp); |
3542 | process_color_seq (op, Color_cursor, str, st); |
3509 | break; |
3543 | break; |
3510 | #endif |
3544 | #endif |
3511 | case XTerm_Color_pointer_fg: |
3545 | case XTerm_Color_pointer_fg: |
3512 | process_color_seq (op, Color_pointer_fg, str, resp); |
3546 | process_color_seq (op, Color_pointer_fg, str, st); |
3513 | break; |
3547 | break; |
3514 | case XTerm_Color_pointer_bg: |
3548 | case XTerm_Color_pointer_bg: |
3515 | process_color_seq (op, Color_pointer_bg, str, resp); |
3549 | process_color_seq (op, Color_pointer_bg, str, st); |
3516 | break; |
3550 | break; |
3517 | #ifdef OPTION_HC |
3551 | #ifdef OPTION_HC |
3518 | case XTerm_Color_HC: |
3552 | case XTerm_Color_HC: |
3519 | process_color_seq (op, Color_HC, str, resp); |
3553 | process_color_seq (op, Color_HC, str, st); |
3520 | break; |
3554 | break; |
3521 | case XTerm_Color_HTC: |
3555 | case XTerm_Color_HTC: |
3522 | process_color_seq (op, Color_HTC, str, resp); |
3556 | process_color_seq (op, Color_HTC, str, st); |
3523 | break; |
3557 | break; |
3524 | #endif |
3558 | #endif |
3525 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3559 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3526 | case URxvt_Color_BD: |
3560 | case URxvt_Color_BD: |
3527 | process_color_seq (op, Color_BD, str, resp); |
3561 | process_color_seq (op, Color_BD, str, st); |
3528 | break; |
3562 | break; |
3529 | case URxvt_Color_UL: |
3563 | case URxvt_Color_UL: |
3530 | process_color_seq (op, Color_UL, str, resp); |
3564 | process_color_seq (op, Color_UL, str, st); |
3531 | break; |
3565 | break; |
3532 | case URxvt_Color_IT: |
3566 | case URxvt_Color_IT: |
3533 | process_color_seq (op, Color_IT, str, resp); |
3567 | process_color_seq (op, Color_IT, str, st); |
3534 | break; |
3568 | break; |
3535 | #endif |
3569 | #endif |
3536 | case URxvt_Color_border: |
3570 | case URxvt_Color_border: |
3537 | process_color_seq (op, Color_border, str, resp); |
3571 | process_color_seq (op, Color_border, str, st); |
3538 | break; |
3572 | break; |
3539 | |
3573 | |
3540 | case XTerm_logfile: |
3574 | case XTerm_logfile: |
3541 | // TODO, when secure mode? |
3575 | // TODO, when secure mode? |
3542 | break; |
3576 | break; |
… | |
… | |
3560 | case URxvt_boldFont: |
3594 | case URxvt_boldFont: |
3561 | case URxvt_italicFont: |
3595 | case URxvt_italicFont: |
3562 | case URxvt_boldItalicFont: |
3596 | case URxvt_boldItalicFont: |
3563 | #endif |
3597 | #endif |
3564 | if (query) |
3598 | if (query) |
3565 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3599 | tt_printf ("\33]%d;%-.250s%s", saveop, |
3566 | option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3600 | option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3567 | ? fontset[op - URxvt_font]->fontdesc : "", |
3601 | ? fontset[op - URxvt_font]->fontdesc : "", |
3568 | resp); |
3602 | st.v); |
3569 | else |
3603 | else |
3570 | { |
3604 | { |
3571 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3605 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3572 | |
3606 | |
3573 | res = strdup (str); |
3607 | res = strdup (str); |
… | |
… | |
3576 | } |
3610 | } |
3577 | break; |
3611 | break; |
3578 | |
3612 | |
3579 | case URxvt_version: |
3613 | case URxvt_version: |
3580 | if (query) |
3614 | if (query) |
3581 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
3615 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s", |
3582 | op, |
3616 | op, |
3583 | rs[Rs_name], VERSION[0], VERSION[2], |
3617 | rs[Rs_name], VERSION[0], VERSION[2], |
3584 | resp); |
3618 | st.v); |
3585 | break; |
3619 | break; |
3586 | |
3620 | |
3587 | #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 | |
3588 | case URxvt_locale: |
3629 | case URxvt_locale: |
3589 | if (query) |
3630 | if (query) |
3590 | 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); |
3591 | else |
3632 | else |
3592 | { |
3633 | { |
3593 | set_locale (str); |
3634 | set_locale (str); |
3594 | pty->set_utf8_mode (enc_utf8); |
3635 | pty->set_utf8_mode (enc_utf8); |
3595 | init_xlocale (); |
3636 | init_xlocale (); |
… | |
… | |
3610 | break; |
3651 | break; |
3611 | #endif |
3652 | #endif |
3612 | |
3653 | |
3613 | #if ENABLE_PERL |
3654 | #if ENABLE_PERL |
3614 | case URxvt_perl: |
3655 | case URxvt_perl: |
3615 | 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)); |
3616 | break; |
3657 | break; |
3617 | #endif |
3658 | #endif |
3618 | } |
3659 | } |
3619 | } |
3660 | } |
3620 | /*----------------------------------------------------------------------*/ |
3661 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3700 | { 1000, PrivMode_MouseX11 }, |
3741 | { 1000, PrivMode_MouseX11 }, |
3701 | { 1002, PrivMode_MouseBtnEvent }, |
3742 | { 1002, PrivMode_MouseBtnEvent }, |
3702 | { 1003, PrivMode_MouseAnyEvent }, |
3743 | { 1003, PrivMode_MouseAnyEvent }, |
3703 | #if ENABLE_FRILLS |
3744 | #if ENABLE_FRILLS |
3704 | { 1004, PrivMode_FocusEvent }, |
3745 | { 1004, PrivMode_FocusEvent }, |
3705 | { 1005, PrivMode_ExtModeMouse }, |
3746 | { 1005, PrivMode_ExtMouseUTF8 }, |
|
|
3747 | { 1006, PrivMode_ExtMouseSGR }, |
3706 | #endif |
3748 | #endif |
3707 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3749 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3708 | { 1011, PrivMode_Keypress }, // rxvt extension |
3750 | { 1011, PrivMode_Keypress }, // rxvt extension |
3709 | #if ENABLE_FRILLS |
3751 | #if ENABLE_FRILLS |
3710 | { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 |
3752 | { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005 |
3711 | #endif |
3753 | #endif |
3712 | // 1035 enable modifiers for alt, numlock NYI |
3754 | // 1035 enable modifiers for alt, numlock NYI |
3713 | // 1036 send ESC for meta keys NYI |
3755 | // 1036 send ESC for meta keys NYI |
3714 | // 1037 send DEL for keypad delete NYI |
3756 | // 1037 send DEL for keypad delete NYI |
3715 | { 1047, PrivMode_Screen }, |
3757 | { 1047, PrivMode_Screen }, |
3716 | // 1048 save and restore cursor, implemented in code |
3758 | // 1048 save and restore cursor, implemented in code |
3717 | { 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 */ |
3718 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
3760 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
|
|
3761 | #if ENABLE_FRILLS |
3719 | { 2004, PrivMode_BracketPaste }, |
3762 | { 2004, PrivMode_BracketPaste }, |
|
|
3763 | #endif |
3720 | }; |
3764 | }; |
3721 | |
3765 | |
3722 | if (nargs == 0) |
3766 | if (nargs == 0) |
3723 | 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 | } |
3724 | |
3786 | |
3725 | /* make lo/hi boolean */ |
3787 | /* make lo/hi boolean */ |
3726 | if (mode == 'l') |
3788 | if (mode == 'l') |
3727 | mode = 0; /* reset */ |
3789 | mode = 0; /* reset */ |
3728 | else if (mode == 'h') |
3790 | else if (mode == 'h') |
… | |
… | |
3979 | case 38: // set fg color, ISO 8613-6 |
4041 | case 38: // set fg color, ISO 8613-6 |
3980 | case 48: // set bg color, ISO 8613-6 |
4042 | case 48: // set bg color, ISO 8613-6 |
3981 | { |
4043 | { |
3982 | unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; |
4044 | unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; |
3983 | unsigned int idx; |
4045 | unsigned int idx; |
3984 | |
4046 | |
3985 | if (nargs > i + 2 && arg[i + 1] == 5) |
4047 | if (nargs > i + 2 && arg[i + 1] == 5) |
3986 | { |
4048 | { |
3987 | idx = minCOLOR + arg[i + 2]; |
4049 | idx = minCOLOR + arg[i + 2]; |
3988 | i += 2; |
4050 | i += 2; |
3989 | |
4051 | |