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.557 by sf-exg, Thu Aug 21 15:58:29 2014 UTC vs.
Revision 1.577 by root, Thu Jun 30 17:00:18 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.
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
1034 1034
1035#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void 1036void
1037rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1038{ 1038{
1039 if (!focus)
1040 return;
1041
1039 if (hidden_cursor) 1042 if (hidden_cursor)
1040 { 1043 {
1041 hidden_cursor = 0; 1044 hidden_cursor = 0;
1042 want_refresh = 1; 1045 want_refresh = 1;
1043 } 1046 }
1044 1047
1045 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1047 else 1050 else
1048 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1049} 1052}
1050 1053
… …
1239 1242
1240void ecb_cold 1243void ecb_cold
1241rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1242{ 1245{
1243 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1244 recolour_cursor (); 1247 recolor_cursor ();
1245 1248
1246#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1247 hidden_pointer = 0; 1250 hidden_pointer = 0;
1248 1251
1249 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1609 case MotionNotify: 1612 case MotionNotify:
1610#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1614 if (hidden_pointer)
1612 pointer_unblank (); 1615 pointer_unblank ();
1613#endif 1616#endif
1617 if (!bypass_keystate
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1616 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1622 break;
1619 1623
1620 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1632 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1634 &ev.xbutton.state); 1638 &ev.xbutton.state);
1635#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1636 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1638 { 1643 {
1639#endif
1640#if ISO_14755 1644#if ISO_14755
1641 // 5.4 1645 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 { 1647 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1693 * shouldn't be scrolling 1697 * shouldn't be scrolling
1694 */ 1698 */
1695 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1696 } 1700 }
1697#endif 1701#endif
1698#ifdef MOUSE_THRESHOLD
1699 } 1702 }
1700#endif
1701 } 1703 }
1702 } 1704 }
1703 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)
1704 { 1706 {
1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1779#endif 1781#endif
1780#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1782 { 1784 {
1783 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1786 scr_recolor ();
1785 } 1787 }
1786#endif 1788#endif
1787#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1790#endif 1795#endif
1791 1796
1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 } 1798 }
1794} 1799}
… …
1802 want_refresh = 1; 1807 want_refresh = 1;
1803 1808
1804#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1805 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1806 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1807#endif 1815#endif
1808#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1809 if (iso14755buf) 1817 if (iso14755buf)
1810 { 1818 {
1811 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1826#endif 1834#endif
1827#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1829 { 1837 {
1830 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1839 scr_recolor ();
1832 } 1840 }
1833#endif 1841#endif
1834 1842
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1844 }
1837} 1845}
1838 1846
1839void ecb_cold 1847void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1849{
1842#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1844 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1845 rgba c; 1856 rgba c;
1846 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1859 }
1849#endif 1860#endif
… …
2571 scr_charset_choose (0); 2582 scr_charset_choose (0);
2572 break; 2583 break;
2573 2584
2574#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2586 // 8-bit controls
2576 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2577 process_dcs_seq (); 2588 process_dcs_seq ();
2578 break; 2589 break;
2579 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2580 process_csi_seq (); 2591 process_csi_seq ();
2581 break; 2592 break;
2582 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2583 process_osc_seq (); 2594 process_osc_seq ();
2584 break; 2595 break;
2585#endif 2596#endif
2586 } 2597 }
2587} 2598}
… …
3323 free (s); 3334 free (s);
3324 } 3335 }
3325 } 3336 }
3326} 3337}
3327 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 * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
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 r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3392 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3393 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3394
3395 unsigned int index = colorcube_index (r, g, b);
3396
3397 // minor issue: could update index 0 few more times
3398 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3399 {
3400 idx = index;
3401 goto update;
3402 }
3403
3404 if (rgb24_color[index] == color)
3405 return index + minTermCOLOR24;
3406
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3410 idx = index;
3411 }
3412
3413update:
3414 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence;
3416
3417 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3420 update_fade_color (idx, false);
3421
3422 return idx;
3423}
3424
3328void 3425void
3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3330{ 3427{
3331 if (str[0] == '?' && !str[1]) 3428 if (str[0] == '?' && !str[1])
3332 { 3429 {
3333 rgba c; 3430 rgba c;
3334 pix_colors_focused[color].get (c); 3431 pix_colors_focused[color].get (c);
3335 3432
3336#if XFT 3433#if XFT
3337 if (c.a != rgba::MAX_CC) 3434 if (c.a != rgba::MAX_CC)
3338 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3339 else 3436 else
3340#endif 3437#endif
3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3342 } 3439 }
3343 else 3440 else
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3777 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3778 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3779 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3780 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3781 { 9, PrivMode_MouseX10 },
3782 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3783 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3784 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3785 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3786#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3787 { scrollBar_esc, PrivMode_scrollBar },
… …
3701#endif 3799#endif
3702 { 1000, PrivMode_MouseX11 }, 3800 { 1000, PrivMode_MouseX11 },
3703 { 1002, PrivMode_MouseBtnEvent }, 3801 { 1002, PrivMode_MouseBtnEvent },
3704 { 1003, PrivMode_MouseAnyEvent }, 3802 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS 3803#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent },
3706 { 1005, PrivMode_ExtModeMouse }, 3805 { 1005, PrivMode_ExtModeMouse },
3707#endif 3806#endif
3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3709 { 1011, PrivMode_Keypress }, // rxvt extension 3808 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS 3809#if ENABLE_FRILLS
… …
3798 scrollBar.map (state); 3897 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3898 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3899 scr_touch (true);
3801 break; 3900 break;
3802#endif 3901#endif
3902#ifdef CURSOR_BLINK
3903 case 12:
3904 cursor_blink_reset ();
3905 break;
3906#endif
3803 case 25: /* visible/invisible cursor */ 3907 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3908 scr_cursor_visible (state);
3805 break; 3909 break;
3806 /* case 35: - shift keys */ 3910 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3911 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 4016 //case 19: // ninth alt font
3913 //case 20: // gothic 4017 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4018 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 4019 rendset = 0, rendstyle = RS_Bold;
3916 break; 4020 break;
3917 case 22: // normal intensity 4021 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 4022 rendset = 0, rendstyle = RS_Bold;
3919 break; 4023 break;
3920 case 23: // disable italic 4024 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 4025 rendset = 0, rendstyle = RS_Italic;
3922 break; 4026 break;
3923 case 24: 4027 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 4028 rendset = 0, rendstyle = RS_Uline;
3925 break; 4029 break;
3926 case 25: 4030 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 4031 rendset = 0, rendstyle = RS_Blink;
3928 break; 4032 break;
3929 case 26: // variable spacing (iso 8613) 4033 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 4034 rendset = 0, rendstyle = RS_Blink;
3931 break; 4035 break;
3932 case 27: 4036 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 4037 rendset = 0, rendstyle = RS_RVid;
3934 break; 4038 break;
3935 //case 28: // visible. NYI 4039 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 4040 //case 29: // not crossed-out
3937 } 4041 }
… …
3958 if (nargs > i + 2 && arg[i + 1] == 5) 4062 if (nargs > i + 2 && arg[i + 1] == 5)
3959 { 4063 {
3960 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3961 i += 2; 4065 i += 2;
3962 } 4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
3963 break; 4076 break;
3964 case 39: /* default fg */ 4077 case 39: /* default fg */
3965 scr_color (Color_fg, Color_fg); 4078 scr_color (Color_fg, Color_fg);
3966 break; 4079 break;
3967 4080
… …
3978 case 48: // set bg color, ISO 8613-6 4091 case 48: // set bg color, ISO 8613-6
3979 if (nargs > i + 2 && arg[i + 1] == 5) 4092 if (nargs > i + 2 && arg[i + 1] == 5)
3980 { 4093 {
3981 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3982 i += 2; 4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
3983 } 4105 }
3984 break; 4106 break;
3985 case 49: /* default bg */ 4107 case 49: /* default bg */
3986 scr_color (Color_bg, Color_bg); 4108 scr_color (Color_bg, Color_bg);
3987 break; 4109 break;

Diff Legend

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