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.564 by sf-exg, Fri Mar 27 15:06:09 2015 UTC

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

Diff Legend

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