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.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC vs.
Revision 1.558 by root, Tue Sep 2 16:28:34 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
676 { 676 {
677 char *ch; 677 char *ch;
678 678
679 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80; 680 *ch |= 0x80;
681
682 meta = 0;
683 } 681 }
684#endif 682#endif
685 /* nil */ ; 683 /* nil */ ;
686 } 684 }
687 685
1913 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1914 return; 1912 return;
1915 } 1913 }
1916#endif 1914#endif
1917 1915
1918 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1919 1917
1920 if (reportmode) 1918 if (reportmode)
1921 { 1919 {
1922 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1923 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
2173#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2174 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2175 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2176 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2177 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2178 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2179 { 2177 {
2180 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2181 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2182 mouse_report (ev); 2180 mouse_report (ev);
2183 } 2181 }
3094 scr_insert_mode (1); 3092 scr_insert_mode (1);
3095 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3096 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3097 break; 3095 break;
3098 3096
3099 case CSI_71: // DESCUSR: set cursor style 3097 case CSI_71: // DECSCUSR: set cursor style
3100 if (prev_ch == ' ') 3098 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]); 3099 set_cursor_style (arg[0]);
3102 break; 3100 break;
3103 3101
3104 /* 3102 /*
4017} 4015}
4018 4016
4019void 4017void
4020rxvt_term::set_cursor_style (int style) 4018rxvt_term::set_cursor_style (int style)
4021{ 4019{
4022 if (!IN_RANGE_INC (style, 0, 4)) 4020 if (!IN_RANGE_INC (style, 0, 6))
4023 return; 4021 return;
4024 4022
4023 if (style == 0)
4024 style = 1;
4025
4026 cursor_type = (style - 1) / 2;
4025 set_option (Opt_cursorUnderline, style >= 3); 4027 set_option (Opt_cursorUnderline, cursor_type == 1);
4026 4028
4027#ifdef CURSOR_BLINK 4029#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1)); 4030 set_option (Opt_cursorBlink, style & 1);
4029 cursor_blink_reset (); 4031 cursor_blink_reset ();
4030#endif 4032#endif
4031 4033
4032 want_refresh = 1; 4034 want_refresh = 1;
4033} 4035}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines