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

input: Deduplicate into update_output_image_copy_cursor_position

Browse source
This commit is contained in:
Ian Douglas Scott 2026-06-17 14:10:51 -07:00 • committed by Victoria Brekenfeld
parent dda2d14832
commit 6c6b56a7f3
1 changed files with 55 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

128
src/input/mod.rs
View file

@ -63,7 +63,7 @@ use smithay::{
input::Device as InputDevice, input::Device as InputDevice,
wayland_server::{Resource as _, protocol::wl_surface::WlSurface}, wayland_server::{Resource as _, protocol::wl_surface::WlSurface},
}, },
utils::{Logical, Point, Rectangle, SERIAL_COUNTER, Serial}, utils::{Clock, Logical, Monotonic, Point, Rectangle, SERIAL_COUNTER, Serial},
wayland::{ wayland::{
compositor::CompositorHandler, compositor::CompositorHandler,
image_copy_capture::CursorSessionRef, image_copy_capture::CursorSessionRef,
@ -648,31 +648,13 @@ impl State {
seat.set_active_output(&output); seat.set_active_output(&output);
} }
for session in cursor_sessions_for_output(&shell, &output) { update_output_image_copy_cursor_position(
if let Some(cursor_geometry) = seat.cursor_geometry( &shell,
(position - output_geometry.loc.to_f64()) &self.common.clock,
.as_logical() &output,
.to_buffer( &seat,
output.current_scale().fractional_scale(), position,
output.current_transform(), );
&output_geometry.size.to_f64().as_logical(),
),
self.common.clock.now(),
) {
let constraints = cursor_capture_constraints(Some(cursor_geometry));
if session
.current_constraints()
.map(|current_constraints| {
current_constraints.size != constraints.size
})
.unwrap_or(true)
{
session.update_constraints(constraints);
}
session.set_cursor_hotspot(cursor_geometry.hotspot);
session.set_cursor_pos(Some(cursor_geometry.geometry.loc));
}
}
} }
} }
InputEvent::PointerMotionAbsolute { event, .. } => { InputEvent::PointerMotionAbsolute { event, .. } => {
@ -711,31 +693,13 @@ impl State {
ptr.frame(self); ptr.frame(self);
let shell = self.common.shell.read(); let shell = self.common.shell.read();
for session in cursor_sessions_for_output(&shell, &output) { update_output_image_copy_cursor_position(
if let Some(cursor_geometry) = seat.cursor_geometry( &shell,
(position - output_geometry.loc.to_f64()) &self.common.clock,
.as_logical() &output,
.to_buffer( &seat,
output.current_scale().fractional_scale(), position,
output.current_transform(), );
&output_geometry.size.to_f64().as_logical(),
),
self.common.clock.now(),
) {
let constraints = cursor_capture_constraints(Some(cursor_geometry));
if session
.current_constraints()
.map(|current_constraints| {
current_constraints.size != constraints.size
})
.unwrap_or(true)
{
session.update_constraints(constraints);
}
session.set_cursor_hotspot(cursor_geometry.hotspot);
session.set_cursor_pos(Some(cursor_geometry.geometry.loc));
}
}
} }
} }
InputEvent::PointerButton { event, .. } => { InputEvent::PointerButton { event, .. } => {
@ -2489,28 +2453,13 @@ impl State {
self.common.config.cosmic_conf.accessibility_zoom.view_moves, self.common.config.cosmic_conf.accessibility_zoom.view_moves,
); );
let output_geometry = output.geometry(); update_output_image_copy_cursor_position(
for session in cursor_sessions_for_output(&shell, &output) { &shell,
if let Some(cursor_geometry) = seat.cursor_geometry( &self.common.clock,
point.as_logical().to_buffer( &output,
output.current_scale().fractional_scale(), &seat,
output.current_transform(), point,
&output_geometry.size.to_f64().as_logical(), );
),
self.common.clock.now(),
) {
let constraints = cursor_capture_constraints(Some(cursor_geometry));
if session
.current_constraints()
.map(|current_constraints| current_constraints.size != constraints.size)
.unwrap_or(true)
{
session.update_constraints(constraints);
}
session.set_cursor_hotspot(cursor_geometry.hotspot);
session.set_cursor_pos(Some(cursor_geometry.geometry.loc));
}
}
} }
} }
} }
@ -2571,3 +2520,36 @@ fn mapped_output_for_device<'a, D: Device + 'static>(
}; };
map_to_output.or_else(|| shell.builtin_output()) map_to_output.or_else(|| shell.builtin_output())
} }
fn update_output_image_copy_cursor_position(
shell: &Shell,
clock: &Clock<Monotonic>,
output: &Output,
seat: &Seat<State>,
position: Point<f64, Global>,
) {
let output_geometry = output.geometry();
for session in cursor_sessions_for_output(&shell, &output) {
if let Some(cursor_geometry) = seat.cursor_geometry(
(position - output_geometry.loc.to_f64())
.as_logical()
.to_buffer(
output.current_scale().fractional_scale(),
output.current_transform(),
&output_geometry.size.to_f64().as_logical(),
),
clock.now(),
) {
let constraints = cursor_capture_constraints(Some(cursor_geometry));
if session
.current_constraints()
.map(|current_constraints| current_constraints.size != constraints.size)
.unwrap_or(true)
{
session.update_constraints(constraints);
}
session.set_cursor_hotspot(cursor_geometry.hotspot);
session.set_cursor_pos(Some(cursor_geometry.geometry.loc));
}
}
}