Skip to content

2066 touch input rework #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ph4ntomas wants to merge 7 commits into
base: master
Choose a base branch
from
Open

2066 touch input rework #2067

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cad93e2
input::touch: Rework touch handling api
Ph4ntomas Jun 13, 2026
b9ec43d
anvil: port code to new touch api
Ph4ntomas Jun 13, 2026
ae3ac9d
input::touch: replace Serial by FrameMarker
Ph4ntomas Jun 13, 2026
1b83eb6
anvil: replace Serial by FrameMarker in TouchTarget
Ph4ntomas Jun 13, 2026
1eabad6
input::touch: Add TouchHandle::client_touch to retrieve raw wl_touch
Ph4ntomas Jun 13, 2026
f123ba9
input/touch: use rust pre 1.88 style
Ph4ntomas Jun 13, 2026
4914270
input/touch: update documentation.
Ph4ntomas Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions anvil/src/focus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,29 +286,26 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for PointerFocus
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::DownEvent,
seq: Serial,
) {
self.inner_touch_target().down(seat, data, event, seq)
self.inner_touch_target().down(seat, data, event)
}

fn up(
&self,
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::UpEvent,
seq: Serial,
) {
self.inner_touch_target().up(seat, data, event, seq)
self.inner_touch_target().up(seat, data, event)
}

fn motion(
&self,
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::MotionEvent,
seq: Serial,
) {
self.inner_touch_target().motion(seat, data, event, seq)
self.inner_touch_target().motion(seat, data, event)
}

fn frame(&self, seat: &Seat<AnvilState<BackendData>>, data: &mut AnvilState<BackendData>, seq: Serial) {
Expand All @@ -324,19 +321,25 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for PointerFocus
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::ShapeEvent,
seq: Serial,
) {
self.inner_touch_target().shape(seat, data, event, seq)
self.inner_touch_target().shape(seat, data, event)
}

fn orientation(
&self,
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::OrientationEvent,
seq: Serial,
) {
self.inner_touch_target().orientation(seat, data, event, seq)
self.inner_touch_target().orientation(seat, data, event)
}

fn last_serial(
&self,
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
) -> Option<Serial> {
self.inner_touch_target().last_serial(seat, data)
}
}

Expand Down
15 changes: 10 additions & 5 deletions anvil/src/shell/element.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for SSD {
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::DownEvent,
_seq: Serial,
) {
let mut state = self.0.decoration_state();
if state.is_ssd {
Expand All @@ -296,7 +295,6 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for SSD {
seat: &Seat<AnvilState<BackendData>>,
data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::UpEvent,
_seq: Serial,
) {
let mut state = self.0.decoration_state();
if state.is_ssd {
Expand All @@ -309,7 +307,6 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for SSD {
_seat: &Seat<AnvilState<BackendData>>,
_data: &mut AnvilState<BackendData>,
event: &smithay::input::touch::MotionEvent,
_seq: Serial,
) {
let mut state = self.0.decoration_state();
if state.is_ssd {
Expand Down Expand Up @@ -338,7 +335,6 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for SSD {
_seat: &Seat<AnvilState<BackendData>>,
_data: &mut AnvilState<BackendData>,
_event: &smithay::input::touch::ShapeEvent,
_seq: Serial,
) {
}

Expand All @@ -347,9 +343,18 @@ impl<BackendData: Backend> TouchTarget<AnvilState<BackendData>> for SSD {
_seat: &Seat<AnvilState<BackendData>>,
_data: &mut AnvilState<BackendData>,
_event: &smithay::input::touch::OrientationEvent,
_seq: Serial,
) {
}

fn last_serial(
&self,
_seat: &Seat<AnvilState<BackendData>>,
_data: &mut AnvilState<BackendData>,
) -> Option<Serial> {
// It would be more correct to store the serial on fram and cancel,
// but since we're ignoring those anyway, so need for the added complexity.
None
}
}

impl SpaceElement for WindowElement {
Expand Down
28 changes: 7 additions & 21 deletions anvil/src/shell/grabs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchMoveSurfa
Point<f64, Logical>,
)>,
_event: &smithay::input::touch::DownEvent,
_seq: Serial,
) {
}

Expand All @@ -192,13 +191,12 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchMoveSurfa
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::UpEvent,
seq: Serial,
) {
if event.slot != self.start_data.slot {
return;
}

handle.up(data, event, seq);
handle.up(data, event);
handle.unset_grab(self, data);
}

Expand All @@ -211,7 +209,6 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchMoveSurfa
Point<f64, Logical>,
)>,
event: &smithay::input::touch::MotionEvent,
_seq: Serial,
) {
if event.slot != self.start_data.slot {
return;
Expand All @@ -227,17 +224,15 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchMoveSurfa
&mut self,
_data: &mut AnvilState<BackendData>,
_handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
_seq: Serial,
) {
}

fn cancel(
&mut self,
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
seq: Serial,
) {
handle.cancel(data, seq);
handle.cancel(data);
handle.unset_grab(self, data);
}

Expand All @@ -246,19 +241,17 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchMoveSurfa
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::ShapeEvent,
seq: Serial,
) {
handle.shape(data, event, seq);
handle.shape(data, event);
}

fn orientation(
&mut self,
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::OrientationEvent,
seq: Serial,
) {
handle.orientation(data, event, seq);
handle.orientation(data, event);
}

fn start_data(&self) -> &smithay::input::touch::GrabStartData<AnvilState<BackendData>> {
Expand Down Expand Up @@ -644,7 +637,6 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchResizeSur
Point<f64, Logical>,
)>,
_event: &smithay::input::touch::DownEvent,
_seq: Serial,
) {
}

