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.563 by root, Sat Dec 13 12:24:32 2014 UTC vs.
Revision 1.569 by sf-exg, Sat May 14 08:31:26 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.
… …
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 }
… …
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,
… …
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;
… …
3336 rgba c; 3344 rgba c;
3337 pix_colors_focused[color].get (c); 3345 pix_colors_focused[color].get (c);
3338 3346
3339#if XFT 3347#if XFT
3340 if (c.a != rgba::MAX_CC) 3348 if (c.a != rgba::MAX_CC)
3341 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3349 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3342 else 3350 else
3343#endif 3351#endif
3344 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3352 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3345 } 3353 }
3346 else 3354 else
… …
3705#endif 3713#endif
3706 { 1000, PrivMode_MouseX11 }, 3714 { 1000, PrivMode_MouseX11 },
3707 { 1002, PrivMode_MouseBtnEvent }, 3715 { 1002, PrivMode_MouseBtnEvent },
3708 { 1003, PrivMode_MouseAnyEvent }, 3716 { 1003, PrivMode_MouseAnyEvent },
3709#if ENABLE_FRILLS 3717#if ENABLE_FRILLS
3718 { 1004, PrivMode_FocusEvent },
3710 { 1005, PrivMode_ExtModeMouse }, 3719 { 1005, PrivMode_ExtModeMouse },
3711#endif 3720#endif
3712 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3713 { 1011, PrivMode_Keypress }, // rxvt extension 3722 { 1011, PrivMode_Keypress }, // rxvt extension
3714#if ENABLE_FRILLS 3723#if ENABLE_FRILLS

Diff Legend

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