diff mbox

[FFmpeg-devel] gdigrab: fix mouse position for multi-monitor setup with different scale settings

Message ID 7eecfd0d-406e-f3ad-1dd1-d5090aa98e05@gmail.com
State New
Headers show

Commit Message

Dilshod Mukhtarov July 5, 2019, 7:48 p.m. UTC 
Hi,

This is the patch that fixes the drawing of cursor in incorrect position 
on Windows with multi-monitor setup with different scales on different 
monitors
diff mbox

Patch

From 17f2a9b956d440bfedc38f8a6de50886de04b1dd Mon Sep 17 00:00:00 2001
From: Dilshod Muktharov <dilshodm@gmail.com>
Date: Thu, 4 Jul 2019 23:33:27 +0400
Subject: [PATCH 2/2] Cursor recording HighDPI support for Windows
 multi-monitor mode

---
 libavdevice/gdigrab.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c
index 276b448692..eeae9ba5a7 100644
--- a/libavdevice/gdigrab.c
+++ b/libavdevice/gdigrab.c
@@ -644,6 +644,10 @@  static void paint_mouse_pointer(AVFormatContext *s1, struct gdigrab *gdigrab)
         info.hbmMask = NULL;
         info.hbmColor = NULL;
 
+        int log_x = ci.ptScreenPos.x;
+        int log_y = ci.ptScreenPos.y;
+        int ind   = get_monitor_id_by_logical_point(log_x, log_y);
+
         if (ci.flags != CURSOR_SHOWING)
             return;
 
@@ -663,21 +667,17 @@  static void paint_mouse_pointer(AVFormatContext *s1, struct gdigrab *gdigrab)
             RECT rect;
 
             if (GetWindowRect(hwnd, &rect)) {
-                pos.x = ci.ptScreenPos.x - clip_rect.left - info.xHotspot - rect.left;
-                pos.y = ci.ptScreenPos.y - clip_rect.top - info.yHotspot - rect.top;
-
-                //that would keep the correct location of mouse with hidpi screens
-                pos.x = pos.x * desktophorzres / horzres;
-                pos.y = pos.y * desktopvertres / vertres;
+                /* make cursor's logical coordinates relative to window */
+                log_x -= rect.left;
+                log_y -= rect.top;
             } else {
                 CURSOR_ERROR("Couldn't get window rectangle");
                 goto icon_error;
             }
-        } else {
-            //that would keep the correct location of mouse with hidpi screens
-            pos.x = ci.ptScreenPos.x * desktophorzres / horzres - clip_rect.left - info.xHotspot;
-            pos.y = ci.ptScreenPos.y * desktopvertres / vertres - clip_rect.top - info.yHotspot;
         }
+        /* that would keep the correct location of mouse with hidpi screens */
+        pos.x = LOGICAL_TO_PHYSICAL_X(log_x, ind) - clip_rect.left - info.xHotspot;
+        pos.y = LOGICAL_TO_PHYSICAL_Y(log_y, ind) - clip_rect.top  - info.yHotspot;
 
         av_log(s1, AV_LOG_DEBUG, "Cursor pos (%li,%li) -> (%li,%li)\n",
                 ci.ptScreenPos.x, ci.ptScreenPos.y, pos.x, pos.y);
-- 
2.21.0.windows.1