| … | |
… | |
| 3332 | { |
3332 | { |
| 3333 | process_xterm_seq (arg, s, eh); |
3333 | process_xterm_seq (arg, s, eh); |
| 3334 | free (s); |
3334 | free (s); |
| 3335 | } |
3335 | } |
| 3336 | } |
3336 | } |
|
|
3337 | } |
|
|
3338 | |
|
|
3339 | static unsigned int |
|
|
3340 | colorcube_index (unsigned int idx_r, |
|
|
3341 | unsigned int idx_g, |
|
|
3342 | unsigned int idx_b) |
|
|
3343 | { |
|
|
3344 | assert (idx_r < Red_levels); |
|
|
3345 | assert (idx_g < Green_levels); |
|
|
3346 | assert (idx_b < Blue_levels); |
|
|
3347 | |
|
|
3348 | return idx_r * Blue_levels * Green_levels + |
|
|
3349 | idx_g * Blue_levels + |
|
|
3350 | idx_b; |
|
|
3351 | } |
|
|
3352 | |
|
|
3353 | /* |
|
|
3354 | * Find the nearest color slot in the hidden color cube, |
|
|
3355 | * adapt its value to the 24bit RGB color. |
|
|
3356 | */ |
|
|
3357 | unsigned int |
|
|
3358 | rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) |
|
|
3359 | { |
|
|
3360 | r &= 0xff; |
|
|
3361 | g &= 0xff; |
|
|
3362 | b &= 0xff; |
|
|
3363 | |
|
|
3364 | unsigned int color = (r << 16) | (g << 8) | b; |
|
|
3365 | unsigned int idx_r = r / (0xff / (Red_levels - 1)); |
|
|
3366 | unsigned int idx_g = g / (0xff / (Green_levels - 1)); |
|
|
3367 | unsigned int idx_b = b / (0xff / (Blue_levels - 1)); |
|
|
3368 | unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); |
|
|
3369 | |
|
|
3370 | if (rgb24_color[idx] == color) |
|
|
3371 | return idx + minTermCOLOR24; |
|
|
3372 | |
|
|
3373 | /* we allow one of the 6 directly neighbouring colours */ |
|
|
3374 | /* to replace the current color, if they not used recently */ |
|
|
3375 | static const signed char dxyz[][3] = { |
|
|
3376 | 0, 0, 0, |
|
|
3377 | 0, 0, -1, |
|
|
3378 | 0, 0, +1, |
|
|
3379 | 0, -1, 0, |
|
|
3380 | 0, +1, 0, |
|
|
3381 | -1, 0, 0, |
|
|
3382 | +1, 0, 0, |
|
|
3383 | }; |
|
|
3384 | |
|
|
3385 | for (int n = 0; n < ecb_array_length (dxyz); ++n) |
|
|
3386 | { |
|
|
3387 | int r = idx_r + dxyz[n][0]; |
|
|
3388 | int g = idx_r + dxyz[n][1]; |
|
|
3389 | int b = idx_r + dxyz[n][2]; |
|
|
3390 | |
|
|
3391 | if (!IN_RANGE_EXC (r, 0, Red_levels)) |
|
|
3392 | continue; |
|
|
3393 | |
|
|
3394 | if (!IN_RANGE_EXC (g, 0, Green_levels)) |
|
|
3395 | continue; |
|
|
3396 | |
|
|
3397 | if (!IN_RANGE_EXC (b, 0, Blue_levels)) |
|
|
3398 | continue; |
|
|
3399 | |
|
|
3400 | unsigned int index = colorcube_index (r, g, b); |
|
|
3401 | |
|
|
3402 | // minor issue: could update index 0 few more times |
|
|
3403 | if ((rgb24_seqno[index] | rgb24_color[index]) == 0) |
|
|
3404 | { |
|
|
3405 | idx = index; |
|
|
3406 | goto update; |
|
|
3407 | } |
|
|
3408 | |
|
|
3409 | if (rgb24_color[index] == color) |
|
|
3410 | return index + minTermCOLOR24; |
|
|
3411 | |
|
|
3412 | // like (rgb24_seqno[idx] > rgb24_seqno[index]) |
|
|
3413 | // but also handles wrap around values good enough |
|
|
3414 | if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) |
|
|
3415 | idx = index; |
|
|
3416 | } |
|
|
3417 | |
|
|
3418 | update: |
|
|
3419 | rgb24_color[idx] = color; |
|
|
3420 | rgb24_seqno[idx] = ++rgb24_sequence; |
|
|
3421 | |
|
|
3422 | idx += minTermCOLOR24; |
|
|
3423 | pix_colors_focused [idx].free (this); |
|
|
3424 | pix_colors_focused [idx].set (this, rgba (r * 0x0101, |
|
|
3425 | g * 0x0101, |
|
|
3426 | b * 0x0101)); |
|
|
3427 | update_fade_color (idx, false); |
|
|
3428 | |
|
|
3429 | return idx; |
| 3337 | } |
3430 | } |
| 3338 | |
3431 | |
| 3339 | void |
3432 | void |
| 3340 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3433 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
| 3341 | { |
3434 | { |
| … | |
… | |
| 3976 | if (nargs > i + 2 && arg[i + 1] == 5) |
4069 | if (nargs > i + 2 && arg[i + 1] == 5) |
| 3977 | { |
4070 | { |
| 3978 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
4071 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
| 3979 | i += 2; |
4072 | i += 2; |
| 3980 | } |
4073 | } |
|
|
4074 | else if (nargs > i + 4 && arg[i + 1] == 2) |
|
|
4075 | { |
|
|
4076 | unsigned int r = arg[i + 2]; |
|
|
4077 | unsigned int g = arg[i + 3]; |
|
|
4078 | unsigned int b = arg[i + 4]; |
|
|
4079 | unsigned int idx = map_rgb24_color (r, g, b); |
|
|
4080 | scr_color (idx, Color_fg); |
|
|
4081 | i += 4; |
|
|
4082 | } |
| 3981 | break; |
4083 | break; |
| 3982 | case 39: /* default fg */ |
4084 | case 39: /* default fg */ |
| 3983 | scr_color (Color_fg, Color_fg); |
4085 | scr_color (Color_fg, Color_fg); |
| 3984 | break; |
4086 | break; |
| 3985 | |
4087 | |
| … | |
… | |
| 3996 | case 48: // set bg color, ISO 8613-6 |
4098 | case 48: // set bg color, ISO 8613-6 |
| 3997 | if (nargs > i + 2 && arg[i + 1] == 5) |
4099 | if (nargs > i + 2 && arg[i + 1] == 5) |
| 3998 | { |
4100 | { |
| 3999 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
4101 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
| 4000 | i += 2; |
4102 | i += 2; |
|
|
4103 | } |
|
|
4104 | else if (nargs > i + 4 && arg[i + 1] == 2) |
|
|
4105 | { |
|
|
4106 | unsigned int r = arg[i + 2]; |
|
|
4107 | unsigned int g = arg[i + 3]; |
|
|
4108 | unsigned int b = arg[i + 4]; |
|
|
4109 | unsigned int idx = map_rgb24_color (r, g, b); |
|
|
4110 | scr_color (idx, Color_bg); |
|
|
4111 | i += 4; |
| 4001 | } |
4112 | } |
| 4002 | break; |
4113 | break; |
| 4003 | case 49: /* default bg */ |
4114 | case 49: /* default bg */ |
| 4004 | scr_color (Color_bg, Color_bg); |
4115 | scr_color (Color_bg, Color_bg); |
| 4005 | break; |
4116 | break; |
