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.533 by sf-exg, Fri Feb 1 11:26:40 2013 UTC vs.
Revision 1.536 by sf-exg, Thu Mar 28 08:53:16 2013 UTC

… …
510#endif 510#endif
511 max_it (lnsppg, 1); 511 max_it (lnsppg, 1);
512 512
513 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
514 { 514 {
515 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
516 return; 516 return;
517 } 517 }
518 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
519 { 519 {
520 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
521 return; 521 return;
522 } 522 }
523 } 523 }
524#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
525 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
526 { 526 {
527 if (keysym == XK_Up) 527 if (keysym == XK_Up)
528 { 528 {
529 scr_page (UP, 1); 529 scr_page (1);
530 return; 530 return;
531 } 531 }
532 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
533 { 533 {
534 scr_page (DN, 1); 534 scr_page (-1);
535 return; 535 return;
536 } 536 }
537 } 537 }
538#endif 538#endif
539#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
… …
2210 i = 5; 2210 i = 5;
2211 2211
2212# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2214 { 2214 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2218
2219 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
… …
2799 }; 2799 };
2800 2800
2801void ecb_hot 2801void ecb_hot
2802rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2803{ 2803{
2804 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2805 unsigned int nargs, p; 2805 unsigned int nargs, p;
2806 int n, ndef; 2806 int n, ndef;
2807 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2808 2808
2809 nargs = 0; 2809 nargs = 0;
… …
2815 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2816 priv = ch; 2816 priv = ch;
2817 ch = cmd_getc (); 2817 ch = cmd_getc ();
2818 } 2818 }
2819 2819
2820 prev_ch = 0;
2820 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2821 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2822 { 2823 {
2823 if (isdigit (ch)) 2824 if (isdigit (ch))
2824 { 2825 {
… …
2834 n = -1; 2835 n = -1;
2835 } 2836 }
2836 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2837 process_nonprinting (ch); 2838 process_nonprinting (ch);
2838 2839
2840 prev_ch = ch;
2839 ch = cmd_getc (); 2841 ch = cmd_getc ();
2840 } 2842 }
2841 2843
2842 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2843 return; 2845 return;
… …
3075 case CSI_SM: /* 8.3.126: SET MODE */ 3077 case CSI_SM: /* 8.3.126: SET MODE */
3076 if (arg[0] == 4) 3078 if (arg[0] == 4)
3077 scr_insert_mode (1); 3079 scr_insert_mode (1);
3078 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3079 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3082 break;
3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3080 break; 3087 break;
3081 3088
3082 /* 3089 /*
3083 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3084 */ 3091 */
… …
3991 break; 3998 break;
3992#endif 3999#endif
3993 } 4000 }
3994 } 4001 }
3995} 4002}
4003
4004void
4005rxvt_term::set_cursor_style (int style)
4006{
4007 if (!IN_RANGE_INC (style, 0, 4))
4008 return;
4009
4010 set_option (Opt_cursorUnderline, style >= 3);
4011
4012#ifdef CURSOR_BLINK
4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
4018}
3996/*}}} */ 4019/*}}} */
3997 4020
3998/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3999 4022
4000/* 4023/*

Diff Legend

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