kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

input: implement wl_seat version 9

Browse source
This commit is contained in:
Julian Orth 2024-02-04 19:51:36 +01:00
parent 887e2b6cbc
commit 78b557b4a1
15 changed files with 91 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend.rs
View file

@ -196,6 +196,7 @@ pub enum InputEvent {
AxisPx {
dist: Fixed,
axis: ScrollAxis,
inverted: bool,
},
AxisSource {
source: AxisSource,
@ -206,6 +207,7 @@ pub enum InputEvent {
Axis120 {
dist: i32,
axis: ScrollAxis,
inverted: bool,
},
AxisFrame {
time_usec: u64,

11
src/backends/metal.rs
View file

@ -283,6 +283,7 @@ struct MetalInputDevice {
events: SyncQueue<InputEvent>,
cb: CloneCell<Option<Rc<dyn Fn()>>>,
name: CloneCell<Rc<String>>,
natural_scrolling: Cell<bool>,
// state
pressed_keys: SmallMap<u32, (), 5>,
@ -356,7 +357,7 @@ impl MetalInputDevice {
dev.device().set_drag_lock_enabled(enabled);
}
if let Some(enabled) = self.natural_scrolling_enabled.get() {
dev.device().set_natural_scrolling_enabled(enabled);
self.do_set_natural_scrolling_enabled(&dev, enabled);
}
}
@ -377,6 +378,12 @@ impl MetalInputDevice {
});
}
}
fn do_set_natural_scrolling_enabled(&self, dev: &RegisteredDevice, enabled: bool) {
dev.device().set_natural_scrolling_enabled(enabled);
self.natural_scrolling
.set(dev.device().natural_scrolling_enabled());
}
}
impl InputDevice for MetalInputDevice {
@ -473,7 +480,7 @@ impl InputDevice for MetalInputDevice {
fn set_natural_scrolling_enabled(&self, enabled: bool) {
self.natural_scrolling_enabled.set(Some(enabled));
if let Some(dev) = self.inputdev.get() {
dev.device().set_natural_scrolling_enabled(enabled);
self.do_set_natural_scrolling_enabled(&dev, enabled);
}
}
}

2
src/backends/metal/input.rs
View file

@ -149,11 +149,13 @@ impl MetalBackend {
InputEvent::Axis120 {
dist: scroll as _,
axis,
inverted: dev.natural_scrolling.get(),
}
} else {
InputEvent::AxisPx {
dist: Fixed::from_f64(scroll),
axis,
inverted: dev.natural_scrolling.get(),
}
};
dev.event(ie);

3
src/backends/metal/monitor.rs
View file

@ -287,6 +287,7 @@ impl MetalBackend {
events: Default::default(),
cb: Default::default(),
name: Default::default(),
natural_scrolling: Default::default(),
pressed_keys: Default::default(),
pressed_buttons: Default::default(),
left_handed: Default::default(),
@ -336,6 +337,8 @@ impl MetalBackend {
};
inputdev.device().set_slot(slot);
dev.name.set(Rc::new(inputdev.device().name()));
dev.natural_scrolling
.set(inputdev.device().natural_scrolling_enabled());
dev.inputdev.set(Some(inputdev));
dev.apply_config();
slf.state

1
src/backends/x.rs
View file

@ -799,6 +799,7 @@ impl XBackend {
seat.mouse_event(InputEvent::Axis120 {
dist: val * AXIS_120,
axis,
inverted: false,
});
seat.mouse_event(InputEvent::AxisFrame {
time_usec: now_usec(),

20
src/cli/seat_test.rs
View file

@ -6,8 +6,8 @@ use {
wire::{
jay_compositor::{GetSeats, Seat, SeatEvents},
jay_seat_events::{
Axis120, AxisFrame, AxisPx, AxisSource, AxisStop, Button, Key, Modifiers,
PointerAbs, PointerRel,
Axis120, AxisFrame, AxisInverted, AxisPx, AxisSource, AxisStop, Button, Key,
Modifiers, PointerAbs, PointerRel,
},
},
},
@ -134,6 +134,9 @@ async fn run(seat_test: Rc<SeatTest>) {
AxisSource::handle(tc, se, ps.clone(), move |ps, ev| {
ps.source.set(Some(ev.source));
});
AxisInverted::handle(tc, se, ps.clone(), move |ps, ev| {
ps.inverted[ev.axis as usize].set(ev.inverted != 0);
});
AxisPx::handle(tc, se, ps.clone(), move |ps, ev| {
ps.px[ev.axis as usize].set(Some(ev.dist));
});
@ -152,6 +155,8 @@ async fn run(seat_test: Rc<SeatTest>) {
let stop_y = ps.stop[1].take();
let v120_x = ps.v120[0].take();
let v120_y = ps.v120[1].take();
let inverted_x = ps.inverted[0].get();
let inverted_y = ps.inverted[1].get();
if all || ev.seat == seat {
if all {
print!("Seat: {}, ", st.name(ev.seat));
@ -175,9 +180,9 @@ async fn run(seat_test: Rc<SeatTest>) {
print!("Source: {}", source);
need_comma = true;
}
for (axis, px, steps, stop) in [
("horizontal", px_x, v120_x, stop_x),
("vertical", px_y, v120_y, stop_y),
for (axis, px, steps, stop, inverted) in [
("horizontal", px_x, v120_x, stop_x, inverted_x),
("vertical", px_y, v120_y, stop_y, inverted_y),
] {
if px.is_some() || steps.is_some() || stop {
comma!();
@ -197,6 +202,11 @@ async fn run(seat_test: Rc<SeatTest>) {
print!("stop");
need_comma = true;
}
if inverted {
comma!();
print!("natural scrolling");
need_comma = true;
}
}
println!();
}

5
src/ifs/jay_seat_events.rs
View file

@ -98,6 +98,11 @@ impl JaySeatEvents {
});
}
if let Some(dist) = ps.px[axis].get() {
self.client.event(AxisInverted {
self_id: self.id,
axis: axis as _,
inverted: ps.inverted[axis].get() as _,
});
self.client.event(AxisPx {
self_id: self.id,
dist,

2
src/ifs/wl_seat.rs
View file

@ -902,7 +902,7 @@ impl Global for WlSeatGlobal {
}
fn version(&self) -> u32 {
8
9
}
fn break_loops(&self) {

25
src/ifs/wl_seat/event_handling.rs
View file

@ -15,9 +15,9 @@ use {
wl_keyboard::{self, WlKeyboard},
wl_pointer::{
self, PendingScroll, WlPointer, AXIS_DISCRETE_SINCE_VERSION,
AXIS_SOURCE_SINCE_VERSION, AXIS_STOP_SINCE_VERSION,
AXIS_VALUE120_SINCE_VERSION, POINTER_FRAME_SINCE_VERSION, WHEEL_TILT,
WHEEL_TILT_SINCE_VERSION,
AXIS_RELATIVE_DIRECTION_SINCE_VERSION, AXIS_SOURCE_SINCE_VERSION,
AXIS_STOP_SINCE_VERSION, AXIS_VALUE120_SINCE_VERSION, IDENTICAL, INVERTED,
POINTER_FRAME_SINCE_VERSION, WHEEL_TILT, WHEEL_TILT_SINCE_VERSION,
},
zwp_pointer_constraints_v1::{ConstraintType, SeatConstraintStatus},
zwp_relative_pointer_v1::ZwpRelativePointerV1,
@ -199,8 +199,16 @@ impl WlSeatGlobal {
} => self.button_event(time_usec, button, state),
InputEvent::AxisSource { source } => self.pointer_owner.axis_source(source),
InputEvent::Axis120 { dist, axis } => self.pointer_owner.axis_120(dist, axis),
InputEvent::AxisPx { dist, axis } => self.pointer_owner.axis_px(dist, axis),
InputEvent::Axis120 {
dist,
axis,
inverted,
} => self.pointer_owner.axis_120(dist, axis, inverted),
InputEvent::AxisPx {
dist,
axis,
inverted,
} => self.pointer_owner.axis_px(dist, axis, inverted),
InputEvent::AxisStop { axis } => self.pointer_owner.axis_stop(axis),
InputEvent::AxisFrame { time_usec } => self.pointer_owner.frame(dev, self, time_usec),
}
@ -613,6 +621,13 @@ impl WlSeatGlobal {
}
}
if let Some(delta) = event.px[i].get() {
if p.seat.version >= AXIS_RELATIVE_DIRECTION_SINCE_VERSION {
let direction = match event.inverted[i].get() {
false => IDENTICAL,
true => INVERTED,
};
p.send_axis_relative_direction(axis, direction);
}
p.send_axis(time, axis, delta);
}
if p.seat.version >= AXIS_STOP_SINCE_VERSION && event.stop[i].get() {

6
src/ifs/wl_seat/pointer_owner.rs
View file

@ -40,12 +40,14 @@ impl PointerOwnerHolder {
self.pending_scroll.source.set(Some(axis_source as _));
}
pub fn axis_120(&self, delta: i32, axis: ScrollAxis) {
pub fn axis_120(&self, delta: i32, axis: ScrollAxis, inverted: bool) {
self.pending_scroll.v120[axis as usize].set(Some(delta));
self.pending_scroll.inverted[axis as usize].set(inverted);
}
pub fn axis_px(&self, delta: Fixed, axis: ScrollAxis) {
pub fn axis_px(&self, delta: Fixed, axis: ScrollAxis, inverted: bool) {
self.pending_scroll.px[axis as usize].set(Some(delta));
self.pending_scroll.inverted[axis as usize].set(inverted);
}
pub fn axis_stop(&self, axis: ScrollAxis) {

21
src/ifs/wl_seat/wl_pointer.rs
View file

@ -28,16 +28,21 @@ pub const CONTINUOUS: u32 = 2;
#[allow(dead_code)]
pub const WHEEL_TILT: u32 = 3;
pub const IDENTICAL: u32 = 0;
pub const INVERTED: u32 = 1;
pub const POINTER_FRAME_SINCE_VERSION: u32 = 5;
pub const AXIS_SOURCE_SINCE_VERSION: u32 = 5;
pub const AXIS_DISCRETE_SINCE_VERSION: u32 = 5;
pub const AXIS_STOP_SINCE_VERSION: u32 = 5;
pub const WHEEL_TILT_SINCE_VERSION: u32 = 6;
pub const AXIS_VALUE120_SINCE_VERSION: u32 = 8;
pub const AXIS_RELATIVE_DIRECTION_SINCE_VERSION: u32 = 9;
#[derive(Default, Debug)]
pub struct PendingScroll {
pub v120: [Cell<Option<i32>>; 2],
pub inverted: [Cell<bool>; 2],
pub px: [Cell<Option<Fixed>>; 2],
pub stop: [Cell<bool>; 2],
pub source: Cell<Option<u32>>,
@ -51,6 +56,10 @@ impl PendingScroll {
Cell::new(self.v120[0].take()),
Cell::new(self.v120[1].take()),
],
inverted: [
Cell::new(self.inverted[0].take()),
Cell::new(self.inverted[1].take()),
],
px: [Cell::new(self.px[0].take()), Cell::new(self.px[1].take())],
stop: [
Cell::new(self.stop[0].take()),
@ -114,6 +123,14 @@ impl WlPointer {
})
}
pub fn send_axis_relative_direction(&self, axis: u32, direction: u32) {
self.seat.client.event(AxisRelativeDirection {
self_id: self.id,
axis,
direction,
})
}
pub fn send_axis(&self, time: u32, axis: u32, value: Fixed) {
self.seat.client.event(Axis {
self_id: self.id,
@ -123,12 +140,10 @@ impl WlPointer {
})
}
#[allow(dead_code)]
pub fn send_frame(&self) {
self.seat.client.event(Frame { self_id: self.id })
}
#[allow(dead_code)]
pub fn send_axis_source(&self, axis_source: u32) {
self.seat.client.event(AxisSource {
self_id: self.id,
@ -136,7 +151,6 @@ impl WlPointer {
})
}
#[allow(dead_code)]
pub fn send_axis_stop(&self, time: u32, axis: u32) {
self.seat.client.event(AxisStop {
self_id: self.id,
@ -145,7 +159,6 @@ impl WlPointer {
})
}
#[allow(dead_code)]
pub fn send_axis_discrete(&self, axis: u32, discrete: i32) {
self.seat.client.event(AxisDiscrete {
self_id: self.id,

2
src/it/test_backend.rs
View file

@ -315,6 +315,7 @@ impl TestBackendMouse {
self.common.event(InputEvent::Axis120 {
dist: dy * 120,
axis: ScrollAxis::Vertical,
inverted: false,
});
self.common.event(InputEvent::AxisFrame {
time_usec: now_usec(),
@ -328,6 +329,7 @@ impl TestBackendMouse {
self.common.event(InputEvent::AxisPx {
dist: Fixed::from_int(dy),
axis: ScrollAxis::Vertical,
inverted: false,
});
self.common.event(InputEvent::AxisFrame {
time_usec: now_usec(),

1
src/libinput/device.rs
View file

@ -155,7 +155,6 @@ impl<'a> LibInputDevice<'a> {
}
}
#[allow(dead_code)]
pub fn natural_scrolling_enabled(&self) -> bool {
unsafe { libinput_device_config_scroll_get_natural_scroll_enabled(self.dev) != 0 }
}