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.560 by sf-exg, Mon Nov 24 21:46:04 2014 UTC vs.
Revision 1.566 by sf-exg, Sat Sep 12 14:03:35 2015 UTC

… …
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);
… …
1826#endif 1828#endif
1827#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1829 { 1831 {
1830 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1833 scr_recolor ();
1832 } 1834 }
1833#endif 1835#endif
1834 1836
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1838 }
1837} 1839}
1838 1840
1839void ecb_cold 1841void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1843{
1842#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1844 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1845 rgba c; 1850 rgba c;
1846 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1853 }
1849#endif 1854#endif
… …
3801 scr_touch (true); 3806 scr_touch (true);
3802 break; 3807 break;
3803#endif 3808#endif
3804#ifdef CURSOR_BLINK 3809#ifdef CURSOR_BLINK
3805 case 12: 3810 case 12:
3806 set_option (Opt_cursorBlink, state);
3807 cursor_blink_reset (); 3811 cursor_blink_reset ();
3808 break; 3812 break;
3809#endif 3813#endif
3810 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3811 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
… …
3919 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3920 //case 20: // gothic 3924 //case 20: // gothic
3921 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3922 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3923 break; 3927 break;
3924 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3925 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3926 break; 3930 break;
3927 case 23: // disable italic 3931 case 23: // disable italic
3928 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3929 break; 3933 break;
3930 case 24: 3934 case 24: // underline off (vt220)
3931 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3932 break; 3936 break;
3933 case 25: 3937 case 25: // blink off (vt220)
3934 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3935 break; 3939 break;
3936 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3937 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3938 break; 3942 break;
3939 case 27: 3943 case 27: // reverse off (vt220)
3940 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3941 break; 3945 break;
3942 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3943 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3944 } 3948 }

Diff Legend

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