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.556 by sf-exg, Mon Aug 18 07:20:05 2014 UTC vs.
Revision 1.561 by sf-exg, Thu Nov 27 14:47:55 2014 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
… …
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
… …
2571 scr_charset_choose (0); 2571 scr_charset_choose (0);
2572 break; 2572 break;
2573 2573
2574#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2575 // 8-bit controls 2575 // 8-bit controls
2576 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2577 process_dcs_seq (); 2577 process_dcs_seq ();
2578 break; 2578 break;
2579 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2580 process_csi_seq (); 2580 process_csi_seq ();
2581 break; 2581 break;
2582 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2583 process_osc_seq (); 2583 process_osc_seq ();
2584 break; 2584 break;
2585#endif 2585#endif
2586 } 2586 }
2587} 2587}
… …
3680 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3681 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3682 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3683 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3684 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3685 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen 3686 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region 3687 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3688 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3688#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3689 { scrollBar_esc, PrivMode_scrollBar }, 3690 { scrollBar_esc, PrivMode_scrollBar },
… …
3796#ifdef scrollBar_esc 3797#ifdef scrollBar_esc
3797 case scrollBar_esc: 3798 case scrollBar_esc:
3798 scrollBar.map (state); 3799 scrollBar.map (state);
3799 resize_all_windows (0, 0, 0); 3800 resize_all_windows (0, 0, 0);
3800 scr_touch (true); 3801 scr_touch (true);
3802 break;
3803#endif
3804#ifdef CURSOR_BLINK
3805 case 12:
3806 cursor_blink_reset ();
3801 break; 3807 break;
3802#endif 3808#endif
3803 case 25: /* visible/invisible cursor */ 3809 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3810 scr_cursor_visible (state);
3805 break; 3811 break;
… …
4015} 4021}
4016 4022
4017void 4023void
4018rxvt_term::set_cursor_style (int style) 4024rxvt_term::set_cursor_style (int style)
4019{ 4025{
4020 if (!IN_RANGE_INC (style, 0, 4)) 4026 if (!IN_RANGE_INC (style, 0, 6))
4021 return; 4027 return;
4022 4028
4029 if (style == 0)
4030 style = 1;
4031
4032 cursor_type = (style - 1) / 2;
4023 set_option (Opt_cursorUnderline, style >= 3); 4033 set_option (Opt_cursorUnderline, cursor_type == 1);
4024 4034
4025#ifdef CURSOR_BLINK 4035#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1)); 4036 set_option (Opt_cursorBlink, style & 1);
4027 cursor_blink_reset (); 4037 cursor_blink_reset ();
4028#endif 4038#endif
4029 4039
4030 want_refresh = 1; 4040 want_refresh = 1;
4031} 4041}

Diff Legend

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