--- rxvt-unicode/src/command.C 2016/06/30 11:33:42 1.571 +++ rxvt-unicode/src/command.C 2016/06/30 17:22:54 1.580 @@ -3352,61 +3352,64 @@ /* * Find the nearest color slot in the hidden color cube, - * adapt its value to the 24bit RGB color. + * adapt its value to the 32bit RGBA color. */ unsigned int -rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b) +rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a) { r &= 0xff; g &= 0xff; b &= 0xff; + a &= 0xff; - unsigned int color = (r << 16) | (g << 8) | b; - unsigned int idx_r = r / (0xff / (Red_levels - 1)); - unsigned int idx_g = g / (0xff / (Green_levels - 1)); - unsigned int idx_b = b / (0xff / (Blue_levels - 1)); - unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); + uint32_t color = (a << 24) | (r << 16) | (g << 8) | b; - // minor issue: could update idx 0 few more times - if (rgb24_seqno[idx] == 0 - && rgb24_color[idx] == 0) - goto update; + unsigned int idx_r = r * (Red_levels - 1) / 0xff; + unsigned int idx_g = g * (Green_levels - 1) / 0xff; + unsigned int idx_b = b * (Blue_levels - 1) / 0xff; + unsigned int idx = colorcube_index (idx_r, idx_g, idx_b); - if (rgb24_color[idx] == color) - return idx + minTermCOLOR24; + /* we allow one of the 6 directly neighbouring colours */ + /* to replace the current color, if they not used recently */ + static const signed char dxyz[][3] = { + 0, 0, 0, + 0, 0, +1, + 0, 0, -1, + 0, +1, 0, + 0, -1, 0, + +1, 0, 0, + -1, 0, 0, + }; - for (int i = idx_r - 1; i <= (signed) idx_r + 1; i++) + for (int n = 0; n < ecb_array_length (dxyz); ++n) { - if (!IN_RANGE_EXC (i, 0, Red_levels)) - continue; - - for (int j = idx_g - 1; j <= (signed) idx_g + 1; j++) - { - if (!IN_RANGE_EXC (j, 0, Green_levels)) - continue; - - for (int k = idx_b - 1; k <= (signed) idx_b + 1; k++) - { - if (!IN_RANGE_EXC (k, 0, Blue_levels)) - continue; + int r = idx_r + dxyz[n][0]; + int g = idx_g + dxyz[n][1]; + int b = idx_b + dxyz[n][2]; - unsigned int index = colorcube_index (i, j, k); + if (!IN_RANGE_EXC (r, 0, Red_levels )) continue; + if (!IN_RANGE_EXC (g, 0, Green_levels)) continue; + if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue; - // minor issue: could update index 0 few more times - if (rgb24_seqno[index] == 0 - && rgb24_color[index] == 0) - { - idx = index; - goto update; - } + unsigned int index = colorcube_index (r, g, b); - if (rgb24_color[index] == color) - return index + minTermCOLOR24; + if (rgb24_color[index] == color) + { + rgb24_seqno[index] = ++rgb24_sequence; + return index + minTermCOLOR24; + } - if (IN_RANGE_INC (rgb24_seqno[idx], rgb24_seqno[index], 0x7fff)) - idx = index; - } + // minor issue: could update index 0 few more times + if ((rgb24_seqno[index] | rgb24_color[index]) == 0) + { + idx = index; + goto update; } + + // like (rgb24_seqno[idx] > rgb24_seqno[index]) + // but also handles wrap around values good enough + if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff) + idx = index; } update: @@ -3415,9 +3418,7 @@ idx += minTermCOLOR24; pix_colors_focused [idx].free (this); - pix_colors_focused [idx].set (this, rgba (r * 0x0101, - g * 0x0101, - b * 0x0101)); + pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101)); update_fade_color (idx, false); return idx; @@ -4059,22 +4060,6 @@ case 37: scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); break; - case 38: // set fg color, ISO 8613-6 - if (nargs > i + 2 && arg[i + 1] == 5) - { - scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); - i += 2; - } - else if (nargs > i + 4 && arg[i + 1] == 2) - { - unsigned int r = arg[i + 2]; - unsigned int g = arg[i + 3]; - unsigned int b = arg[i + 4]; - unsigned int idx = map_rgb24_color (r, g, b); - scr_color (idx, Color_fg); - i += 4; - } - break; case 39: /* default fg */ scr_color (Color_fg, Color_fg); break; @@ -4089,26 +4074,37 @@ case 47: scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); break; - case 48: // set bg color, ISO 8613-6 - if (nargs > i + 2 && arg[i + 1] == 5) - { - scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); - i += 2; - } - else if (nargs > i + 4 && arg[i + 1] == 2) - { - unsigned int r = arg[i + 2]; - unsigned int g = arg[i + 3]; - unsigned int b = arg[i + 4]; - unsigned int idx = map_rgb24_color (r, g, b); - scr_color (idx, Color_bg); - i += 4; - } - break; case 49: /* default bg */ scr_color (Color_bg, Color_bg); break; + case 38: // set fg color, ISO 8613-6 + case 48: // set bg color, ISO 8613-6 + { + unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg; + unsigned int idx; + + if (nargs > i + 2 && arg[i + 1] == 5) + { + idx = minCOLOR + arg[i + 2]; + i += 2; + } + else if (nargs > i + 4 && arg[i + 1] == 2) + { + unsigned int r = arg[i + 2]; + unsigned int g = arg[i + 3]; + unsigned int b = arg[i + 4]; + unsigned int a = 0xff; + + idx = map_rgb24_color (r, g, b, a); + + i += 4; + } + + scr_color (idx, fgbg); + } + break; + //case 50: // not variable spacing #if !ENABLE_MINIMAL