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.564 by sf-exg, Fri Mar 27 15:06:09 2015 UTC vs.
Revision 1.573 by root, Thu Jun 30 14:01:11 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)
… …
1635 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1638 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1639 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1640 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1641 { 1643 {
1642#endif
1643#if ISO_14755 1644#if ISO_14755
1644 // 5.4 1645 // 5.4
1645 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1646 { 1647 {
1647 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1696 * shouldn't be scrolling 1697 * shouldn't be scrolling
1697 */ 1698 */
1698 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1699 } 1700 }
1700#endif 1701#endif
1701#ifdef MOUSE_THRESHOLD
1702 } 1702 }
1703#endif
1704 } 1703 }
1705 } 1704 }
1706 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1707 { 1706 {
1708 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788 } 1787 }
1789#endif 1788#endif
1790#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1791 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1792 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1793#endif 1795#endif
1794 1796
1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1796 } 1798 }
1797} 1799}
… …
1805 want_refresh = 1; 1807 want_refresh = 1;
1806 1808
1807#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1808 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1809 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1810#endif 1815#endif
1811#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1812 if (iso14755buf) 1817 if (iso14755buf)
1813 { 1818 {
1814 iso14755buf = 0; 1819 iso14755buf = 0;
… …
3329 free (s); 3334 free (s);
3330 } 3335 }
3331 } 3336 }
3332} 3337}
3333 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 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = {
3376 0, 0, 0,
3377 0, 0, -1,
3378 0, 0, +1,
3379 0, -1, 0,
3380 0, +1, 0,
3381 -1, 0, 0,
3382 +1, 0, 0,
3383 };
3384
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 {
3387 int i = idx_r + dxyz[n][0];
3388 int j = idx_r + dxyz[n][1];
3389 int k = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (i, 0, Red_levels))
3392 continue;
3393
3394 if (!IN_RANGE_EXC (j, 0, Green_levels))
3395 continue;
3396
3397 if (!IN_RANGE_EXC (k, 0, Blue_levels))
3398 continue;
3399
3400 unsigned int index = colorcube_index (i, j, k);
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 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index;
3416 }
3417
3418update:
3419 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence;
3421
3422 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101,
3425 g * 0x0101,
3426 b * 0x0101));
3427 update_fade_color (idx, false);
3428
3429 return idx;
3430}
3431
3334void 3432void
3335rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3433rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3336{ 3434{
3337 if (str[0] == '?' && !str[1]) 3435 if (str[0] == '?' && !str[1])
3338 { 3436 {
3339 rgba c; 3437 rgba c;
3340 pix_colors_focused[color].get (c); 3438 pix_colors_focused[color].get (c);
3341 3439
3342#if XFT 3440#if XFT
3343 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3344 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3442 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3345 else 3443 else
3346#endif 3444#endif
3347 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3348 } 3446 }
3349 else 3447 else
… …
3708#endif 3806#endif
3709 { 1000, PrivMode_MouseX11 }, 3807 { 1000, PrivMode_MouseX11 },
3710 { 1002, PrivMode_MouseBtnEvent }, 3808 { 1002, PrivMode_MouseBtnEvent },
3711 { 1003, PrivMode_MouseAnyEvent }, 3809 { 1003, PrivMode_MouseAnyEvent },
3712#if ENABLE_FRILLS 3810#if ENABLE_FRILLS
3811 { 1004, PrivMode_FocusEvent },
3713 { 1005, PrivMode_ExtModeMouse }, 3812 { 1005, PrivMode_ExtModeMouse },
3714#endif 3813#endif
3715 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3814 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3716 { 1011, PrivMode_Keypress }, // rxvt extension 3815 { 1011, PrivMode_Keypress }, // rxvt extension
3717#if ENABLE_FRILLS 3816#if ENABLE_FRILLS
… …
3970 if (nargs > i + 2 && arg[i + 1] == 5) 4069 if (nargs > i + 2 && arg[i + 1] == 5)
3971 { 4070 {
3972 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4071 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3973 i += 2; 4072 i += 2;
3974 } 4073 }
4074 else if (nargs > i + 4 && arg[i + 1] == 2)
4075 {
4076 unsigned int r = arg[i + 2];
4077 unsigned int g = arg[i + 3];
4078 unsigned int b = arg[i + 4];
4079 unsigned int idx = map_rgb24_color (r, g, b);
4080 scr_color (idx, Color_fg);
4081 i += 4;
4082 }
3975 break; 4083 break;
3976 case 39: /* default fg */ 4084 case 39: /* default fg */
3977 scr_color (Color_fg, Color_fg); 4085 scr_color (Color_fg, Color_fg);
3978 break; 4086 break;
3979 4087
… …
3990 case 48: // set bg color, ISO 8613-6 4098 case 48: // set bg color, ISO 8613-6
3991 if (nargs > i + 2 && arg[i + 1] == 5) 4099 if (nargs > i + 2 && arg[i + 1] == 5)
3992 { 4100 {
3993 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4101 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3994 i += 2; 4102 i += 2;
4103 }
4104 else if (nargs > i + 4 && arg[i + 1] == 2)
4105 {
4106 unsigned int r = arg[i + 2];
4107 unsigned int g = arg[i + 3];
4108 unsigned int b = arg[i + 4];
4109 unsigned int idx = map_rgb24_color (r, g, b);
4110 scr_color (idx, Color_bg);
4111 i += 4;
3995 } 4112 }
3996 break; 4113 break;
3997 case 49: /* default bg */ 4114 case 49: /* default bg */
3998 scr_color (Color_bg, Color_bg); 4115 scr_color (Color_bg, Color_bg);
3999 break; 4116 break;

Diff Legend

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