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.572 by sf-exg, Thu Jun 30 12:50:36 2016 UTC vs.
Revision 1.580 by root, Thu Jun 30 17:22:54 2016 UTC

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

Diff Legend

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