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

input: when updating pointer in the confined mode, recalibrate to the valid coordinates

Browse source
This commit is contained in:
Skygrango 2026-05-13 20:05:39 +08:00 • committed by Ian Douglas Scott
parent a533ac1ec3
commit 9702aae523
1 changed files with 117 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

118
src/input/mod.rs
View file

@ -354,27 +354,6 @@ impl State {
_ => {} _ => {}
}); });
} }
let original_position = position;
position += event.delta().as_global();
let output = shell
.outputs()
.find(|output| output.geometry().to_f64().contains(position))
.cloned()
.unwrap_or(current_output.clone());
let output_geometry = output.geometry();
position.x = position.x.clamp(
output_geometry.loc.x as f64,
(output_geometry.loc.x + output_geometry.size.w - 1) as f64,
);
position.y = position.y.clamp(
output_geometry.loc.y as f64,
(output_geometry.loc.y + output_geometry.size.h - 1) as f64,
);
let new_under = State::surface_under(position, &output, &shell)
.map(|(target, pos)| (target, pos.as_logical()));
std::mem::drop(shell); std::mem::drop(shell);
ptr.relative_motion( ptr.relative_motion(
@ -392,6 +371,25 @@ impl State {
return; return;
} }
let original_position = position;
position += event.delta().as_global();
let shell = self.common.shell.read();
let output = shell
.outputs()
.find(|output| output.geometry().to_f64().contains(position))
.cloned()
.unwrap_or(current_output.clone());
drop(shell);
let output_geometry = output.geometry();
position.x = position.x.clamp(
output_geometry.loc.x as f64,
(output_geometry.loc.x + output_geometry.size.w - 1) as f64,
);
position.y = position.y.clamp(
output_geometry.loc.y as f64,
(output_geometry.loc.y + output_geometry.size.h - 1) as f64,
);
if ptr.is_grabbed() { if ptr.is_grabbed() {
if seat if seat
.user_data() .user_data()
@ -499,14 +497,21 @@ impl State {
} }
} }
// If confined, don't move pointer if it would go outside surface or region // If confined, help user to update valid coordinates can improve user experience
if pointer_confined && let Some((surface, surface_loc)) = &under { let shell = self.common.shell.read();
if new_under.as_ref().and_then(|(under, _)| under.wl_surface()) let new_under = if pointer_confined && let Some((surface, surface_loc)) = &under
!= surface.wl_surface()
{ {
ptr.frame(self); let is_legal = |pos: Point<f64, Global>, shell: &Shell| {
return; let new_under = State::surface_under(pos, &output, shell)
} .map(|(target, pos)| (target, pos.as_logical()));
//We should only check size, not the surface, so that we can move the mouse over the OSD in confined mode
// if new_under.as_ref().and_then(|(under, _)| under.wl_surface())
// != surface.wl_surface()
// {
// return (false, None);
// }
match surface { match surface {
PointerFocusTarget::WlSurface { surface, .. } => { PointerFocusTarget::WlSurface { surface, .. } => {
if under_from_surface_tree( if under_from_surface_tree(
@ -517,8 +522,7 @@ impl State {
) )
.is_none() .is_none()
{ {
ptr.frame(self); return (false, None);
return;
} }
} }
PointerFocusTarget::X11Surface { surface, .. } => { PointerFocusTarget::X11Surface { surface, .. } => {
@ -530,20 +534,54 @@ impl State {
) )
.is_none() .is_none()
{ {
ptr.frame(self); return (false, None);
return;
} }
} }
_ => {} _ => {}
} }
if let Some(region) = confine_region
if let Some(region) = &confine_region
&& !region && !region
.contains((position.as_logical() - *surface_loc).to_i32_round()) .contains((pos.as_logical() - *surface_loc).to_i32_round())
{ {
return (false, None);
}
(true, new_under)
};
match is_legal(position, &shell) {
(true, under) => under,
_ => {
let y_only_pos = Point::new(original_position.x, position.y);
let x_only_pos = Point::new(position.x, original_position.y);
match is_legal(y_only_pos, &shell) {
(true, under) => {
position = y_only_pos;
under
}
_ => match is_legal(x_only_pos, &shell) {
(true, under) => {
position = x_only_pos;
under
}
_ => {
position = original_position;
None
}
},
}
}
}
} else {
State::surface_under(position, &output, &shell)
.map(|(target, pos)| (target, pos.as_logical()))
};
drop(shell);
if pointer_confined && new_under.is_none() {
ptr.frame(self); ptr.frame(self);
return; return;
} }
}
let serial = SERIAL_COUNTER.next_serial(); let serial = SERIAL_COUNTER.next_serial();
ptr.motion( ptr.motion(
@ -557,10 +595,17 @@ impl State {
); );
ptr.frame(self); ptr.frame(self);
// If pointer is now in a constraint region, activate it // If pointer is now in a constraint region and window is in focused, activate it
if let Some((under, surface_location)) = new_under if let Some((under, surface_location)) = new_under
.and_then(|(target, loc)| Some((target.wl_surface()?.into_owned(), loc))) .and_then(|(target, loc)| Some((target.wl_surface()?.into_owned(), loc)))
{ {
let shell = self.common.shell.read();
let is_focused = seat
.get_keyboard()
.and_then(|k| k.current_focus())
.is_some_and(|f| f.has_surface(&shell, &under));
if is_focused {
with_pointer_constraint(&under, &ptr, |constraint| match constraint { with_pointer_constraint(&under, &ptr, |constraint| match constraint {
Some(constraint) if !constraint.is_active() => { Some(constraint) if !constraint.is_active() => {
let region = match &*constraint { let region = match &*constraint {
@ -576,6 +621,7 @@ impl State {
_ => {} _ => {}
}); });
} }
}
let mut shell = self.common.shell.write(); let mut shell = self.common.shell.write();
shell.update_pointer_position(position.to_local(&output), &output); shell.update_pointer_position(position.to_local(&output), &output);