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.571 by sf-exg, Thu Jun 30 11:33:42 2016 UTC vs.
Revision 1.591 by sf-exg, Thu May 13 19:40:19 2021 UTC

… …
1277#endif 1277#endif
1278 1278
1279void 1279void
1280rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1281{ 1281{
1282 int button_number, key_state = 0; 1282 int button_number, state = 0;
1283 int x, y; 1283 int x, y;
1284 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1285 1285
1286 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1287 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1288 1288
1289 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1291 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1292 return; 1292 return;
1293 1293
1294 mouse_row = x; 1294 mouse_row = x;
1295 mouse_col = y; 1295 mouse_col = y;
1296 code += 32; 1296 state += 32;
1297 }
1298
1299 if (MEvent.button == AnyButton)
1300 button_number = 3;
1301 else
1302 { 1297 }
1298
1303 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1304 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1305 if (button_number >= 3) 1301 if (button_number >= 3)
1306 button_number += 64 - 3; 1302 button_number += 64 - 3;
1307 }
1308 1303
1309 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1310 { 1305 {
1311 /* 1306 /*
1312 * do not report ButtonRelease 1307 * do not report ButtonRelease
1313 * no state info allowed 1308 * no state info allowed
1314 */ 1309 */
1315 key_state = 0; 1310 if (release)
1316 if (button_number == 3)
1317 return; 1311 return;
1318 } 1312 }
1319 else 1313 else
1320 { 1314 {
1321 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1323 * 8 = Meta 1317 * 8 = Meta
1324 * 16 = Control 1318 * 16 = Control
1325 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1326 * 32 = Double Click 1320 * 32 = Double Click
1327 */ 1321 */
1328 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1329 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1330 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1331#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1332 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1333#endif 1327#endif
1334 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1335 1331
1336#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1337 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1338 if (key_state & 16) 1334 if (state & 16)
1339 fputc ('C', stderr); 1335 fputc ('C', stderr);
1340 if (key_state & 4) 1336 if (state & 4)
1341 fputc ('S', stderr); 1337 fputc ('S', stderr);
1342 if (key_state & 8) 1338 if (state & 8)
1343 fputc ('A', stderr); 1339 fputc ('A', stderr);
1344 if (key_state & 32) 1340 if (state & 32)
1345 fputc ('2', stderr); 1341 fputc ('2', stderr);
1346 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1347 button_number, 1343 button_number,
1348 x, 1344 x,
1349 y); 1345 y);
1350#endif 1346#endif
1351 1347
1352#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1354 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state, 1357 code,
1356 x, 1358 x,
1357 y); 1359 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1359 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state, 1362 code,
1361 wint_t (32 + x), 1363 wint_t (32 + x),
1362 wint_t (32 + y)); 1364 wint_t (32 + y));
1363 else 1365 else
1364#endif 1366#endif
1365 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1366 code + button_number + key_state, 1368 code,
1367 32 + x, 1369 32 + x,
1368 32 + y); 1370 32 + y);
1369} 1371}
1370 1372
1371/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1485 ;
1484 1486
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486 1488
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change) 1489 if (want_position_change)
1498 { 1490 {
1499 int x, y; 1491 int x, y;
1500 1492
1501 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1509 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1510 { 1502 {
1511 parent_x = x; 1503 parent_x = x;
1512 parent_y = y; 1504 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 } 1506 }
1516 } 1507 }
1517 1508
1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1519 { 1510 {
1520 seen_resize = 1; 1511 seen_resize = 1;
1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1522 } 1513 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1530 1514
1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 } 1516 }
1533 break; 1517 break;
1534 1518
… …
1543 case SelectionRequest: 1527 case SelectionRequest:
1544 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1545 break; 1529 break;
1546 1530
1547 case MapNotify: 1531 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1559 mapped = 1; 1532 mapped = 1;
1560#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1561 text_blink_ev.start (); 1534 text_blink_ev.start ();
1562#endif 1535#endif
1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1859 } 1832 }
1860#endif 1833#endif
1861} 1834}
1862 1835
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1864void ecb_hot 1837void ecb_hot
1865rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1866{ 1839{
1867 make_current (); 1840 make_current ();
1868 1841
… …
1878 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1879 */ 1852 */
1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1882 { 1855 {
1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 } 1857 }
1892 1858
1893 break; 1859 break;
1894 } 1860 }
… …
2185 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2186 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2187 > multiClickTime / 2))) 2153 > multiClickTime / 2)))
2188 { 2154 {
2189 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2190 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2191 mouse_report (ev); 2157 mouse_report (ev);
2192 } 2158 }
2193#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2194 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2195 mouse_report (ev); 2161 mouse_report (ev);
2196#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2197 return; 2163 return;
2198 } 2164 }
2199 2165
… …
2386 } 2352 }
2387} 2353}
2388 2354
2389// read the next character 2355// read the next character
2390wchar_t ecb_hot 2356wchar_t ecb_hot
2391rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2392{ 2358{
2393 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2394 { 2360 {
2395 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2397 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2398 2364
2399 wchar_t wc; 2365 wchar_t wc;
2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2401 2367
… …
2422 return NOCHAR; 2388 return NOCHAR;
2423} 2389}
2424 2390
2425// read the next octet 2391// read the next octet
2426uint32_t ecb_hot 2392uint32_t ecb_hot
2427rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2428{ 2394{
2429 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2430 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2431 : NOCHAR; 2397 : NOCHAR;
2432} 2398}
2433 2399
2434static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2435 2401
2436wchar_t ecb_hot 2402wchar_t ecb_hot
2437rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2438{ 2404{
2439 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2440 2406
2441 if (c == NOCHAR) 2407 if (c == NOCHAR)
2442 throw out_of_input; 2408 throw out_of_input;
2443 2409
2444 return c; 2410 return c;
2445} 2411}
2446 2412
2447uint32_t ecb_hot 2413uint32_t ecb_hot
2448rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2449{ 2415{
2450 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2451 2417
2452 if (c == NOCHAR) 2418 if (c == NOCHAR)
2453 throw out_of_input; 2419 throw out_of_input;
… …
2726 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2728 } 2694 }
2729 break; 2695 break;
2730 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2731 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2732 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2733 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2736 break; 2703 break;
2704#endif
2737 2705
2738 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2739 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2740 scr_set_tab (1); 2708 scr_set_tab (1);
2741 break; 2709 break;
… …
2899 break; 2867 break;
2900 2868
2901 case '?': 2869 case '?':
2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2903 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2904 break; 2874 break;
2905 2875
2906 case '!': 2876 case '!':
2907 if (ch == CSI_70) 2877 if (ch == CSI_70)
2908 { 2878 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset (); 2880 scr_soft_reset ();
2911 2881
2912 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2914 2884
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2917 } 2887 }
2918 break; 2888 break;
… …
2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2949 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2950 break; 2920 break;
2951 2921
2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2954#ifdef ISO6429 2924#ifdef ISO6429
2955 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2956#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2957 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2958#endif 2928#endif
… …
3350 idx_b; 3320 idx_b;
3351} 3321}
3352 3322
3353/* 3323/*
3354 * Find the nearest color slot in the hidden color cube, 3324 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color. 3325 * adapt its value to the 32bit RGBA color.
3356 */ 3326 */
3357unsigned int 3327unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) 3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{ 3329{
3360 r &= 0xff; 3330 r &= 0xff;
3361 g &= 0xff; 3331 g &= 0xff;
3362 b &= 0xff; 3332 b &= 0xff;
3333 a &= 0xff;
3363 3334
3364 unsigned int color = (r << 16) | (g << 8) | b; 3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1)); 3336
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1)); 3337 /* we allow one of the 6 closest neighbouring colours */
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1)); 3338 /* to replace the current color, if they not used recently */
3339 static const signed char dxyz[][3] = {
3340 0, 0, 0,
3341 0, 0, 4,
3342 0, 4, 0,
3343 4, 0, 0,
3344 0, 4, 4,
3345 4, 4, 0,
3346 4, 0, 4,
3347 };
3348
3349 static const unsigned char color_level[8][32] = {
3350 // neighbour index
3351 {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},
3352 {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},
3353 {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},
3354 {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},
3355 // Red_levels/Green_levels/Blue_levels index
3356 {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},
3357 {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},
3358 {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},
3359 {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},
3360 };
3361
3362 unsigned int idx;
3363
3364 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3365 {
3366 unsigned int idx_r = color_level[ Red_levels - dxyz[n][0]][r / 8];
3367 unsigned int idx_g = color_level[Green_levels - dxyz[n][1]][g / 8];
3368 unsigned int idx_b = color_level[ Blue_levels - dxyz[n][2]][b / 8];
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); 3369 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3369 3370
3371 if (n == 0)
3372 idx = index;
3373
3374 if (rgb24_color[index] == color)
3375 {
3376 rgb24_seqno[index] = ++rgb24_sequence;
3377 return index + minTermCOLOR24;
3378 }
3379
3370 // minor issue: could update idx 0 few more times 3380 // minor issue: could update index 0 few more times
3371 if (rgb24_seqno[idx] == 0 3381 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3372 && rgb24_color[idx] == 0)
3373 goto update;
3374
3375 if (rgb24_color[idx] == color)
3376 return idx + minTermCOLOR24;
3377
3378 for (int i = idx_r - 1; i <= (signed) idx_r + 1; i++)
3379 {
3380 if (!IN_RANGE_EXC (i, 0, Red_levels))
3381 continue;
3382
3383 for (int j = idx_g - 1; j <= (signed) idx_g + 1; j++)
3384 {
3385 if (!IN_RANGE_EXC (j, 0, Green_levels))
3386 continue;
3387
3388 for (int k = idx_b - 1; k <= (signed) idx_b + 1; k++)
3389 {
3390 if (!IN_RANGE_EXC (k, 0, Blue_levels))
3391 continue;
3392
3393 unsigned int index = colorcube_index (i, j, k);
3394
3395 // minor issue: could update index 0 few more times
3396 if (rgb24_seqno[index] == 0
3397 && rgb24_color[index] == 0)
3398 {
3399 idx = index;
3400 goto update;
3401 }
3402
3403 if (rgb24_color[index] == color)
3404 return index + minTermCOLOR24;
3405
3406 if (IN_RANGE_INC (rgb24_seqno[idx], rgb24_seqno[index], 0x7fff))
3407 idx = index;
3408 }
3409 } 3382 {
3383 idx = index;
3384 goto update;
3385 }
3386
3387 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3388 // but also handles wrap around values good enough
3389 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3390 idx = index;
3410 } 3391 }
3411 3392
3412update: 3393update:
3413 rgb24_color[idx] = color; 3394 rgb24_color[idx] = color;
3414 rgb24_seqno[idx] = ++rgb24_sequence; 3395 rgb24_seqno[idx] = ++rgb24_sequence;
3415 3396
3416 idx += minTermCOLOR24; 3397 idx += minTermCOLOR24;
3417 pix_colors_focused [idx].free (this); 3398 pix_colors_focused [idx].free (this);
3418 pix_colors_focused [idx].set (this, rgba (r * 0x0101, 3399 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3419 g * 0x0101,
3420 b * 0x0101));
3421 update_fade_color (idx, false); 3400 update_fade_color (idx, false);
3422 3401
3423 return idx; 3402 return idx;
3424} 3403}
3425 3404
3426void 3405void
3427rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3406rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3428{ 3407{
3429 if (str[0] == '?' && !str[1]) 3408 if (str[0] == '?' && !str[1])
3430 { 3409 {
3410 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3411 return;
3412
3431 rgba c; 3413 rgba c;
3432 pix_colors_focused[color].get (c); 3414 pix_colors_focused[color].get (c);
3415 color -= minCOLOR;
3433 3416
3434#if XFT 3417#if XFT
3435 if (c.a != rgba::MAX_CC) 3418 if (c.a != rgba::MAX_CC)
3436 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp); 3419 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3437 else 3420 else
3438#endif 3421#endif
3439 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3422 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3440 } 3423 }
3441 else 3424 else
3442 set_window_color (color, str); 3425 set_window_color (color, str);
3443} 3426}
3444 3427
… …
3567 break; 3550 break;
3568#endif 3551#endif
3569 case URxvt_Color_border: 3552 case URxvt_Color_border:
3570 process_color_seq (op, Color_border, str, resp); 3553 process_color_seq (op, Color_border, str, resp);
3571 break; 3554 break;
3572
3573#if BG_IMAGE_FROM_ROOT
3574 case URxvt_Color_tint:
3575 process_color_seq (op, Color_tint, str, resp);
3576 {
3577 bool changed = false;
3578
3579 if (ISSET_PIXCOLOR (Color_tint))
3580 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3581
3582 if (changed)
3583 update_background ();
3584 }
3585
3586 break;
3587#endif
3588
3589#if BG_IMAGE_FROM_FILE
3590 case Rxvt_Pixmap:
3591 if (!strcmp (str, "?"))
3592 {
3593 char str[256];
3594 int h_scale = fimage.h_scale;
3595 int v_scale = fimage.v_scale;
3596 int h_align = fimage.h_align;
3597 int v_align = fimage.v_align;
3598
3599 sprintf (str, "[%dx%d+%d+%d]",
3600 h_scale, v_scale,
3601 h_align, v_align);
3602 process_xterm_seq (XTerm_title, str, CHAR_ST);
3603 }
3604 else
3605 {
3606 bool changed = false;
3607
3608 if (*str != ';')
3609 {
3610 try
3611 {
3612 fimage.set_file_geometry (this, str);
3613 changed = true;
3614 }
3615 catch (const class rxvt_failure_exception &e)
3616 {
3617 }
3618 }
3619 else
3620 {
3621 str++;
3622 if (fimage.set_geometry (str, true))
3623 changed = true;
3624 }
3625
3626 if (changed)
3627 {
3628 if (bg_window_position_sensitive ())
3629 {
3630 int x, y;
3631 get_window_origin (x, y);
3632 parent_x = x;
3633 parent_y = y;
3634 }
3635 update_background ();
3636 }
3637 }
3638 break;
3639#endif
3640 3555
3641 case XTerm_logfile: 3556 case XTerm_logfile:
3642 // TODO, when secure mode? 3557 // TODO, when secure mode?
3643 break; 3558 break;
3644 3559
… …
3801 { 1000, PrivMode_MouseX11 }, 3716 { 1000, PrivMode_MouseX11 },
3802 { 1002, PrivMode_MouseBtnEvent }, 3717 { 1002, PrivMode_MouseBtnEvent },
3803 { 1003, PrivMode_MouseAnyEvent }, 3718 { 1003, PrivMode_MouseAnyEvent },
3804#if ENABLE_FRILLS 3719#if ENABLE_FRILLS
3805 { 1004, PrivMode_FocusEvent }, 3720 { 1004, PrivMode_FocusEvent },
3806 { 1005, PrivMode_ExtModeMouse }, 3721 { 1005, PrivMode_ExtMouseUTF8 },
3722 { 1006, PrivMode_ExtMouseSGR },
3807#endif 3723#endif
3808 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3809 { 1011, PrivMode_Keypress }, // rxvt extension 3725 { 1011, PrivMode_Keypress }, // rxvt extension
3810#if ENABLE_FRILLS 3726#if ENABLE_FRILLS
3811 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3727 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3812#endif 3728#endif
3813 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
3814 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
3815 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
3816 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
… …
3820 { 2004, PrivMode_BracketPaste }, 3736 { 2004, PrivMode_BracketPaste },
3821 }; 3737 };
3822 3738
3823 if (nargs == 0) 3739 if (nargs == 0)
3824 return; 3740 return;
3741
3742 // DECRQM
3743 if (mode == 'p')
3744 {
3745 int status = 0;
3746 if (nargs != 1)
3747 return;
3748
3749 for (j = 0; j < ecb_array_length (argtopriv); j++)
3750 if (argtopriv[j].argval == arg[0])
3751 {
3752 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3753 break;
3754 }
3755
3756 tt_printf ("\33[?%d;%d$y", arg[0], status);
3757 return;
3758 }
3825 3759
3826 /* make lo/hi boolean */ 3760 /* make lo/hi boolean */
3827 if (mode == 'l') 3761 if (mode == 'l')
3828 mode = 0; /* reset */ 3762 mode = 0; /* reset */
3829 else if (mode == 'h') 3763 else if (mode == 'h')
… …
4057 case 35: 3991 case 35:
4058 case 36: 3992 case 36:
4059 case 37: 3993 case 37:
4060 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3994 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4061 break; 3995 break;
4062 case 38: // set fg color, ISO 8613-6
4063 if (nargs > i + 2 && arg[i + 1] == 5)
4064 {
4065 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4066 i += 2;
4067 }
4068 else if (nargs > i + 4 && arg[i + 1] == 2)
4069 {
4070 unsigned int r = arg[i + 2];
4071 unsigned int g = arg[i + 3];
4072 unsigned int b = arg[i + 4];
4073 unsigned int idx = map_rgb24_color (r, g, b);
4074 scr_color (idx, Color_fg);
4075 i += 4;
4076 }
4077 break;
4078 case 39: /* default fg */ 3996 case 39: /* default fg */
4079 scr_color (Color_fg, Color_fg); 3997 scr_color (Color_fg, Color_fg);
4080 break; 3998 break;
4081 3999
4082 case 40: 4000 case 40:
… …
4087 case 45: 4005 case 45:
4088 case 46: 4006 case 46:
4089 case 47: 4007 case 47:
4090 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4008 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4091 break; 4009 break;
4092 case 48: // set bg color, ISO 8613-6
4093 if (nargs > i + 2 && arg[i + 1] == 5)
4094 {
4095 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4096 i += 2;
4097 }
4098 else if (nargs > i + 4 && arg[i + 1] == 2)
4099 {
4100 unsigned int r = arg[i + 2];
4101 unsigned int g = arg[i + 3];
4102 unsigned int b = arg[i + 4];
4103 unsigned int idx = map_rgb24_color (r, g, b);
4104 scr_color (idx, Color_bg);
4105 i += 4;
4106 }
4107 break;
4108 case 49: /* default bg */ 4010 case 49: /* default bg */
4109 scr_color (Color_bg, Color_bg); 4011 scr_color (Color_bg, Color_bg);
4012 break;
4013
4014 case 38: // set fg color, ISO 8613-6
4015 case 48: // set bg color, ISO 8613-6
4016 {
4017 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4018 unsigned int idx;
4019
4020 if (nargs > i + 2 && arg[i + 1] == 5)
4021 {
4022 idx = minCOLOR + arg[i + 2];
4023 i += 2;
4024
4025 scr_color (idx, fgbg);
4026 }
4027 else if (nargs > i + 4 && arg[i + 1] == 2)
4028 {
4029 unsigned int r = arg[i + 2];
4030 unsigned int g = arg[i + 3];
4031 unsigned int b = arg[i + 4];
4032 unsigned int a = 0xff;
4033
4034 idx = map_rgb24_color (r, g, b, a);
4035
4036 i += 4;
4037
4038 scr_color (idx, fgbg);
4039 }
4040 }
4110 break; 4041 break;
4111 4042
4112 //case 50: // not variable spacing 4043 //case 50: // not variable spacing
4113 4044
4114#if !ENABLE_MINIMAL 4045#if !ENABLE_MINIMAL

Diff Legend

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