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.531 by sf-exg, Sun Dec 30 20:28:31 2012 UTC vs.
Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 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 }
… …
1077 1077
1078#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1079void 1079void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1081{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1083 { 1083 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check (); 1086 refresh_check ();
1087 } 1087 }
… …
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
… …
1638 1638
1639#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1642 {
1643 page_dirn scroll_selection_dir;
1643 int dist; 1644 int dist;
1644 1645
1645 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1647 */ 1648 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1673 + 1;
1673 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1675 } 1677 }
1676 else 1678 else
1677 { 1679 {
1678 /* we are within the text window, so we 1680 /* we are within the text window, so we
1679 * shouldn't be scrolling 1681 * shouldn't be scrolling
… …
1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1857 { 1859 {
1858#if BG_IMAGE_FROM_ROOT 1860#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent)) 1861 if (option (Opt_transparent))
1860 { 1862 {
1861 bg_set_root_pixmap (); 1863 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background (); 1864 update_background ();
1863 } 1865 }
1864#endif 1866#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1868 } 1868 }
1869 1869
1870 break; 1870 break;
1871 } 1871 }
1872 1872
… …
2197 2197
2198#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2199 case Button4: 2199 case Button4:
2200 case Button5: 2200 case Button5:
2201 { 2201 {
2202 int i; 2202 int lines;
2203 page_dirn v; 2203 page_dirn dirn;
2204 2204
2205 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2206 2206
2207 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2208 i = 1; 2208 lines = 1;
2209 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2210 i = nrow - 1; 2210 lines = nrow - 1;
2211 else 2211 else
2212 i = 5; 2212 lines = 5;
2213 2213
2214# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2215 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2216 { 2216 {
2217 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2218 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2219 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2220 2219
2221 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2223 } 2222 }
2224 else 2223 else
2225# endif 2224# endif
2226 { 2225 {
2227 scr_page (v, i); 2226 scr_page (dirn, lines);
2228 scrollBar.show (1); 2227 scrollBar.show (1);
2229 } 2228 }
2230 } 2229 }
2231 break; 2230 break;
2232#endif 2231#endif
… …
2801 }; 2800 };
2802 2801
2803void ecb_hot 2802void ecb_hot
2804rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2805{ 2804{
2806 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2807 unsigned int nargs, p; 2806 unsigned int nargs, p;
2808 int n, ndef; 2807 int n, ndef;
2809 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2810 2809
2811 nargs = 0; 2810 nargs = 0;
… …
2817 /* '<' '=' '>' '?' '!' */ 2816 /* '<' '=' '>' '?' '!' */
2818 priv = ch; 2817 priv = ch;
2819 ch = cmd_getc (); 2818 ch = cmd_getc ();
2820 } 2819 }
2821 2820
2821 prev_ch = 0;
2822 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2823 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2824 { 2824 {
2825 if (isdigit (ch)) 2825 if (isdigit (ch))
2826 { 2826 {
… …
2836 n = -1; 2836 n = -1;
2837 } 2837 }
2838 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2839 process_nonprinting (ch); 2839 process_nonprinting (ch);
2840 2840
2841 prev_ch = ch;
2841 ch = cmd_getc (); 2842 ch = cmd_getc ();
2842 } 2843 }
2843 2844
2844 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2845 return; 2846 return;
… …
3077 case CSI_SM: /* 8.3.126: SET MODE */ 3078 case CSI_SM: /* 8.3.126: SET MODE */
3078 if (arg[0] == 4) 3079 if (arg[0] == 4)
3079 scr_insert_mode (1); 3080 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3081 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3083 break;
3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3082 break; 3088 break;
3083 3089
3084 /* 3090 /*
3085 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3086 */ 3092 */
… …
3993 break; 3999 break;
3994#endif 4000#endif
3995 } 4001 }
3996 } 4002 }
3997} 4003}
4004
4005void
4006rxvt_term::set_cursor_style (int style)
4007{
4008 if (!IN_RANGE_INC (style, 0, 4))
4009 return;
4010
4011 set_option (Opt_cursorUnderline, style >= 3);
4012
4013#ifdef CURSOR_BLINK
4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
4019}
3998/*}}} */ 4020/*}}} */
3999 4021
4000/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
4001 4023
4002/* 4024/*

Diff Legend

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