diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2023-09-05 17:27:54 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2023-09-05 17:27:54 +0400 |
| commit | b7f51fe44d51a6044f76caa2a36f01949184b9c0 (patch) | |
| tree | f6a1772a750ac0fc2ae6e9e4bbdb6099ba956f53 | |
| parent | 5225bc9e558cd87ed54271e47dcddaac2d5bcf62 (diff) | |
| download | niri-b7f51fe44d51a6044f76caa2a36f01949184b9c0.tar.gz niri-b7f51fe44d51a6044f76caa2a36f01949184b9c0.tar.bz2 niri-b7f51fe44d51a6044f76caa2a36f01949184b9c0.zip | |
input: Remove some unwraps
| -rw-r--r-- | src/input.rs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/input.rs b/src/input.rs index ad83d331..3dc589c0 100644 --- a/src/input.rs +++ b/src/input.rs @@ -344,7 +344,9 @@ impl State { self.niri.queue_redraw_all(); } InputEvent::PointerMotionAbsolute { event, .. } => { - let output = self.niri.global_space.outputs().next().unwrap(); + let Some(output) = self.niri.global_space.outputs().next() else { + return; + }; let output_geo = self.niri.global_space.output_geometry(output).unwrap(); @@ -383,8 +385,7 @@ impl State { if let Some(window) = self.niri.window_under_cursor() { let window = window.clone(); self.niri.monitor_set.activate_window(&window); - } else { - let output = self.niri.output_under_cursor().unwrap(); + } else if let Some(output) = self.niri.output_under_cursor() { self.niri.monitor_set.activate_output(&output); } }; @@ -433,7 +434,9 @@ impl State { } InputEvent::TabletToolAxis { event, .. } => { // FIXME: allow mapping tablet to different outputs. - let output = self.niri.global_space.outputs().next().unwrap(); + let Some(output) = self.niri.global_space.outputs().next() else { + return; + }; let output_geo = self.niri.global_space.output_geometry(output).unwrap(); @@ -505,8 +508,7 @@ impl State { if let Some(window) = self.niri.window_under_cursor() { let window = window.clone(); self.niri.monitor_set.activate_window(&window); - } else { - let output = self.niri.output_under_cursor().unwrap(); + } else if let Some(output) = self.niri.output_under_cursor() { self.niri.monitor_set.activate_output(&output); } }; @@ -519,7 +521,9 @@ impl State { } InputEvent::TabletToolProximity { event, .. } => { // FIXME: allow mapping tablet to different outputs. - let output = self.niri.global_space.outputs().next().unwrap(); + let Some(output) = self.niri.global_space.outputs().next() else { + return; + }; let output_geo = self.niri.global_space.output_geometry(output).unwrap(); |