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.536 by sf-exg, Thu Mar 28 08:53:16 2013 UTC vs.
Revision 1.537 by sf-exg, Thu Mar 28 11:30:39 2013 UTC

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 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);
2221 } 2221 }
2222 else 2222 else
2223# endif 2223# endif
2224 { 2224 {
2225 scr_page (v, i); 2225 scr_page (dirn, lines);
2226 scrollBar.show (1); 2226 scrollBar.show (1);
2227 } 2227 }
2228 } 2228 }
2229 break; 2229 break;
2230#endif 2230#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines