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.582 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs.
Revision 1.598 by sf-exg, Sun Sep 18 20:32:17 2022 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 3 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
… …
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
1277#endif 1277#endif
1278 1278
1279void 1279void
1280rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1281{ 1281{
1282 int button_number, key_state = 0; 1282 int button_number, state = 0;
1283 int x, y; 1283 int x, y;
1284 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1285 1285
1286 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1287 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1288 1288
1289 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1291 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1292 return; 1292 return;
1293 1293
1294 mouse_row = x; 1294 mouse_row = x;
1295 mouse_col = y; 1295 mouse_col = y;
1296 code += 32; 1296 state += 32;
1297 }
1298
1299 if (MEvent.button == AnyButton)
1300 button_number = 3;
1301 else
1302 { 1297 }
1298
1303 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1304 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1305 if (button_number >= 3) 1301 if (button_number >= 3)
1306 button_number += 64 - 3; 1302 button_number += 64 - 3;
1307 }
1308 1303
1309 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1310 { 1305 {
1311 /* 1306 /*
1312 * do not report ButtonRelease 1307 * do not report ButtonRelease
1313 * no state info allowed 1308 * no state info allowed
1314 */ 1309 */
1315 key_state = 0; 1310 if (release)
1316 if (button_number == 3)
1317 return; 1311 return;
1318 } 1312 }
1319 else 1313 else
1320 { 1314 {
1321 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1317 * 8 = Meta
1324 * 16 = Control 1318 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1320 * 32 = Double Click
1327 */ 1321 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1327#endif
1334 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1335 1331
1336#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1334 if (state & 16)
1339 fputc ('C', stderr); 1335 fputc ('C', stderr);
1340 if (key_state & 4) 1336 if (state & 4)
1341 fputc ('S', stderr); 1337 fputc ('S', stderr);
1342 if (key_state & 8) 1338 if (state & 8)
1343 fputc ('A', stderr); 1339 fputc ('A', stderr);
1344 if (key_state & 32) 1340 if (state & 32)
1345 fputc ('2', stderr); 1341 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1343 button_number,
1348 x, 1344 x,
1349 y); 1345 y);
1350#endif 1346#endif
1351 1347
1352#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1357 code,
1356 x, 1358 x,
1357 y); 1359 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1359 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1362 code,
1361 wint_t (32 + x), 1363 wint_t (32 + x),
1362 wint_t (32 + y)); 1364 wint_t (32 + y));
1363 else 1365 else
1364#endif 1366#endif
1365 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1368 code,
1367 32 + x, 1369 32 + x,
1368 32 + y); 1370 32 + y);
1369} 1371}
1370 1372
1371/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
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
2354wchar_t ecb_hot 2356wchar_t ecb_hot
2355rxvt_term::next_char () NOTHROW 2357rxvt_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 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2361 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2362 2364
2363 wchar_t wc; 2365 wchar_t wc;
2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2365 2367
… …
2386 return NOCHAR; 2388 return NOCHAR;
2387} 2389}
2388 2390
2389// read the next octet 2391// read the next octet
2390uint32_t ecb_hot 2392uint32_t ecb_hot
2391rxvt_term::next_octet () NOTHROW 2393rxvt_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
2398static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2399 2401
2400wchar_t ecb_hot 2402wchar_t ecb_hot
2401rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_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
2411uint32_t ecb_hot 2413uint32_t ecb_hot
2412rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_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;
… …
2690 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2692 } 2694 }
2693 break; 2695 break;
2694 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2695 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2696 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2697 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2698 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2700 break; 2703 break;
2704#endif
2701 2705
2702 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2703 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2704 scr_set_tab (1); 2708 scr_set_tab (1);
2705 break; 2709 break;
… …
2863 break; 2867 break;
2864 2868
2865 case '?': 2869 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 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);
2868 break; 2874 break;
2869 2875
2870 case '!': 2876 case '!':
2871 if (ch == CSI_70) 2877 if (ch == CSI_70)
2872 { 2878 {
2873 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2874 scr_soft_reset (); 2880 scr_soft_reset ();
2875 2881
2876 static const int pm_h[] = { 7, 25 }; 2882 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 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2878 2884
2879 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);
2880 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);
2881 } 2887 }
2882 break; 2888 break;
… …
2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2913 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2914 break; 2920 break;
2915 2921
2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2918#ifdef ISO6429 2924#ifdef ISO6429
2919 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2920#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2921 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2922#endif 2928#endif
… …
3013 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3014 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3015 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3016 break; 3022 break;
3017 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3018 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
3019 break; 3025 break;
3020 } 3026 }
3021 break; 3027 break;
3022 3028
3023 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3326 b &= 0xff; 3332 b &= 0xff;
3327 a &= 0xff; 3333 a &= 0xff;
3328 3334
3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; 3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330 3336
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 */ 3337 /* we allow one of the 6 closest neighbouring colours */
3337 /* to replace the current color, if they not used recently */ 3338 /* to replace the current color, if they not used recently */
3339 #if 0
3338 static const signed char dxyz[][3] = { 3340 static const unsigned char dxyz[][3] = {
3339 0, 0, 0, 3341 0, 0, 0,
3340 0, 0, +1, 3342 0, 0, 4,
3341 0, 0, -1, 3343 0, 4, 4,
3344 4, 4, 0,
3345 4, 0, 4,
3342 0, +1, 0, 3346 0, 4, 0,
3343 0, -1, 0,
3344 +1, 0, 0, 3347 4, 0, 0,
3345 -1, 0, 0,
3346 }; 3348 };
3349 #else
3350 // silly compressed verlapping triplets version of above
3351 static const unsigned char dxyz[] = {
3352 0, 0, 0, 4, 4, 0, 4, 0, 0,
3353 };
3354 #endif
3347 3355
3356 static const unsigned char color_level[8][32] = {
3357 // neighbour index
3358 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3359 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3360 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3361 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3362 // Red_levels/Green_levels/Blue_levels index
3363 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3364 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3365 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3366 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3367 };
3368
3369 unsigned int idx;
3370
3348 for (int n = 0; n < ecb_array_length (dxyz); ++n) 3371 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3349 { 3372 {
3350 int r = idx_r + dxyz[n][0]; 3373 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3351 int g = idx_g + dxyz[n][1]; 3374 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3352 int b = idx_b + dxyz[n][2]; 3375 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); 3376 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3377
3378 if (n == 0)
3379 idx = index;
3359 3380
3360 if (rgb24_color[index] == color) 3381 if (rgb24_color[index] == color)
3361 { 3382 {
3362 rgb24_seqno[index] = ++rgb24_sequence; 3383 rgb24_seqno[index] = ++rgb24_sequence;
3363 return index + minTermCOLOR24; 3384 return index + minTermCOLOR24;
… …
3369 idx = index; 3390 idx = index;
3370 goto update; 3391 goto update;
3371 } 3392 }
3372 3393
3373 // like (rgb24_seqno[idx] > rgb24_seqno[index]) 3394 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3374 // but also handles wrap around values good enough 3395 // but also handles wrap around values well enough
3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) 3396 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3376 idx = index; 3397 idx = index;
3377 } 3398 }
3378 3399
3379update: 3400update:
3380 rgb24_color[idx] = color; 3401 rgb24_color[idx] = color;
… …
3393{ 3414{
3394 if (str[0] == '?' && !str[1]) 3415 if (str[0] == '?' && !str[1])
3395 { 3416 {
3396 rgba c; 3417 rgba c;
3397 pix_colors_focused[color].get (c); 3418 pix_colors_focused[color].get (c);
3419 char rgba_str[32];
3398 3420
3399#if XFT 3421#if XFT
3400 if (c.a != rgba::MAX_CC) 3422 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); 3423 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3402 else 3424 else
3403#endif 3425#endif
3404 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3426 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3427
3428 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3429 tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp);
3430 else
3431 tt_printf ("\033]%d;%s%c", report, rgba_str, resp);
3405 } 3432 }
3406 else 3433 else
3407 set_window_color (color, str); 3434 set_window_color (color, str);
3408} 3435}
3409 3436
… …
3581 rs[Rs_name], VERSION[0], VERSION[2], 3608 rs[Rs_name], VERSION[0], VERSION[2],
3582 resp); 3609 resp);
3583 break; 3610 break;
3584 3611
3585#if !ENABLE_MINIMAL 3612#if !ENABLE_MINIMAL
3613 case URxvt_cellinfo:
3614 if (query)
3615 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3616 fwidth, fheight, fbase,
3617 resp);
3618 break;
3619
3586 case URxvt_locale: 3620 case URxvt_locale:
3587 if (query) 3621 if (query)
3588 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3622 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3589 else 3623 else
3590 { 3624 {
… …
3698 { 1000, PrivMode_MouseX11 }, 3732 { 1000, PrivMode_MouseX11 },
3699 { 1002, PrivMode_MouseBtnEvent }, 3733 { 1002, PrivMode_MouseBtnEvent },
3700 { 1003, PrivMode_MouseAnyEvent }, 3734 { 1003, PrivMode_MouseAnyEvent },
3701#if ENABLE_FRILLS 3735#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent }, 3736 { 1004, PrivMode_FocusEvent },
3703 { 1005, PrivMode_ExtModeMouse }, 3737 { 1005, PrivMode_ExtMouseUTF8 },
3738 { 1006, PrivMode_ExtMouseSGR },
3704#endif 3739#endif
3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3740 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3706 { 1011, PrivMode_Keypress }, // rxvt extension 3741 { 1011, PrivMode_Keypress }, // rxvt extension
3707#if ENABLE_FRILLS 3742#if ENABLE_FRILLS
3708 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3743 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3709#endif 3744#endif
3710 // 1035 enable modifiers for alt, numlock NYI 3745 // 1035 enable modifiers for alt, numlock NYI
3711 // 1036 send ESC for meta keys NYI 3746 // 1036 send ESC for meta keys NYI
3712 // 1037 send DEL for keypad delete NYI 3747 // 1037 send DEL for keypad delete NYI
3713 { 1047, PrivMode_Screen }, 3748 { 1047, PrivMode_Screen },
3714 // 1048 save and restore cursor, implemented in code 3749 // 1048 save and restore cursor, implemented in code
3715 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3750 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3716 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3751 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3752#if ENABLE_FRILLS
3717 { 2004, PrivMode_BracketPaste }, 3753 { 2004, PrivMode_BracketPaste },
3754#endif
3718 }; 3755 };
3719 3756
3720 if (nargs == 0) 3757 if (nargs == 0)
3721 return; 3758 return;
3759
3760 // DECRQM
3761 if (mode == 'p')
3762 {
3763 int status = 0;
3764 if (nargs != 1)
3765 return;
3766
3767 for (j = 0; j < ecb_array_length (argtopriv); j++)
3768 if (argtopriv[j].argval == arg[0])
3769 {
3770 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3771 break;
3772 }
3773
3774 tt_printf ("\33[?%d;%d$y", arg[0], status);
3775 return;
3776 }
3722 3777
3723 /* make lo/hi boolean */ 3778 /* make lo/hi boolean */
3724 if (mode == 'l') 3779 if (mode == 'l')
3725 mode = 0; /* reset */ 3780 mode = 0; /* reset */
3726 else if (mode == 'h') 3781 else if (mode == 'h')
… …
3977 case 38: // set fg color, ISO 8613-6 4032 case 38: // set fg color, ISO 8613-6
3978 case 48: // set bg color, ISO 8613-6 4033 case 48: // set bg color, ISO 8613-6
3979 { 4034 {
3980 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; 4035 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3981 unsigned int idx; 4036 unsigned int idx;
3982 4037
3983 if (nargs > i + 2 && arg[i + 1] == 5) 4038 if (nargs > i + 2 && arg[i + 1] == 5)
3984 { 4039 {
3985 idx = minCOLOR + arg[i + 2]; 4040 idx = minCOLOR + arg[i + 2];
3986 i += 2; 4041 i += 2;
3987 4042

Diff Legend

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