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.558 by root, Tue Sep 2 16:28:34 2014 UTC vs.
Revision 1.563 by root, Sat Dec 13 12:24:32 2014 UTC

… …
1040 { 1040 {
1041 hidden_cursor = 0; 1041 hidden_cursor = 0;
1042 want_refresh = 1; 1042 want_refresh = 1;
1043 } 1043 }
1044 1044
1045 if (option (Opt_cursorBlink)) 1045 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again (); 1046 cursor_blink_ev.again ();
1047 else 1047 else
1048 cursor_blink_ev.stop (); 1048 cursor_blink_ev.stop ();
1049} 1049}
1050 1050
… …
1239 1239
1240void ecb_cold 1240void ecb_cold
1241rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1242{ 1242{
1243 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1244 recolour_cursor (); 1244 recolor_cursor ();
1245 1245
1246#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1247 hidden_pointer = 0; 1247 hidden_pointer = 0;
1248 1248
1249 if (option (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
… …
1779#endif 1779#endif
1780#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1782 { 1782 {
1783 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1784 scr_recolour (); 1784 scr_recolor ();
1785 } 1785 }
1786#endif 1786#endif
1787#if ENABLE_FRILLS 1787#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell)) 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0); 1789 set_urgency (0);
… …
1826#endif 1826#endif
1827#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1828 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1829 { 1829 {
1830 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1831 scr_recolour (); 1831 scr_recolor ();
1832 } 1832 }
1833#endif 1833#endif
1834 1834
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 } 1836 }
1837} 1837}
1838 1838
1839void ecb_cold 1839void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1841{ 1841{
1842#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1844 { 1844 {
1845 if (!first_time)
1846 pix_colors_focused [idx].free (this);
1847
1845 rgba c; 1848 rgba c;
1846 pix_colors [Color_fade].get (c); 1849 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1850 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 } 1851 }
1849#endif 1852#endif
… …
2571 scr_charset_choose (0); 2574 scr_charset_choose (0);
2572 break; 2575 break;
2573 2576
2574#ifdef EIGHT_BIT_CONTROLS 2577#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2578 // 8-bit controls
2576 case 0x90: /* DCS */ 2579 case 0x90: /* DCS */
2577 process_dcs_seq (); 2580 process_dcs_seq ();
2578 break; 2581 break;
2579 case 0x9b: /* CSI */ 2582 case 0x9b: /* CSI */
2580 process_csi_seq (); 2583 process_csi_seq ();
2581 break; 2584 break;
2582 case 0x9d: /* OSC */ 2585 case 0x9d: /* OSC */
2583 process_osc_seq (); 2586 process_osc_seq ();
2584 break; 2587 break;
2585#endif 2588#endif
2586 } 2589 }
2587} 2590}
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3683 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3684 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3685 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3686 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3687 { 9, PrivMode_MouseX10 },
3688 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3689 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3690 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3691 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3692#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3693 { scrollBar_esc, PrivMode_scrollBar },
… …
3798 scrollBar.map (state); 3802 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3803 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3804 scr_touch (true);
3801 break; 3805 break;
3802#endif 3806#endif
3807#ifdef CURSOR_BLINK
3808 case 12:
3809 cursor_blink_reset ();
3810 break;
3811#endif
3803 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3805 break; 3814 break;
3806 /* case 35: - shift keys */ 3815 /* case 35: - shift keys */
3807 /* case 40: - 80 <--> 132 mode */ 3816 /* case 40: - 80 <--> 132 mode */
… …
3912 //case 19: // ninth alt font 3921 //case 19: // ninth alt font
3913 //case 20: // gothic 3922 //case 20: // gothic
3914 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3915 rendset = 0, rendstyle = RS_Bold; 3924 rendset = 0, rendstyle = RS_Bold;
3916 break; 3925 break;
3917 case 22: // normal intensity 3926 case 22: // bold off (vt220)
3918 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3919 break; 3928 break;
3920 case 23: // disable italic 3929 case 23: // disable italic
3921 rendset = 0, rendstyle = RS_Italic; 3930 rendset = 0, rendstyle = RS_Italic;
3922 break; 3931 break;
3923 case 24: 3932 case 24: // underline off (vt220)
3924 rendset = 0, rendstyle = RS_Uline; 3933 rendset = 0, rendstyle = RS_Uline;
3925 break; 3934 break;
3926 case 25: 3935 case 25: // blink off (vt220)
3927 rendset = 0, rendstyle = RS_Blink; 3936 rendset = 0, rendstyle = RS_Blink;
3928 break; 3937 break;
3929 case 26: // variable spacing (iso 8613) 3938 case 26: // variable spacing (iso 8613)
3930 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3931 break; 3940 break;
3932 case 27: 3941 case 27: // reverse off (vt220)
3933 rendset = 0, rendstyle = RS_RVid; 3942 rendset = 0, rendstyle = RS_RVid;
3934 break; 3943 break;
3935 //case 28: // visible. NYI 3944 //case 28: // visible. NYI
3936 //case 29: // not crossed-out 3945 //case 29: // not crossed-out
3937 } 3946 }

Diff Legend

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