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.566 by sf-exg, Sat Sep 12 14:03:35 2015 UTC vs.
Revision 1.571 by sf-exg, Thu Jun 30 11:33:42 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.
… …
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
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 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1));
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1));
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1));
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 // minor issue: could update idx 0 few more times
3371 if (rgb24_seqno[idx] == 0
3372 && rgb24_color[idx] == 0)
3373 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 {
3385 if (!IN_RANGE_EXC (j, 0, Green_levels))
3386 continue;
3387
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 if (IN_RANGE_INC (rgb24_seqno[idx], rgb24_seqno[index], 0x7fff))
3407 idx = index;
3408 }
3409 }
3410 }
3411
3412update:
3413 rgb24_color[idx] = color;
3414 rgb24_seqno[idx] = ++rgb24_sequence;
3415
3416 idx += minTermCOLOR24;
3417 pix_colors_focused [idx].free (this);
3418 pix_colors_focused [idx].set (this, rgba (r * 0x0101,
3419 g * 0x0101,
3420 b * 0x0101));
3421 update_fade_color (idx, false);
3422
3423 return idx;
3424}
3425
3333void 3426void
3334rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3427rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3335{ 3428{
3336 if (str[0] == '?' && !str[1]) 3429 if (str[0] == '?' && !str[1])
3337 { 3430 {
3338 rgba c; 3431 rgba c;
3339 pix_colors_focused[color].get (c); 3432 pix_colors_focused[color].get (c);
3340 3433
3341#if XFT 3434#if XFT
3342 if (c.a != rgba::MAX_CC) 3435 if (c.a != rgba::MAX_CC)
3343 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3436 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3344 else 3437 else
3345#endif 3438#endif
3346 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3439 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3347 } 3440 }
3348 else 3441 else
… …
3707#endif 3800#endif
3708 { 1000, PrivMode_MouseX11 }, 3801 { 1000, PrivMode_MouseX11 },
3709 { 1002, PrivMode_MouseBtnEvent }, 3802 { 1002, PrivMode_MouseBtnEvent },
3710 { 1003, PrivMode_MouseAnyEvent }, 3803 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS 3804#if ENABLE_FRILLS
3805 { 1004, PrivMode_FocusEvent },
3712 { 1005, PrivMode_ExtModeMouse }, 3806 { 1005, PrivMode_ExtModeMouse },
3713#endif 3807#endif
3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3808 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3715 { 1011, PrivMode_Keypress }, // rxvt extension 3809 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS 3810#if ENABLE_FRILLS
… …
3969 if (nargs > i + 2 && arg[i + 1] == 5) 4063 if (nargs > i + 2 && arg[i + 1] == 5)
3970 { 4064 {
3971 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4065 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3972 i += 2; 4066 i += 2;
3973 } 4067 }
4068 else if (nargs > i + 4 && arg[i + 1] == 2)
4069 {
4070 unsigned int r = arg[i + 2];
4071 unsigned int g = arg[i + 3];
4072 unsigned int b = arg[i + 4];
4073 unsigned int idx = map_rgb24_color (r, g, b);
4074 scr_color (idx, Color_fg);
4075 i += 4;
4076 }
3974 break; 4077 break;
3975 case 39: /* default fg */ 4078 case 39: /* default fg */
3976 scr_color (Color_fg, Color_fg); 4079 scr_color (Color_fg, Color_fg);
3977 break; 4080 break;
3978 4081
… …
3989 case 48: // set bg color, ISO 8613-6 4092 case 48: // set bg color, ISO 8613-6
3990 if (nargs > i + 2 && arg[i + 1] == 5) 4093 if (nargs > i + 2 && arg[i + 1] == 5)
3991 { 4094 {
3992 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4095 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3993 i += 2; 4096 i += 2;
4097 }
4098 else if (nargs > i + 4 && arg[i + 1] == 2)
4099 {
4100 unsigned int r = arg[i + 2];
4101 unsigned int g = arg[i + 3];
4102 unsigned int b = arg[i + 4];
4103 unsigned int idx = map_rgb24_color (r, g, b);
4104 scr_color (idx, Color_bg);
4105 i += 4;
3994 } 4106 }
3995 break; 4107 break;
3996 case 49: /* default bg */ 4108 case 49: /* default bg */
3997 scr_color (Color_bg, Color_bg); 4109 scr_color (Color_bg, Color_bg);
3998 break; 4110 break;

Diff Legend

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