alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-24 02:46:33 +11:00
Code Issues Projects Releases Packages Wiki Activity

Take XIScrollClassInfo::increment into account

Browse source 
From the "Smooth Scrolling" section of [XI2Proto.txt][1]:

> One unit of scrolling in either direction is considered to be equivalent to
> one button event, e.g. for a unit size of 1.0, -2.0 on an valuator type
> Vertical sends two button press/release events for button 4. Likewise, a
> button press event for button 7 generates an event on the Horizontal
> valuator with a value of +1.0. The server may accumulate deltas of less than
> one unit of scrolling.

From [What's new in XI 2.1 - smooth scrolling][2]:

> The increment defines what delta the driver considers to be one scroll
> event. For an increment of +5, each delta of 5 should be regarded as one
> scroll unit down. For an increment of -3, each delta of 3 should be regarded
> as one scroll unit up (i.e. inverted).

[1]: http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt
[2]: http://who-t.blogspot.com/2011/09/whats-new-in-xi-21-smooth-scrolling.html

This fixes scrolling with my Microsoft mouse in X11 on Debian 8.1.
This commit is contained in:
Matt Brubeck 2015-08-24 14:32:31 -07:00
parent 7dd98efccb
commit c310f7bb80
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/x11/input.rs
View file

@ -21,7 +21,8 @@ struct Axis {
id: i32, id: i32,
device_id: i32, device_id: i32,
axis_number: i32, axis_number: i32,
axis_type: AxisType axis_type: AxisType,
scroll_increment: f64,
} }
#[derive(Debug)] #[derive(Debug)]
@ -167,7 +168,7 @@ impl XInputEventHandler {
use events::Event::{Focused, MouseInput, MouseMoved, MouseWheel}; use events::Event::{Focused, MouseInput, MouseMoved, MouseWheel};
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::MouseButton::{Left, Right, Middle}; use events::MouseButton::{Left, Right, Middle};
use events::MouseScrollDelta::{PixelDelta, LineDelta}; use events::MouseScrollDelta::LineDelta;
use events::{Touch, TouchPhase}; use events::{Touch, TouchPhase};
match cookie.evtype { match cookie.evtype {
@ -221,7 +222,7 @@ impl XInputEventHandler {
} }
if scroll_delta.0.abs() > 0.0 || scroll_delta.1.abs() > 0.0 { if scroll_delta.0.abs() > 0.0 || scroll_delta.1.abs() > 0.0 {
Some(MouseWheel(PixelDelta(scroll_delta.0 as f32, scroll_delta.1 as f32))) Some(MouseWheel(LineDelta(scroll_delta.0 as f32, scroll_delta.1 as f32)))
} else { } else {
let new_cursor_pos = (event_data.event_x, event_data.event_y); let new_cursor_pos = (event_data.event_x, event_data.event_y);
if new_cursor_pos != self.current_state.cursor_pos { if new_cursor_pos != self.current_state.cursor_pos {
@ -290,7 +291,8 @@ fn read_input_axis_info(display: &Arc<XConnection>) -> Vec<Axis> {
ffi::XIScrollTypeHorizontal => AxisType::HorizontalScroll, ffi::XIScrollTypeHorizontal => AxisType::HorizontalScroll,
ffi::XIScrollTypeVertical => AxisType::VerticalScroll, ffi::XIScrollTypeVertical => AxisType::VerticalScroll,
_ => { unreachable!() } _ => { unreachable!() }
} },
scroll_increment: scroll_class.increment,
}) })
}, },
_ => {} _ => {}
@ -314,7 +316,7 @@ fn calc_scroll_deltas(event: &ffi::XIDeviceEvent,
prev_axis.axis_number == axis_id prev_axis.axis_number == axis_id
}); });
let delta = match prev_value_pos { let delta = match prev_value_pos {
Some(idx) => axis_value - prev_axis_values[idx].value, Some(idx) => prev_axis_values[idx].value - axis_value,
None => 0.0 None => 0.0
}; };
@ -335,8 +337,8 @@ fn calc_scroll_deltas(event: &ffi::XIDeviceEvent,
if axis.id == event.sourceid && if axis.id == event.sourceid &&
axis.axis_number == axis_id { axis.axis_number == axis_id {
match axis.axis_type { match axis.axis_type {
AxisType::HorizontalScroll => scroll_delta.0 = delta, AxisType::HorizontalScroll => scroll_delta.0 = delta / axis.scroll_increment,
AxisType::VerticalScroll => scroll_delta.1 = delta AxisType::VerticalScroll => scroll_delta.1 = delta / axis.scroll_increment
} }
} }
} }