From 3bb7e603115d59441a700deadf11d9fd834386ea Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sat, 29 Mar 2025 12:38:43 +0300
Subject: layout: Remove duplicated function

---
 src/handlers/mod.rs |  2 +-
 src/input/mod.rs    |  8 ++++----
 src/layout/mod.rs   | 17 -----------------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 198c263a..d9b029c5 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -373,7 +373,7 @@ impl ClientDndGrabHandler for State {
                 // We can't even get the current pointer location because it's locked (we're deep
                 // in the grab call stack here). So use the last known one.
                 if let Some(output) = &self.niri.pointer_contents.output {
-                    self.niri.layout.activate_output(output);
+                    self.niri.layout.focus_output(output);
                 }
             }
         }
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 92b4bffe..a4508338 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -2237,7 +2237,7 @@ impl State {
                 let mod_down = modifiers_from_state(mods).contains(mod_key.to_modifiers());
                 if mod_down {
                     if let Some(output) = self.niri.output_under_cursor() {
-                        self.niri.layout.activate_output(&output);
+                        self.niri.layout.focus_output(&output);
 
                         let location = pointer.current_location();
                         let start_data = PointerGrabStartData {
@@ -2368,7 +2368,7 @@ impl State {
                 // FIXME: granular.
                 self.niri.queue_redraw_all();
             } else if let Some(output) = self.niri.output_under_cursor() {
-                self.niri.layout.activate_output(&output);
+                self.niri.layout.focus_output(&output);
 
                 // FIXME: granular.
                 self.niri.queue_redraw_all();
@@ -2687,7 +2687,7 @@ impl State {
                             // FIXME: granular.
                             self.niri.queue_redraw_all();
                         } else if let Some(output) = under.output {
-                            self.niri.layout.activate_output(&output);
+                            self.niri.layout.focus_output(&output);
 
                             // FIXME: granular.
                             self.niri.queue_redraw_all();
@@ -3084,7 +3084,7 @@ impl State {
                 // FIXME: granular.
                 self.niri.queue_redraw_all();
             } else if let Some(output) = under.output {
-                self.niri.layout.activate_output(&output);
+                self.niri.layout.focus_output(&output);
 
                 // FIXME: granular.
                 self.niri.queue_redraw_all();
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index f35a3b76..658d50af 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -1576,23 +1576,6 @@ impl<W: LayoutElement> Layout<W> {
         }
     }
 
-    pub fn activate_output(&mut self, output: &Output) {
-        let MonitorSet::Normal {
-            monitors,
-            active_monitor_idx,
-            ..
-        } = &mut self.monitor_set
-        else {
-            return;
-        };
-
-        let idx = monitors
-            .iter()
-            .position(|mon| &mon.output == output)
-            .unwrap();
-        *active_monitor_idx = idx;
-    }
-
     pub fn active_output(&self) -> Option<&Output> {
         let MonitorSet::Normal {
             monitors,
-- 
cgit