leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Define function for transforming touch/tablet event position

Browse source
This commit is contained in:
Ian Douglas Scott 2024-11-20 13:13:07 -08:00 • committed by Victoria Brekenfeld
parent 69d251fb74
commit eaeca9a244
1 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/input/mod.rs
View file

@ -1143,13 +1143,7 @@ impl State {
return; return;
}; };
let geometry = output.geometry(); let position = transform_output_mapped_position(&output, &event);
let position = geometry.loc.to_f64()
+ event
.position_transformed(geometry.size.as_logical())
.as_global();
let under = State::surface_under(position, &output, &mut *shell) let under = State::surface_under(position, &output, &mut *shell)
.map(|(target, pos)| (target, pos.as_logical())); .map(|(target, pos)| (target, pos.as_logical()));
@ -1180,13 +1174,7 @@ impl State {
return; return;
}; };
let geometry = output.geometry(); let position = transform_output_mapped_position(&output, &event);
let position = geometry.loc.to_f64()
+ event
.position_transformed(geometry.size.as_logical())
.as_global();
let under = State::surface_under(position, &output, &mut *shell) let under = State::surface_under(position, &output, &mut *shell)
.map(|(target, pos)| (target, pos.as_logical())); .map(|(target, pos)| (target, pos.as_logical()));
@ -1269,13 +1257,8 @@ impl State {
else { else {
return; return;
}; };
let geometry = output.geometry();
let position = event
.position_transformed(geometry.size.as_logical())
.as_global()
+ geometry.loc.to_f64();
let position = transform_output_mapped_position(&output, &event);
let under = State::surface_under(position, &output, &mut *shell) let under = State::surface_under(position, &output, &mut *shell)
.map(|(target, pos)| (target, pos.as_logical())); .map(|(target, pos)| (target, pos.as_logical()));
@ -1338,13 +1321,8 @@ impl State {
else { else {
return; return;
}; };
let geometry = output.geometry();
let position = event
.position_transformed(geometry.size.as_logical())
.as_global()
+ geometry.loc.to_f64();
let position = transform_output_mapped_position(&output, &event);
let under = State::surface_under(position, &output, &mut *shell) let under = State::surface_under(position, &output, &mut *shell)
.map(|(target, pos)| (target, pos.as_logical())); .map(|(target, pos)| (target, pos.as_logical()));
@ -2161,6 +2139,19 @@ fn cursor_sessions_for_output(
.chain(output.cursor_sessions().into_iter()) .chain(output.cursor_sessions().into_iter())
} }
fn transform_output_mapped_position<'a, B, E>(output: &Output, event: &E) -> Point<f64, Global>
where
B: InputBackend,
E: AbsolutePositionEvent<B>,
B::Device: 'static,
{
let geometry = output.geometry();
event
.position_transformed(geometry.size.as_logical())
.as_global()
+ geometry.loc.to_f64()
}
// TODO Is it possible to determine mapping for external touchscreen? // TODO Is it possible to determine mapping for external touchscreen?
// Support map_to_region like sway? // Support map_to_region like sway?
fn mapped_output_for_device<'a, D: Device + 'static>( fn mapped_output_for_device<'a, D: Device + 'static>(