Fix output tracking (outputs are not identified by scale) (#3582)

Drive-by fix
canonical · Sep 5, 2024 · b56aa20 · b56aa20
2 parents 8b942e9 + b6b0300
commit b56aa20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/server/frontend_wayland/fractional_scale_v1.cpp b/src/server/frontend_wayland/fractional_scale_v1.cpp
@@ -98,7 +98,7 @@ void mf::FractionalScaleV1::output_entered(mir::graphics::DisplayConfigurationOu
 
 void mf::FractionalScaleV1::output_left(mir::graphics::DisplayConfigurationOutput const& config)
 {
-    surface_outputs.erase({config.id, config.scale});
+    surface_outputs.erase(config.id);
     recompute_scale();
 }
 

diff --git a/src/server/frontend_wayland/fractional_scale_v1.h b/src/server/frontend_wayland/fractional_scale_v1.h
@@ -19,7 +19,7 @@
 
 #include "fractional-scale-v1_wrapper.h"
 #include "mir/graphics/display_configuration.h"
-#include <set>
+#include <unordered_map>
 #include <utility>
 
 namespace mir
@@ -42,7 +42,7 @@ class FractionalScaleV1 : public wayland::FractionalScaleV1
 private:
   // Houses a set of outputs the surface occupies
   using Id = mir::graphics::DisplayConfigurationOutputId;
-  std::set<std::pair<Id, float>> surface_outputs;
+  std::unordered_map<Id, float> surface_outputs;
 
   void recompute_scale();
 };

diff --git a/src/server/frontend_wayland/wayland_surface_observer.cpp b/src/server/frontend_wayland/wayland_surface_observer.cpp
@@ -118,12 +118,20 @@ void mf::WaylandSurfaceObserver::input_consumed(ms::Surface const*, std::shared_
 
 void mf::WaylandSurfaceObserver::entered_output(ms::Surface const*, graphics::DisplayConfigurationOutputId const& id)
 {
-    impl->window.value().handle_enter_output(id);
+    run_on_wayland_thread_unless_window_destroyed(
+        [id](Impl* impl, WindowWlSurfaceRole*)
+        {
+            impl->window.value().handle_enter_output(id);
+        });
 }
 
 void mf::WaylandSurfaceObserver::left_output(ms::Surface const*, graphics::DisplayConfigurationOutputId const& id)
 {
-    impl->window.value().handle_leave_output(id);
+    run_on_wayland_thread_unless_window_destroyed(
+        [id](Impl* impl, WindowWlSurfaceRole*)
+        {
+            impl->window.value().handle_leave_output(id);
+        });
 }
 
 void mf::WaylandSurfaceObserver::run_on_wayland_thread_unless_window_destroyed(