| … | |
… | |
| 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) |
| 1094 | void |
1094 | void |
| 1095 | rxvt_term::slip_wheel_cb (ev::timer &w, int revents) |
1095 | rxvt_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; |
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 |
