[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

…		…
1787	}	1787	}
1788	#endif	1788	#endif
1789	#if ENABLE_FRILLS	1789	#if ENABLE_FRILLS
1790	if (option (Opt_urgentOnBell))	1790	if (option (Opt_urgentOnBell))
1791	set_urgency (0);	1791	set_urgency (0);
		1792
		1793	if (priv_modes & PrivMode_FocusEvent)
		1794	tt_printf ("\x1b[I");
1792	#endif	1795	#endif
1793		1796
1794	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1797	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795	}	1798	}
1796	}	1799	}
…		…
1804	want_refresh = 1;	1807	want_refresh = 1;
1805		1808
1806	#if ENABLE_FRILLS	1809	#if ENABLE_FRILLS
1807	if (option (Opt_urgentOnBell))	1810	if (option (Opt_urgentOnBell))
1808	set_urgency (0);	1811	set_urgency (0);
		1812
		1813	if (priv_modes & PrivMode_FocusEvent)
		1814	tt_printf ("\x1b[O");
1809	#endif	1815	#endif
1810	#if ENABLE_FRILLS \|\| ISO_14755	1816	#if ENABLE_FRILLS \|\| ISO_14755
1811	if (iso14755buf)	1817	if (iso14755buf)
1812	{	1818	{
1813	iso14755buf = 0;	1819	iso14755buf = 0;
…		…
3328	free (s);	3334	free (s);
3329	}	3335	}
3330	}	3336	}
3331	}	3337	}
3332		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 32bit RGBA color.
		3356	*/
		3357	unsigned int
		3358	rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
		3359	{
		3360	r &= 0xff;
		3361	g &= 0xff;
		3362	b &= 0xff;
		3363	a &= 0xff;
		3364
		3365	uint32_t color = (a << 24) \| (r << 16) \| (g << 8) \| b;
		3366
		3367	unsigned int idx_r = r * (Red_levels - 1) / 0xff;
		3368	unsigned int idx_g = g * (Green_levels - 1) / 0xff;
		3369	unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
		3370	unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
		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
		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	// like (rgb24_seqno[idx] > rgb24_seqno[index])
		3410	// but also handles wrap around values good enough
		3411	if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
		3412	idx = index;
		3413	}
		3414
		3415	update:
		3416	rgb24_color[idx] = color;
		3417	rgb24_seqno[idx] = ++rgb24_sequence;
		3418
		3419	idx += minTermCOLOR24;
		3420	pix_colors_focused [idx].free (this);
		3421	pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
		3422	update_fade_color (idx, false);
		3423
		3424	return idx;
		3425	}
		3426
3333	void	3427	void
3334	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3428	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3335	{	3429	{
3336	if (str[0] == '?' && !str[1])	3430	if (str[0] == '?' && !str[1])
3337	{	3431	{
…		…
3707	#endif	3801	#endif
3708	{ 1000, PrivMode_MouseX11 },	3802	{ 1000, PrivMode_MouseX11 },
3709	{ 1002, PrivMode_MouseBtnEvent },	3803	{ 1002, PrivMode_MouseBtnEvent },
3710	{ 1003, PrivMode_MouseAnyEvent },	3804	{ 1003, PrivMode_MouseAnyEvent },
3711	#if ENABLE_FRILLS	3805	#if ENABLE_FRILLS
		3806	{ 1004, PrivMode_FocusEvent },
3712	{ 1005, PrivMode_ExtModeMouse },	3807	{ 1005, PrivMode_ExtModeMouse },
3713	#endif	3808	#endif
3714	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3809	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715	{ 1011, PrivMode_Keypress }, // rxvt extension	3810	{ 1011, PrivMode_Keypress }, // rxvt extension
3716	#if ENABLE_FRILLS	3811	#if ENABLE_FRILLS
…		…
3963	case 35:	4058	case 35:
3964	case 36:	4059	case 36:
3965	case 37:	4060	case 37:
3966	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);	4061	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3967	break;	4062	break;
3968	case 38: // set fg color, ISO 8613-6
3969	if (nargs > i + 2 && arg[i + 1] == 5)
3970	{
3971	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3972	i += 2;
3973	}
3974	break;
3975	case 39: /* default fg */	4063	case 39: /* default fg */
3976	scr_color (Color_fg, Color_fg);	4064	scr_color (Color_fg, Color_fg);
3977	break;	4065	break;
3978		4066
3979	case 40:	4067	case 40:
…		…
3984	case 45:	4072	case 45:
3985	case 46:	4073	case 46:
3986	case 47:	4074	case 47:
3987	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);	4075	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3988	break;	4076	break;
3989	case 48: // set bg color, ISO 8613-6
3990	if (nargs > i + 2 && arg[i + 1] == 5)
3991	{
3992	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3993	i += 2;
3994	}
3995	break;
3996	case 49: /* default bg */	4077	case 49: /* default bg */
3997	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	scr_color (idx, fgbg);
		4093	}
		4094	else if (nargs > i + 4 && arg[i + 1] == 2)
		4095	{
		4096	unsigned int r = arg[i + 2];
		4097	unsigned int g = arg[i + 3];
		4098	unsigned int b = arg[i + 4];
		4099	unsigned int a = 0xff;
		4100
		4101	idx = map_rgb24_color (r, g, b, a);
		4102
		4103	i += 4;
		4104
		4105	scr_color (idx, fgbg);
		4106	}
		4107	}
3998	break;	4108	break;
3999		4109
4000	//case 50: // not variable spacing	4110	//case 50: // not variable spacing
4001		4111
4002	#if !ENABLE_MINIMAL	4112	#if !ENABLE_MINIMAL

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC vs. Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC