From 06c972c989a1df2ff444bc7c84b765920f9a7036 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Tue, 12 Jul 2022 19:59:58 +0200
Subject: [PATCH] input: Fix swapping focus with multiple outputs

---
 src/input/mod.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/input/mod.rs b/src/input/mod.rs
index 015129f2..d073f77d 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -306,11 +306,15 @@ impl State {
                                         0 => 9,
                                         x => x - 1,
                                     };
-                                    self.common.shell.activate(
+                                    if let Some(motion_event) = self.common.shell.activate(
                                         seat,
                                         &current_output,
                                         workspace as usize,
-                                    );
+                                    ) {
+                                        if let Some(ptr) = seat.get_pointer() {
+                                            ptr.motion(self, dh, &motion_event);
+                                        }
+                                    }
                                 }
                                 Action::MoveToWorkspace(key_num) => {
                                     let current_output = active_output(seat, &self.common);