… | |
… | |
3350 | idx_b; |
3350 | idx_b; |
3351 | } |
3351 | } |
3352 | |
3352 | |
3353 | /* |
3353 | /* |
3354 | * Find the nearest color slot in the hidden color cube, |
3354 | * Find the nearest color slot in the hidden color cube, |
3355 | * adapt its value to the 24bit RGB color. |
3355 | * adapt its value to the 32bit RGBA color. |
3356 | */ |
3356 | */ |
3357 | unsigned int |
3357 | unsigned int |
3358 | rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) |
3358 | rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a) |
3359 | { |
3359 | { |
3360 | r &= 0xff; |
3360 | r &= 0xff; |
3361 | g &= 0xff; |
3361 | g &= 0xff; |
3362 | b &= 0xff; |
3362 | b &= 0xff; |
|
|
3363 | a &= 0xff; |
3363 | |
3364 | |
3364 | unsigned int color = (r << 16) | (g << 8) | b; |
3365 | uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; |
|
|
3366 | |
3365 | unsigned int idx_r = r * (Red_levels - 1) / 0xff; |
3367 | unsigned int idx_r = r * (Red_levels - 1) / 0xff; |
3366 | unsigned int idx_g = g * (Green_levels - 1) / 0xff; |
3368 | unsigned int idx_g = g * (Green_levels - 1) / 0xff; |
3367 | unsigned int idx_b = b * (Blue_levels - 1) / 0xff; |
3369 | unsigned int idx_b = b * (Blue_levels - 1) / 0xff; |
3368 | unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); |
3370 | unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); |
3369 | |
|
|
3370 | if (rgb24_color[idx] == color) |
|
|
3371 | return idx + minTermCOLOR24; |
|
|
3372 | |
3371 | |
3373 | /* we allow one of the 6 directly neighbouring colours */ |
3372 | /* we allow one of the 6 directly neighbouring colours */ |
3374 | /* to replace the current color, if they not used recently */ |
3373 | /* to replace the current color, if they not used recently */ |
3375 | static const signed char dxyz[][3] = { |
3374 | static const signed char dxyz[][3] = { |
3376 | 0, 0, 0, |
3375 | 0, 0, 0, |
… | |
… | |
3383 | }; |
3382 | }; |
3384 | |
3383 | |
3385 | for (int n = 0; n < ecb_array_length (dxyz); ++n) |
3384 | for (int n = 0; n < ecb_array_length (dxyz); ++n) |
3386 | { |
3385 | { |
3387 | int r = idx_r + dxyz[n][0]; |
3386 | int r = idx_r + dxyz[n][0]; |
3388 | int g = idx_r + dxyz[n][1]; |
3387 | int g = idx_g + dxyz[n][1]; |
3389 | int b = idx_r + dxyz[n][2]; |
3388 | int b = idx_b + dxyz[n][2]; |
3390 | |
3389 | |
3391 | if (!IN_RANGE_EXC (r, 0, Red_levels )) continue; |
3390 | if (!IN_RANGE_EXC (r, 0, Red_levels )) continue; |
3392 | if (!IN_RANGE_EXC (g, 0, Green_levels)) continue; |
3391 | if (!IN_RANGE_EXC (g, 0, Green_levels)) continue; |
3393 | if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue; |
3392 | if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue; |
3394 | |
3393 | |
3395 | unsigned int index = colorcube_index (r, g, b); |
3394 | unsigned int index = colorcube_index (r, g, b); |
3396 | |
3395 | |
|
|
3396 | if (rgb24_color[index] == color) |
|
|
3397 | { |
|
|
3398 | rgb24_seqno[index] = ++rgb24_sequence; |
|
|
3399 | return index + minTermCOLOR24; |
|
|
3400 | } |
|
|
3401 | |
3397 | // minor issue: could update index 0 few more times |
3402 | // minor issue: could update index 0 few more times |
3398 | if ((rgb24_seqno[index] | rgb24_color[index]) == 0) |
3403 | if ((rgb24_seqno[index] | rgb24_color[index]) == 0) |
3399 | { |
3404 | { |
3400 | idx = index; |
3405 | idx = index; |
3401 | goto update; |
3406 | goto update; |
3402 | } |
3407 | } |
3403 | |
|
|
3404 | if (rgb24_color[index] == color) |
|
|
3405 | return index + minTermCOLOR24; |
|
|
3406 | |
3408 | |
3407 | // like (rgb24_seqno[idx] > rgb24_seqno[index]) |
3409 | // like (rgb24_seqno[idx] > rgb24_seqno[index]) |
3408 | // but also handles wrap around values good enough |
3410 | // but also handles wrap around values good enough |
3409 | if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) |
3411 | if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) |
3410 | idx = index; |
3412 | idx = index; |
… | |
… | |
3414 | rgb24_color[idx] = color; |
3416 | rgb24_color[idx] = color; |
3415 | rgb24_seqno[idx] = ++rgb24_sequence; |
3417 | rgb24_seqno[idx] = ++rgb24_sequence; |
3416 | |
3418 | |
3417 | idx += minTermCOLOR24; |
3419 | idx += minTermCOLOR24; |
3418 | pix_colors_focused [idx].free (this); |
3420 | pix_colors_focused [idx].free (this); |
3419 | pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101)); |
3421 | pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101)); |
3420 | update_fade_color (idx, false); |
3422 | update_fade_color (idx, false); |
3421 | |
3423 | |
3422 | return idx; |
3424 | return idx; |
3423 | } |
3425 | } |
3424 | |
3426 | |
… | |
… | |
4056 | case 35: |
4058 | case 35: |
4057 | case 36: |
4059 | case 36: |
4058 | case 37: |
4060 | case 37: |
4059 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
4061 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
4060 | break; |
4062 | break; |
4061 | case 38: // set fg color, ISO 8613-6 |
|
|
4062 | if (nargs > i + 2 && arg[i + 1] == 5) |
|
|
4063 | { |
|
|
4064 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
|
|
4065 | i += 2; |
|
|
4066 | } |
|
|
4067 | else if (nargs > i + 4 && arg[i + 1] == 2) |
|
|
4068 | { |
|
|
4069 | unsigned int r = arg[i + 2]; |
|
|
4070 | unsigned int g = arg[i + 3]; |
|
|
4071 | unsigned int b = arg[i + 4]; |
|
|
4072 | unsigned int idx = map_rgb24_color (r, g, b); |
|
|
4073 | scr_color (idx, Color_fg); |
|
|
4074 | i += 4; |
|
|
4075 | } |
|
|
4076 | break; |
|
|
4077 | case 39: /* default fg */ |
4063 | case 39: /* default fg */ |
4078 | scr_color (Color_fg, Color_fg); |
4064 | scr_color (Color_fg, Color_fg); |
4079 | break; |
4065 | break; |
4080 | |
4066 | |
4081 | case 40: |
4067 | case 40: |
… | |
… | |
4086 | case 45: |
4072 | case 45: |
4087 | case 46: |
4073 | case 46: |
4088 | case 47: |
4074 | case 47: |
4089 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
4075 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
4090 | break; |
4076 | break; |
4091 | case 48: // set bg color, ISO 8613-6 |
|
|
4092 | if (nargs > i + 2 && arg[i + 1] == 5) |
|
|
4093 | { |
|
|
4094 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
|
|
4095 | i += 2; |
|
|
4096 | } |
|
|
4097 | else if (nargs > i + 4 && arg[i + 1] == 2) |
|
|
4098 | { |
|
|
4099 | unsigned int r = arg[i + 2]; |
|
|
4100 | unsigned int g = arg[i + 3]; |
|
|
4101 | unsigned int b = arg[i + 4]; |
|
|
4102 | unsigned int idx = map_rgb24_color (r, g, b); |
|
|
4103 | scr_color (idx, Color_bg); |
|
|
4104 | i += 4; |
|
|
4105 | } |
|
|
4106 | break; |
|
|
4107 | case 49: /* default bg */ |
4077 | case 49: /* default bg */ |
4108 | scr_color (Color_bg, Color_bg); |
4078 | scr_color (Color_bg, Color_bg); |
|
|
4079 | break; |
|
|
4080 | |
|
|
4081 | case 38: // set fg color, ISO 8613-6 |
|
|
4082 | case 48: // set bg color, ISO 8613-6 |
|
|
4083 | { |
|
|
4084 | unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; |
|
|
4085 | unsigned int idx; |
|
|
4086 | |
|
|
4087 | if (nargs > i + 2 && arg[i + 1] == 5) |
|
|
4088 | { |
|
|
4089 | idx = minCOLOR + arg[i + 2]; |
|
|
4090 | i += 2; |
|
|
4091 | } |
|
|
4092 | else if (nargs > i + 4 && arg[i + 1] == 2) |
|
|
4093 | { |
|
|
4094 | unsigned int r = arg[i + 2]; |
|
|
4095 | unsigned int g = arg[i + 3]; |
|
|
4096 | unsigned int b = arg[i + 4]; |
|
|
4097 | unsigned int a = 0xff; |
|
|
4098 | |
|
|
4099 | idx = map_rgb24_color (r, g, b, a); |
|
|
4100 | |
|
|
4101 | i += 4; |
|
|
4102 | } |
|
|
4103 | |
|
|
4104 | scr_color (idx, fgbg); |
|
|
4105 | } |
4109 | break; |
4106 | break; |
4110 | |
4107 | |
4111 | //case 50: // not variable spacing |
4108 | //case 50: // not variable spacing |
4112 | |
4109 | |
4113 | #if !ENABLE_MINIMAL |
4110 | #if !ENABLE_MINIMAL |