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.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
… …
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
… …
1042 { 1040 {
1043 hidden_cursor = 0; 1041 hidden_cursor = 0;
1044 want_refresh = 1; 1042 want_refresh = 1;
1045 } 1043 }
1046 1044
1047 if (option (Opt_cursorBlink)) 1045 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1048 cursor_blink_ev.again (); 1046 cursor_blink_ev.again ();
1049 else 1047 else
1050 cursor_blink_ev.stop (); 1048 cursor_blink_ev.stop ();
1051} 1049}
1052 1050
… …
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 }
… …
2573 scr_charset_choose (0); 2571 scr_charset_choose (0);
2574 break; 2572 break;
2575 2573
2576#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2577 // 8-bit controls 2575 // 8-bit controls
2578 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2579 process_dcs_seq (); 2577 process_dcs_seq ();
2580 break; 2578 break;
2581 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2582 process_csi_seq (); 2580 process_csi_seq ();
2583 break; 2581 break;
2584 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2585 process_osc_seq (); 2583 process_osc_seq ();
2586 break; 2584 break;
2587#endif 2585#endif
2588 } 2586 }
2589} 2587}
… …
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 /*
… …
3682 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3683 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3684 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3685 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3686 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3685 { 12, PrivMode_BlinkingCursor },
3687 // 18 end FF to printer after print screen 3686 // 18 end FF to printer after print screen
3688 // 19 Print screen prints full screen/scroll region 3687 // 19 Print screen prints full screen/scroll region
3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3688 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3690#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3691 { scrollBar_esc, PrivMode_scrollBar }, 3690 { scrollBar_esc, PrivMode_scrollBar },
… …
3798#ifdef scrollBar_esc 3797#ifdef scrollBar_esc
3799 case scrollBar_esc: 3798 case scrollBar_esc:
3800 scrollBar.map (state); 3799 scrollBar.map (state);
3801 resize_all_windows (0, 0, 0); 3800 resize_all_windows (0, 0, 0);
3802 scr_touch (true); 3801 scr_touch (true);
3802 break;
3803#endif
3804#ifdef CURSOR_BLINK
3805 case 12:
3806 cursor_blink_reset ();
3803 break; 3807 break;
3804#endif 3808#endif
3805 case 25: /* visible/invisible cursor */ 3809 case 25: /* visible/invisible cursor */
3806 scr_cursor_visible (state); 3810 scr_cursor_visible (state);
3807 break; 3811 break;
… …
4017} 4021}
4018 4022
4019void 4023void
4020rxvt_term::set_cursor_style (int style) 4024rxvt_term::set_cursor_style (int style)
4021{ 4025{
4022 if (!IN_RANGE_INC (style, 0, 4)) 4026 if (!IN_RANGE_INC (style, 0, 6))
4023 return; 4027 return;
4024 4028
4029 if (style == 0)
4030 style = 1;
4031
4032 cursor_type = (style - 1) / 2;
4025 set_option (Opt_cursorUnderline, style >= 3); 4033 set_option (Opt_cursorUnderline, cursor_type == 1);
4026 4034
4027#ifdef CURSOR_BLINK 4035#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1)); 4036 set_option (Opt_cursorBlink, style & 1);
4029 cursor_blink_reset (); 4037 cursor_blink_reset ();
4030#endif 4038#endif
4031 4039
4032 want_refresh = 1; 4040 want_refresh = 1;
4033} 4041}

Diff Legend

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