Changeset 47795 in vbox

Timestamp:

Aug 16, 2013 10:28:44 AM (11 years ago)

Author:

vboxsync

Message:

MouseImpl: map touch events to the primary monitor.

File:

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

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

@@ -712 +712 @@
     ComAssertRet(pDisplay, E_FAIL);
 
-    HRESULT rc = S_OK;
+    /* Touch events are mapped to the primary monitor, because the emulated USB
+     * touchscreen device is associated with one (normally the primary) screen in the guest.
+     */
+    ULONG uScreenId = 0;
+
+    ULONG cWidth  = 0;
+    ULONG cHeight = 0;
+    LONG  xOrigin = 0;
+    LONG  yOrigin = 0;
+    HRESULT rc = pDisplay->getScreenResolution(uScreenId, &cWidth, &cHeight, NULL, &xOrigin, &yOrigin);
+    ComAssertComRCRetRC(rc);
 
     uint64_t* pau64Contacts = NULL;
@@ -724 +734 @@
         if (pau64Contacts)
         {
-            int32_t x1, y1, x2, y2;
-            /* Takes the display lock */
-            pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2);
+            int32_t x1 = xOrigin;
+            int32_t y1 = yOrigin;
+            int32_t x2 = x1 + cWidth;
+            int32_t y2 = y1 + cHeight;
+
+            LogRel3(("%s: screen %d,%d %d,%d\n",
+                     __FUNCTION__, x1, y1, x2, y2));
 
             LONG i;
@@ -742 +756 @@
                          __FUNCTION__, i, x, y, contactId, fInContact, fInRange));
 
-                /* Framebuffer dimensions are 0,0 width, height, that is x2,y2 are exclusive,
+                /* Screen dimensions are 0,0 width, height, that is x2,y2 are exclusive,
                  * while coords are inclusive.
                  */
-                int32_t xAdj = x1 < x2 ?   ((x - 1 - x1) * VMMDEV_MOUSE_RANGE)
-                                         / (x2 - x1) : 0;
-                int32_t yAdj = y1 < y2 ?   ((y - 1 - y1) * VMMDEV_MOUSE_RANGE)
-                                         / (y2 - y1) : 0;
+                if (x < x1 || x >= x2 || y < y1 || y >= y2)
+                {
+                    /* Out of range. Skip the contact. */
+                    continue;
+                }
+
+                int32_t xAdj = x1 < x2? ((x - 1 - x1) * VMMDEV_MOUSE_RANGE) / (x2 - x1) : 0;
+                int32_t yAdj = y1 < y2? ((y - 1 - y1) * VMMDEV_MOUSE_RANGE) / (y2 - y1) : 0;
 
                 bool fValid = (   xAdj >= VMMDEV_MOUSE_RANGE_MIN