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.565 by root, Tue Apr 28 12:38:19 2015 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

… …
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 3 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
… …
1612 case MotionNotify: 1612 case MotionNotify:
1613#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1614 if (hidden_pointer) 1614 if (hidden_pointer)
1615 pointer_unblank (); 1615 pointer_unblank ();
1616#endif 1616#endif
1617 if (!bypass_keystate
1617 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1618 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1619 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1622 break;
1622 1623
1623 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1786 } 1787 }
1787#endif 1788#endif
1788#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1789 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1790 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1791#endif 1795#endif
1792 1796
1793 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1794 } 1798 }
1795} 1799}
… …
1803 want_refresh = 1; 1807 want_refresh = 1;
1804 1808
1805#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1806 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1807 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1808#endif 1815#endif
1809#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1810 if (iso14755buf) 1817 if (iso14755buf)
1811 { 1818 {
1812 iso14755buf = 0; 1819 iso14755buf = 0;
… …
3327 free (s); 3334 free (s);
3328 } 3335 }
3329 } 3336 }
3330} 3337}
3331 3338
3339static unsigned int
3340colorcube_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 */
3357unsigned int
3358rxvt_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
3415update:
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
3332void 3427void
3333rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3334{ 3429{
3335 if (str[0] == '?' && !str[1]) 3430 if (str[0] == '?' && !str[1])
3336 { 3431 {
3337 rgba c; 3432 rgba c;
3338 pix_colors_focused[color].get (c); 3433 pix_colors_focused[color].get (c);
3339 3434
3340#if XFT 3435#if XFT
3341 if (c.a != rgba::MAX_CC) 3436 if (c.a != rgba::MAX_CC)
3342 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3343 else 3438 else
3344#endif 3439#endif
3345 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3346 } 3441 }
3347 else 3442 else
… …
3706#endif 3801#endif
3707 { 1000, PrivMode_MouseX11 }, 3802 { 1000, PrivMode_MouseX11 },
3708 { 1002, PrivMode_MouseBtnEvent }, 3803 { 1002, PrivMode_MouseBtnEvent },
3709 { 1003, PrivMode_MouseAnyEvent }, 3804 { 1003, PrivMode_MouseAnyEvent },
3710#if ENABLE_FRILLS 3805#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent },
3711 { 1005, PrivMode_ExtModeMouse }, 3807 { 1005, PrivMode_ExtModeMouse },
3712#endif 3808#endif
3713 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3714 { 1011, PrivMode_Keypress }, // rxvt extension 3810 { 1011, PrivMode_Keypress }, // rxvt extension
3715#if ENABLE_FRILLS 3811#if ENABLE_FRILLS
… …
3962 case 35: 4058 case 35:
3963 case 36: 4059 case 36:
3964 case 37: 4060 case 37:
3965 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4061 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3966 break; 4062 break;
3967 case 38: // set fg color, ISO 8613-6
3968 if (nargs > i + 2 && arg[i + 1] == 5)
3969 {
3970 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3971 i += 2;
3972 }
3973 break;
3974 case 39: /* default fg */ 4063 case 39: /* default fg */
3975 scr_color (Color_fg, Color_fg); 4064 scr_color (Color_fg, Color_fg);
3976 break; 4065 break;
3977 4066
3978 case 40: 4067 case 40:
… …
3983 case 45: 4072 case 45:
3984 case 46: 4073 case 46:
3985 case 47: 4074 case 47:
3986 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4075 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3987 break; 4076 break;
3988 case 48: // set bg color, ISO 8613-6
3989 if (nargs > i + 2 && arg[i + 1] == 5)
3990 {
3991 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3992 i += 2;
3993 }
3994 break;
3995 case 49: /* default bg */ 4077 case 49: /* default bg */
3996 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 }
3997 break; 4108 break;
3998 4109
3999 //case 50: // not variable spacing 4110 //case 50: // not variable spacing
4000 4111
4001#if !ENABLE_MINIMAL 4112#if !ENABLE_MINIMAL

Diff Legend

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