Fix possible incorrect monitor

3 files changed, 31 insertions, 6 deletions

diff --git a/TODO b/TODO
index b7ecb70..b29218a 100644
--- a/TODO
+++ b/TODO
@@ -153,4 +153,4 @@ Use /dev/input/eventN (or /dev/hidrawN) instead of /dev/input/jsN for joystick i
 
 Verify if cursor tracker monitor name is always correct. It uses the wayland monitor name for recording, but gpu screen recorder uses a custom name created from the drm connector name.
 
-Notification with the focused monitor (with CursorTrackerWayland) assumes that the x11 monitor name is the same as the drm monitor name.
\ No newline at end of file
+Notification with the focused monitor (with CursorTrackerWayland) assumes that the x11 monitor name is the same as the drm monitor name. Same for find_monitor_by_name.
\ No newline at end of file
diff --git a/src/CursorTrackerWayland.cpp b/src/CursorTrackerWayland.cpp
index a7473b9..5f37d0a 100644
--- a/src/CursorTrackerWayland.cpp
+++ b/src/CursorTrackerWayland.cpp
@@ -399,24 +399,39 @@ namespace gsr {
             return;
 
         for(uint32_t i = 0; i < planes->count_planes; ++i) {
+            drmModePlanePtr plane = nullptr;
+            const drm_connector *connector = nullptr;
             int crtc_x = 0;
             int crtc_y = 0;
             int crtc_id = 0;
             bool is_cursor = false;
-            const uint32_t property_mask = plane_get_properties(drm_fd, planes->planes[i], &crtc_x, &crtc_y, &crtc_id, &is_cursor);
+            uint32_t property_mask = 0;
+
+            plane = drmModeGetPlane(drm_fd, planes->planes[i]);
+            if(!plane)
+                goto next;
+
+            if(!plane->fb_id)
+                goto next;
+
+            property_mask = plane_get_properties(drm_fd, planes->planes[i], &crtc_x, &crtc_y, &crtc_id, &is_cursor);
             if(property_mask != plane_property_all || crtc_id <= 0)
-                continue;
+                goto next;
 
-            const drm_connector *connector = get_drm_connector_by_crtc_id(&connectors, crtc_id);
+            connector = get_drm_connector_by_crtc_id(&connectors, crtc_id);
             if(!connector)
-                continue;
+                goto next;
 
             if(crtc_x >= 0 && crtc_x <= connector->size.x && crtc_y >= 0 && crtc_y <= connector->size.y) {
                 latest_cursor_position.x = crtc_x;
                 latest_cursor_position.y = crtc_y;
                 latest_crtc_id = crtc_id;
+                drmModeFreePlane(plane);
                 break;
             }
+
+            next:
+            drmModeFreePlane(plane);
         }
 
         drmModeFreePlaneResources(planes);
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 01b25ba..3ae81a5 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -216,6 +216,16 @@ namespace gsr {
         return &monitors.front();
     }
 
+    // Returns the first monitor if not found. Assumes there is at least one monitor connected.
+    static const Monitor* find_monitor_by_name(const std::vector<Monitor> &monitors, const std::string &name) {
+        assert(!monitors.empty());
+        for(const Monitor &monitor : monitors) {
+            if(monitor.name == name)
+                return &monitor;
+        }
+        return &monitors.front();
+    }
+
     static std::string get_power_supply_online_filepath() {
         std::string result;
         const char *paths[] = {
@@ -846,7 +856,7 @@ namespace gsr {
         mgl::vec2i cursor_position = get_cursor_position(display, &x11_cursor_window);
         const Monitor *focused_monitor = nullptr;
         if(cursor_info) {
-            focused_monitor = find_monitor_at_position(monitors, cursor_info->position);
+            focused_monitor = find_monitor_by_name(monitors, cursor_info->monitor_name);
             cursor_position = cursor_info->position;
         } else {
             const mgl::vec2i monitor_position_query_value = (x11_cursor_window || gsr_info.system_info.display_server != DisplayServer::WAYLAND) ? cursor_position : create_window_get_center_position(display);