Changeset 34754 in vbox for trunk

Timestamp:

Dec 6, 2010 2:40:03 PM (14 years ago)

Author:

vboxsync

Message:

Main/VMMDev: optionally report multi-monitor mouse co-ordinates relative to the whole virtual framebuffer and not to the first screen

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (2 diffs)
• src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c (modified) (2 diffs)
• src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/DisplayImpl.h (modified) (1 diff)
• src/VBox/Main/DisplayImpl.cpp (modified) (1 diff)
• src/VBox/Main/MouseImpl.cpp (modified) (2 diffs)
• src/VBox/Main/include/DisplayImpl.h (modified) (1 diff)

trunk/include/VBox/VMMDev.h

@@ -266 +266 @@
 #define VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER                  RT_BIT(3)
 /** The guest can read VMMDev events to find out about pointer movement */
-#define VMMDEV_MOUSE_GUEST_USES_EVENT                       RT_BIT(4)
+#define VMMDEV_MOUSE_NEW_PROTOCOL                           RT_BIT(4)
 /** If the guest changes the status of the
  * VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR bit, the host will honour this */
@@ -281 +281 @@
 /** The mask of all capabilities which the guest can legitimately change */
 #define VMMDEV_MOUSE_GUEST_MASK \
-      (VMMDEV_MOUSE_NOTIFY_HOST_MASK | VMMDEV_MOUSE_GUEST_USES_EVENT)
+      (VMMDEV_MOUSE_NOTIFY_HOST_MASK | VMMDEV_MOUSE_NEW_PROTOCOL)
 /** The mask of host capability changes for which notification events should
  * be sent */

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

@@ -177 +177 @@
             rc = VbglR3SetMouseStatus(  fFeatures
                                       | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                      | VMMDEV_MOUSE_GUEST_USES_EVENT);
+                                      | VMMDEV_MOUSE_NEW_PROTOCOL);
         if (!RT_SUCCESS(rc)) {
             xf86Msg(X_ERROR, "%s: Failed to switch guest mouse into absolute mode\n",
@@ -194 +194 @@
             rc = VbglR3SetMouseStatus(  fFeatures
                                       & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                      & ~VMMDEV_MOUSE_GUEST_USES_EVENT);
+                                      & ~VMMDEV_MOUSE_NEW_PROTOCOL);
         xf86RemoveEnabledDevice(pInfo);
         device->public.on = FALSE;

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -210 +210 @@
         *aBitsPerPixel = getBitsPerPixel();
     return S_OK;
+}
+
+void Display::getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                       int32_t *px2, int32_t *py2)
+{
+    AssertPtrReturnVoid(px1);
+    AssertPtrReturnVoid(py1);
+    AssertPtrReturnVoid(px2);
+    AssertPtrReturnVoid(py2);
+    *px1 = 0;
+    *py1 = 0;
+    *px2 = getWidth();
+    *py2 = getHeight();
 }
 

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -55 +55 @@
     STDMETHODIMP ResizeCompleted();
     STDMETHODIMP GetScreenResolution(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel);
+    void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2,
+                                  int32_t *py2);
 
     void resetFramebuffer();

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -930 +930 @@
             mParent->consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h);
     }
+}
+
+void Display::getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                       int32_t *px2, int32_t *py2)
+{
+    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)
+    {
+        x1 = RT_MIN(x1, maFramebuffers[i].xOrigin);
+        y1 = RT_MIN(y1, maFramebuffers[i].yOrigin);
+        x2 = RT_MAX(x2, maFramebuffers[i].xOrigin + (int32_t)maFramebuffers[i].w);
+        y2 = RT_MAX(y2, maFramebuffers[i].yOrigin + (int32_t)maFramebuffers[i].h);
+    }
+    *px1 = x1;
+    *py1 = y1;
+    *px2 = x2;
+    *py2 = y2;
 }
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -453 +453 @@
     ComAssertRet(pDisplay, E_FAIL);
 
-    ULONG displayWidth, displayHeight;
-    /* Takes the display lock */
-    HRESULT rc = pDisplay->GetScreenResolution (0, &displayWidth, &displayHeight,
-                                                NULL);
-    if (FAILED(rc))
-        return rc;
-
-    *pcX = displayWidth ? ((x - 1) * 0xFFFF) / displayWidth: 0;
-    *pcY = displayHeight ? ((y - 1) * 0xFFFF) / displayHeight: 0;
+    if (!(mfVMMDevGuestCaps & VMMDEV_MOUSE_NEW_PROTOCOL))
+    {
+        ULONG displayWidth, displayHeight;
+        /* Takes the display lock */
+        HRESULT rc = pDisplay->GetScreenResolution(0, &displayWidth, &displayHeight,
+                                                   NULL);
+        if (FAILED(rc))
+            return rc;
+
+        *pcX = displayWidth ? ((x - 1) * 0xFFFF) / displayWidth: 0;
+        *pcY = displayHeight ? ((y - 1) * 0xFFFF) / displayHeight: 0;
+    }
+    else
+    {
+        int32_t x1, y1, x2, y2;
+        pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2);
+        *pcX = x1 != x2 ? (x - 1 - x1) * 0xFFFF / (x2 - x1) : 0;
+        *pcY = y1 != y2 ? (y - 1 - y1) * 0xFFFF / (y2 - y1) : 0;
+    }
     return S_OK;
 }
@@ -512 +522 @@
     rc = reportAbsEvent(mouseXAbs, mouseYAbs, dz, dw, fButtons,
                         RT_BOOL(  mfVMMDevGuestCaps
-                                & VMMDEV_MOUSE_GUEST_USES_EVENT));
+                                & VMMDEV_MOUSE_NEW_PROTOCOL));
 
 #ifndef VBOXBFE_WITHOUT_COM

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -139 +139 @@
         return maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
     }
+    void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2,
+                                  int32_t *py2);
 #ifdef MMSEAMLESS
     int handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);