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

input: Simplify logic when cursor is outside outputs

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-09-30 11:31:41 +04:00
parent f381db8354
commit a413f3e91d
1 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.rs
+5 -24
View File
@@ -17,7 +17,7 @@ use smithay::wayland::tablet_manager::{TabletDescriptor, TabletSeatTrait};
use crate::config::{Action, Config, Modifiers};
use crate::niri::State;
use crate::utils::{get_monotonic_time, spawn};
use crate::utils::{center, get_monotonic_time, spawn};
pub enum CompositorMod {
Super,
@@ -335,29 +335,10 @@ impl State {
.clamp(geom.loc.y as f64, (geom.loc.y + geom.size.h - 1) as f64);
} else {
// The pointer was not on any output in the first place. Find one for it.
// Start by clamping the X coordinate.
let mut min_x = i32::MAX;
let mut max_x = 0;
for output in self.niri.global_space.outputs() {
let geom = self.niri.global_space.output_geometry(output).unwrap();
min_x = min_x.min(geom.loc.x);
max_x = max_x.max(geom.loc.x + geom.size.w);
}
new_pos.x = new_pos.x.clamp(min_x as f64, (max_x - 1) as f64);
// Now clamp the Y coordinate. Assume every X from min to max has some
// output.
let geom = self
.niri
.global_space
.outputs()
.map(|output| self.niri.global_space.output_geometry(output).unwrap())
.find(|geom| geom.contains((new_pos.x as i32, geom.loc.y)))
.unwrap();
new_pos.y = new_pos
.y
.clamp(geom.loc.y as f64, (geom.loc.y + geom.size.h - 1) as f64);
// Let's do the simple thing and just put it on the first output.
let output = self.niri.global_space.outputs().next().unwrap();
let geom = self.niri.global_space.output_geometry(output).unwrap();
new_pos = center(geom).to_f64();
}
}