Changeset 9006 in vbox for trunk

Timestamp:

May 21, 2008 10:05:35 AM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: fix disabling pointer integration

Location:

trunk/src/VBox/Additions/x11

Files:

• xgraphics/vboxutils.c (modified) (1 diff)
• xmouse/VBoxUtils.c (modified) (1 diff)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

@@ -118 +118 @@
     {
         if (   !(fFeatures & VBOXGUEST_MOUSE_HOST_CANNOT_HWPOINTER)
-            && (fFeatures & VBOXGUEST_MOUSE_GUEST_CAN_ABSOLUTE))
+            && (fFeatures & VBOXGUEST_MOUSE_GUEST_CAN_ABSOLUTE)
+            && (fFeatures & VBOXGUEST_MOUSE_HOST_CAN_ABSOLUTE)
+           )
             rc = TRUE;
     }

trunk/src/VBox/Additions/x11/xmouse/VBoxUtils.c

@@ -64 +64 @@
 
 
-int VBoxMouseQueryPosition(unsigned int *puAbsXPos, unsigned int *puAbsYPos)
+/**
+ * Query the absolute mouse position from the host
+ * @returns VINF_SUCCESS or iprt error if the absolute values could not
+ *          be queried, or the host wished to use relative coordinates
+ * @param   pcx  where to return the pointer X coordinate
+ * @param   pxy  where to return the pointer Y coordinate
+ */
+int VBoxMouseQueryPosition(unsigned int *pcx, unsigned int *pcy)
 {
-    int rc;
-    uint32_t pointerXPos;
-    uint32_t pointerYPos;
+    int rc = VINF_SUCCESS;
+    uint32_t cx, cy, fFeatures;
 
+    AssertPtrReturn(pcx, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcy, VERR_INVALID_PARAMETER);
     if (gDeviceOpenFailed)
-        return 2;
-    AssertPtrReturn(puAbsXPos, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puAbsYPos, VERR_INVALID_PARAMETER);
-    rc = VbglR3GetMouseStatus(NULL, &pointerXPos, &pointerYPos);
-    if (VBOX_SUCCESS(rc))
+        rc = VERR_ACCESS_DENIED;
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GetMouseStatus(&fFeatures, &cx, &cy);
+    else
+        ErrorF("Error querying host mouse position! rc = %d\n", rc);
+    if (   RT_SUCCESS(rc)
+        && !(fFeatures & VBOXGUEST_MOUSE_HOST_CAN_ABSOLUTE))
+        rc = VERR_NOT_SUPPORTED;
+    if (RT_SUCCESS(rc))
     {
-        *puAbsXPos = pointerXPos;
-        *puAbsYPos = pointerYPos;
-        return 0;
+        *pcx = cx;
+        *pcy = cy;
     }
-    ErrorF("Error querying host mouse position! rc = %d\n", rc);
-    return 2;
+    return rc;
 }