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.554 by sf-exg, Sun Aug 3 14:02:08 2014 UTC vs.
Revision 1.560 by sf-exg, Mon Nov 24 21:46:04 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
… …
1911 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1912 return; 1912 return;
1913 } 1913 }
1914#endif 1914#endif
1915 1915
1916 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1917 1917
1918 if (reportmode) 1918 if (reportmode)
1919 { 1919 {
1920 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1921 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
… …
2171#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2172 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2173 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2174 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2175 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2176 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2177 { 2177 {
2178 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2179 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2180 mouse_report (ev); 2180 mouse_report (ev);
2181 } 2181 }
… …
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}
… …
3092 scr_insert_mode (1); 3092 scr_insert_mode (1);
3093 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3094 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3095 break; 3095 break;
3096 3096
3097 case CSI_71: // DESCUSR: set cursor style 3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ') 3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]); 3099 set_cursor_style (arg[0]);
3100 break; 3100 break;
3101 3101
3102 /* 3102 /*
… …
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 set_option (Opt_cursorBlink, state);
3807 cursor_blink_reset ();
3801 break; 3808 break;
3802#endif 3809#endif
3803 case 25: /* visible/invisible cursor */ 3810 case 25: /* visible/invisible cursor */
3804 scr_cursor_visible (state); 3811 scr_cursor_visible (state);
3805 break; 3812 break;
… …
4015} 4022}
4016 4023
4017void 4024void
4018rxvt_term::set_cursor_style (int style) 4025rxvt_term::set_cursor_style (int style)
4019{ 4026{
4020 if (!IN_RANGE_INC (style, 0, 4)) 4027 if (!IN_RANGE_INC (style, 0, 6))
4021 return; 4028 return;
4022 4029
4030 if (style == 0)
4031 style = 1;
4032
4033 cursor_type = (style - 1) / 2;
4023 set_option (Opt_cursorUnderline, style >= 3); 4034 set_option (Opt_cursorUnderline, cursor_type == 1);
4024 4035
4025#ifdef CURSOR_BLINK 4036#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1)); 4037 set_option (Opt_cursorBlink, style & 1);
4027 cursor_blink_reset (); 4038 cursor_blink_reset ();
4028#endif 4039#endif
4029 4040
4030 want_refresh = 1; 4041 want_refresh = 1;
4031} 4042}

Diff Legend

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