commit 868607710204d8a249290531a2efde1ef4362a0e
author Zijie He <zijiehe@google.com> Tue Oct 31 17:55:56 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Nov 01 18:17:07 2017 +0000
tree 562ac91abb031780807de1299c8f28d4e1227c83
parent 884ead083b938e3b5c6f85b3192aaaaaf01ea643

[Window Capturer] Inaccurate cursor position on cinnamon

When cinnamon is used, it always wraps the application window with its own
window. Instead of (0, 0), the DesktopRect from XWindowAttributes starts from
(10, 36).
So this change considers this difference when translating the DesktopRect in
GetWindowRect() function.

Bug: chromium:778035
Change-Id: I4944b2d1e13a4c379e114fd1749d74e95a63003b
Reviewed-on: https://webrtc-review.googlesource.com/17660
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Zijie He <zijiehe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#20538}

modules/desktop_capture/x11/window_list_utils.cc

diff --git a/modules/desktop_capture/x11/window_list_utils.cc b/modules/desktop_capture/x11/window_list_utils.cc
index 13bb941..13542ba 100644
--- a/modules/desktop_capture/x11/window_list_utils.cc
+++ b/modules/desktop_capture/x11/window_list_utils.cc
@@ -237,14 +237,16 @@
       return false;
     }
   }
+  *rect = DesktopRectFromXAttributes(*attributes);
+
   {
     XErrorTrap error_trap(display);
     ::Window child;
     if (!XTranslateCoordinates(display,
                                window,
                                attributes->root,
-                               0,
-                               0,
+                               -rect->left(),
+                               -rect->top(),
                                &offset_x,
                                &offset_y,
                                &child) ||
@@ -252,8 +254,6 @@
       return false;
     }
   }
-
-  *rect = DesktopRectFromXAttributes(*attributes);
   rect->Translate(offset_x, offset_y);
   return true;
 }