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.532 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs.
Revision 1.538 by sf-exg, Thu Apr 11 08:13:43 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 }
… …
1860 { 1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img); 1861 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background (); 1862 update_background ();
1863 } 1863 }
1864#endif 1864#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1868 } 1866 }
1869 1867
1870 break; 1868 break;
1871 } 1869 }
1872 1870
… …
2197 2195
2198#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2199 case Button4: 2197 case Button4:
2200 case Button5: 2198 case Button5:
2201 { 2199 {
2202 int i; 2200 int lines;
2203 page_dirn v; 2201 page_dirn dirn;
2204 2202
2205 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2206 2204
2207 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2208 i = 1; 2206 lines = 1;
2209 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2210 i = nrow - 1; 2208 lines = nrow - 1;
2211 else 2209 else
2212 i = 5; 2210 lines = 5;
2213 2211
2214# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2215 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2216 { 2214 {
2217 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2218 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2219 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2220 2218
2221 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2223 } 2221 }
2224 else 2222 else
2225# endif 2223# endif
2226 { 2224 {
2227 scr_page (v, i); 2225 scr_page (dirn, lines);
2228 scrollBar.show (1); 2226 scrollBar.show (1);
2229 } 2227 }
2230 } 2228 }
2231 break; 2229 break;
2232#endif 2230#endif
… …
2801 }; 2799 };
2802 2800
2803void ecb_hot 2801void ecb_hot
2804rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2805{ 2803{
2806 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2807 unsigned int nargs, p; 2805 unsigned int nargs, p;
2808 int n, ndef; 2806 int n, ndef;
2809 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2810 2808
2811 nargs = 0; 2809 nargs = 0;
… …
2817 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2818 priv = ch; 2816 priv = ch;
2819 ch = cmd_getc (); 2817 ch = cmd_getc ();
2820 } 2818 }
2821 2819
2820 prev_ch = 0;
2822 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2823 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2824 { 2823 {
2825 if (isdigit (ch)) 2824 if (isdigit (ch))
2826 { 2825 {
… …
2836 n = -1; 2835 n = -1;
2837 } 2836 }
2838 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2839 process_nonprinting (ch); 2838 process_nonprinting (ch);
2840 2839
2840 prev_ch = ch;
2841 ch = cmd_getc (); 2841 ch = cmd_getc ();
2842 } 2842 }
2843 2843
2844 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2845 return; 2845 return;
… …
3077 case CSI_SM: /* 8.3.126: SET MODE */ 3077 case CSI_SM: /* 8.3.126: SET MODE */
3078 if (arg[0] == 4) 3078 if (arg[0] == 4)
3079 scr_insert_mode (1); 3079 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3081 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]);
3082 break; 3087 break;
3083 3088
3084 /* 3089 /*
3085 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3086 */ 3091 */
… …
3993 break; 3998 break;
3994#endif 3999#endif
3995 } 4000 }
3996 } 4001 }
3997} 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}
3998/*}}} */ 4019/*}}} */
3999 4020
4000/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
4001 4022
4002/* 4023/*

Diff Legend

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