andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Simplify pointer handling in constraint check

Browse Source 
Minor change so that `get_pointer()` (which has a lock) does not get
called twice. Also moved the call to `current_location()` to the scope
where it is needed.
This commit is contained in:
abmantis
2025-07-13 15:49:08 +01:00
committed by Ivan Molodetskikh
parent bb40a35ccf
commit 51b6a495c5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+4 -5
View File
@@ -5769,18 +5769,16 @@ impl Niri {
/// ///
/// Make sure the pointer location and contents are up to date before calling this. /// Make sure the pointer location and contents are up to date before calling this.
pub fn maybe_activate_pointer_constraint(&self) { pub fn maybe_activate_pointer_constraint(&self) {
let pointer = self.seat.get_pointer().unwrap();
let pointer_pos = pointer.current_location();
let Some((surface, surface_loc)) = &self.pointer_contents.surface else { let Some((surface, surface_loc)) = &self.pointer_contents.surface else {
return; return;
}; };
let pointer = self.seat.get_pointer().unwrap();
if Some(surface) != pointer.current_focus().as_ref() { if Some(surface) != pointer.current_focus().as_ref() {
return; return;
} }
let pointer = &self.seat.get_pointer().unwrap(); with_pointer_constraint(surface, &pointer, |constraint| {
with_pointer_constraint(surface, pointer, |constraint| {
let Some(constraint) = constraint else { return }; let Some(constraint) = constraint else { return };
if constraint.is_active() { if constraint.is_active() {
@@ -5789,6 +5787,7 @@ impl Niri {
// Constraint does not apply if not within region. // Constraint does not apply if not within region.
if let Some(region) = constraint.region() { if let Some(region) = constraint.region() {
let pointer_pos = pointer.current_location();
let pos_within_surface = pointer_pos - *surface_loc; let pos_within_surface = pointer_pos - *surface_loc;
if !region.contains(pos_within_surface.to_i32_round()) { if !region.contains(pos_within_surface.to_i32_round()) {
return; return;