Changeset 34835 in vbox for trunk/src

Timestamp:

Dec 8, 2010 2:10:49 PM (14 years ago)

Author:

vboxsync

Message:

Main: fix mouse reporting which was broken in the path used by Linux guests with pre-4.0 Additions

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (1 diff)
• MouseImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -935 +935 @@
                                        int32_t *px2, int32_t *py2)
 {
+    int32_t x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     AssertPtrReturnVoid(px1);
     AssertPtrReturnVoid(py1);
     AssertPtrReturnVoid(px2);
     AssertPtrReturnVoid(py2);
-    int32_t x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-    for (unsigned i = 0; i < mcMonitors; ++i)
+    LogFlowFunc(("\n"));
+
+    if (!mpDrv)
+        return;
+    x2 = mpDrv->IConnector.cx;
+    y2 = mpDrv->IConnector.cy;
+    for (unsigned i = 1; i < mcMonitors; ++i)
     {
         x1 = RT_MIN(x1, maFramebuffers[i].xOrigin);

trunk/src/VBox/Main/MouseImpl.cpp

@@ -468 +468 @@
     {
         int32_t x1, y1, x2, y2;
+        /* Takes the display lock */
         pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2);
         *pcX = x1 != x2 ? (x - 1 - x1) * 0xFFFF / (x2 - x1) : 0;