Expand All @@ -653,7 +645,6 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchResizeSur
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::UpEvent,
_seq: Serial,
) {
if event.slot != self.start_data.slot {
return;
Expand Down Expand Up @@ -750,7 +741,6 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchResizeSur
Point<f64, Logical>,
)>,
event: &smithay::input::touch::MotionEvent,
_seq: Serial,
) {
if event.slot != self.start_data.slot {
return;
Expand Down Expand Up @@ -827,17 +817,15 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchResizeSur
&mut self,
_data: &mut AnvilState<BackendData>,
_handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
_seq: Serial,
) {
}

fn cancel(
&mut self,
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
seq: Serial,
) {
handle.cancel(data, seq);
handle.cancel(data);
handle.unset_grab(self, data);
}

Expand All @@ -846,19 +834,17 @@ impl<BackendData: Backend> TouchGrab<AnvilState<BackendData>> for TouchResizeSur
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::ShapeEvent,
seq: Serial,
) {
handle.shape(data, event, seq);
handle.shape(data, event);
}

fn orientation(
&mut self,
data: &mut AnvilState<BackendData>,
handle: &mut smithay::input::touch::TouchInnerHandle<'_, AnvilState<BackendData>>,
event: &smithay::input::touch::OrientationEvent,
seq: Serial,
) {
handle.orientation(data, event, seq);
handle.orientation(data, event);
}

fn start_data(&self) -> &smithay::input::touch::GrabStartData<AnvilState<BackendData>> {
Expand Down
14 changes: 5 additions & 9 deletions src/input/dnd/grab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,11 @@ where
_handle: &mut TouchInnerHandle<'_, D>,
_focus: Option<(<D as SeatHandler>::TouchFocus, Point<f64, Logical>)>,
_event: &DownEvent,
_seq: Serial,
) {
// Ignore
}

fn up(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>, event: &UpEvent, _seq: Serial) {
fn up(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>, event: &UpEvent) {
if event.slot != self.start_data().slot {
return;
}
Expand All @@ -504,13 +503,12 @@ where
handle: &mut TouchInnerHandle<'_, D>,
focus: Option<(<D as SeatHandler>::TouchFocus, Point<f64, Logical>)>,
event: &TouchMotionEvent,
seq: Serial,
) {
if event.slot != self.start_data().slot {
return;
}

handle.motion(data, self.touch_focus(), event, seq);
handle.motion(data, self.touch_focus(), event);

self.last_position = event.location;

Expand All @@ -523,11 +521,11 @@ where
);
}

fn frame(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>, seq: Serial) {
handle.frame(data, seq);
fn frame(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>) {
handle.frame(data);
}

fn cancel(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>, _seq: Serial) {
fn cancel(&mut self, data: &mut D, handle: &mut TouchInnerHandle<'_, D>) {
handle.unset_grab(self, data);
}

Expand All @@ -536,7 +534,6 @@ where
_data: &mut D,
_handle: &mut TouchInnerHandle<'_, D>,
_event: &crate::input::touch::ShapeEvent,
_seq: Serial,
) {
}

Expand All @@ -545,7 +542,6 @@ where
_data: &mut D,
_handle: &mut TouchInnerHandle<'_, D>,
_event: &crate::input::touch::OrientationEvent,
_seq: Serial,
) {
}

Expand Down
Loading