Fix scaling of wayland platform pointer and touch location

canonical · Sep 11, 2023 · d10aff8 · d10aff8
1 parent 2ed58d2
commit d10aff8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/platforms/wayland/display.cpp b/src/platforms/wayland/display.cpp
@@ -369,7 +369,9 @@ void mir::graphics::wayland::Display::pointer_motion(wl_pointer* pointer, uint32
 {
     {
         std::lock_guard lock{sink_mutex};
-        pointer_pos = geom::PointF{wl_fixed_to_double(x), wl_fixed_to_double(y)} + geom::DisplacementF{pointer_displacement};
+        auto const descaled_x = host_scale * wl_fixed_to_double(x);
+        auto const descaled_y = host_scale * wl_fixed_to_double(y);
+        pointer_pos = geom::PointF{descaled_x, descaled_y} + pointer_displacement;
         pointer_time = std::chrono::milliseconds{time};
     }
 
@@ -449,8 +451,8 @@ void mir::graphics::wayland::Display::touch_down(
         touch_time = std::chrono::milliseconds{time};
         contact->action = mir_touch_action_down;
         contact->position = geom::PointF{
-            wl_fixed_to_double(x) + touch_displacement.dx.as_int(),
-            wl_fixed_to_double(y) + touch_displacement.dy.as_int()};
+            host_scale*wl_fixed_to_double(x) + touch_displacement.dx.as_int(),
+            host_scale*wl_fixed_to_double(y) + touch_displacement.dy.as_int()};
     }
 }
 
@@ -479,8 +481,8 @@ void mir::graphics::wayland::Display::touch_motion(wl_touch* touch, uint32_t tim
         touch_time = std::chrono::milliseconds{time};
         contact->action = mir_touch_action_change;
         contact->position = geom::PointF{
-            wl_fixed_to_double(x) + touch_displacement.dx.as_int(),
-            wl_fixed_to_double(y) + touch_displacement.dy.as_int()};
+            host_scale*wl_fixed_to_double(x) + touch_displacement.dx.as_int(),
+            host_scale*wl_fixed_to_double(y) + touch_displacement.dy.as_int()};
     }
 
     DisplayClient::touch_motion(touch, time, id, x, y);

diff --git a/src/platforms/wayland/displayclient.cpp b/src/platforms/wayland/displayclient.cpp
@@ -719,7 +719,8 @@ void mgw::DisplayClient::pointer_enter(
     {
         if (surface == out.second->surface)
         {
-            pointer_displacement = out.second->dcout.top_left - geometry::Point{};
+            pointer_displacement = geom::DisplacementF{out.second->dcout.top_left - geometry::Point{}};
+            host_scale = out.second->host_scale;
             break;
         }
     }

diff --git a/src/platforms/wayland/displayclient.h b/src/platforms/wayland/displayclient.h
@@ -159,8 +159,9 @@ class DisplayClient
     xkb_keymap* keyboard_map_ = nullptr;
     xkb_state* keyboard_state_ = nullptr;
     bool fake_pointer_frame = false;
-    geometry::Displacement pointer_displacement; // Position of current output
+    geometry::DisplacementF pointer_displacement; // Position of current output
     geometry::Displacement touch_displacement;   // Position of current output
+    float host_scale{1.0f};
 
     std::unique_ptr<wl_registry, decltype(&wl_registry_destroy)> registry;