Changeset 38271 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2011 9:01:03 PM (13 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: correct absolute axis scaling to return the centre of the cursor hotspot pixel to the guest

File:

• trunk/src/VBox/Main/src-client/MouseImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -48 +48 @@
     MOUSE_RANGE_LOWER = 0,
     /** Higher end */
-    MOUSE_RANGE_UPPER = 0xFFFF
+    MOUSE_RANGE_UPPER = 0xFFFF,
+    /** Full range */
+    MOUSE_RANGE = MOUSE_RANGE_UPPER - MOUSE_RANGE_LOWER
 };
 /** @} */
@@ -501 +503 @@
             return rc;
 
-        *pcX = displayWidth ? ((x - 1) * MOUSE_RANGE_UPPER) / (LONG) displayWidth: 0;
-        *pcY = displayHeight ? ((y - 1) * MOUSE_RANGE_UPPER) / (LONG) displayHeight: 0;
+        *pcX = displayWidth ? (x * MOUSE_RANGE - MOUSE_RANGE / 2) / (LONG) displayWidth: 0;
+        *pcY = displayHeight ? (y * MOUSE_RANGE - MOUSE_RANGE / 2) / (LONG) displayHeight: 0;
     }
     else
@@ -509 +511 @@
         /* Takes the display lock */
         pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2);
-        *pcX = x1 < x2 ? (x - 1 - x1) * MOUSE_RANGE_UPPER / (x2 - x1 - 1) : 0;
-        *pcY = y1 < y2 ? (y - 1 - y1) * MOUSE_RANGE_UPPER / (y2 - y1 - 1) : 0;
+        *pcX = x1 < x2 ? ((x - x1) * MOUSE_RANGE - MOUSE_RANGE / 2) / (x2 - x1) : 0;
+        *pcY = y1 < y2 ? ((y - y1) * MOUSE_RANGE - MOUSE_RANGE / 2) / (y2 - y1) : 0;
         if (   *pcX < MOUSE_RANGE_LOWER || *pcX > MOUSE_RANGE_UPPER
             || *pcY < MOUSE_RANGE_LOWER || *pcY > MOUSE_RANGE_UPPER)