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.539 by sf-exg, Tue Apr 16 08:44:45 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
540 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
541 { 541 {
542 if (keysym == XK_Home) 542 if (keysym == XK_Home)
543 { 543 {
544 scr_move_to (0, 1); 544 scr_changeview (top_row);
545 return; 545 return;
546 } 546 }
547 else if (keysym == XK_End) 547 else if (keysym == XK_End)
548 { 548 {
549 scr_move_to (1, 1); 549 scr_changeview (0);
550 return; 550 return;
551 } 551 }
552 } 552 }
553#endif 553#endif
554 } 554 }
… …
1092 1092
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1094void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1096{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1098 { 1098 {
1099 want_refresh = 1; 1099 want_refresh = 1;
1100 refresh_check (); 1100 refresh_check ();
1101 } 1101 }
1102 1102
… …
2195 2195
2196#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2197 case Button4: 2197 case Button4:
2198 case Button5: 2198 case Button5:
2199 { 2199 {
2200 int i; 2200 int lines;
2201 page_dirn v; 2201 page_dirn dirn;
2202 2202
2203 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2204 2204
2205 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2206 i = 1; 2206 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2208 lines = nrow - 1;
2209 else 2209 else
2210 i = 5; 2210 lines = 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 += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2217
2219 if (!slip_wheel_ev.is_active ()) 2218 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221 } 2220 }
2222 else 2221 else
2223# endif 2222# endif
2224 { 2223 {
2225 scr_page (v, i); 2224 scr_page (dirn, lines);
2226 scrollBar.show (1); 2225 scrollBar.show (1);
2227 } 2226 }
2228 } 2227 }
2229 break; 2228 break;
2230#endif 2229#endif
… …
2799 }; 2798 };
2800 2799
2801void ecb_hot 2800void ecb_hot
2802rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2803{ 2802{
2804 unicode_t ch, priv, i; 2803 unicode_t ch, priv, prev_ch, i;
2805 unsigned int nargs, p; 2804 unsigned int nargs, p;
2806 int n, ndef; 2805 int n, ndef;
2807 int arg[ESC_ARGS] = { }; 2806 int arg[ESC_ARGS] = { };
2808 2807
2809 nargs = 0; 2808 nargs = 0;
… …
2815 /* '<' '=' '>' '?' '!' */ 2814 /* '<' '=' '>' '?' '!' */
2816 priv = ch; 2815 priv = ch;
2817 ch = cmd_getc (); 2816 ch = cmd_getc ();
2818 } 2817 }
2819 2818
2819 prev_ch = 0;
2820 /* read any numerical arguments */ 2820 /* read any numerical arguments */
2821 for (n = -1; ch < CSI_ICH; ) 2821 for (n = -1; ch < CSI_ICH; )
2822 { 2822 {
2823 if (isdigit (ch)) 2823 if (isdigit (ch))
2824 { 2824 {
… …
2834 n = -1; 2834 n = -1;
2835 } 2835 }
2836 else if (IS_CONTROL (ch)) 2836 else if (IS_CONTROL (ch))
2837 process_nonprinting (ch); 2837 process_nonprinting (ch);
2838 2838
2839 prev_ch = ch;
2839 ch = cmd_getc (); 2840 ch = cmd_getc ();
2840 } 2841 }
2841 2842
2842 if (ch > CSI_7F) 2843 if (ch > CSI_7F)
2843 return; 2844 return;
… …
3075 case CSI_SM: /* 8.3.126: SET MODE */ 3076 case CSI_SM: /* 8.3.126: SET MODE */
3076 if (arg[0] == 4) 3077 if (arg[0] == 4)
3077 scr_insert_mode (1); 3078 scr_insert_mode (1);
3078 else if (arg[0] == 20) 3079 else if (arg[0] == 20)
3079 priv_modes |= PrivMode_LFNL; 3080 priv_modes |= PrivMode_LFNL;
3081 break;
3082
3083 case CSI_71: // DESCUSR: set cursor style
3084 if (prev_ch == ' ')
3085 set_cursor_style (arg[0]);
3080 break; 3086 break;
3081 3087
3082 /* 3088 /*
3083 * PRIVATE USE beyond this point. All CSI_7? sequences here 3089 * PRIVATE USE beyond this point. All CSI_7? sequences here
3084 */ 3090 */
… …
3991 break; 3997 break;
3992#endif 3998#endif
3993 } 3999 }
3994 } 4000 }
3995} 4001}
4002
4003void
4004rxvt_term::set_cursor_style (int style)
4005{
4006 if (!IN_RANGE_INC (style, 0, 4))
4007 return;
4008
4009 set_option (Opt_cursorUnderline, style >= 3);
4010
4011#ifdef CURSOR_BLINK
4012 set_option (Opt_cursorBlink, !style || (style & 1));
4013 cursor_blink_reset ();
4014#endif
4015
4016 want_refresh = 1;
4017}
3996/*}}} */ 4018/*}}} */
3997 4019
3998/* ------------------------------------------------------------------------- */ 4020/* ------------------------------------------------------------------------- */
3999 4021
4000/* 4022/*

Diff Legend

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