Changeset 6241 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 4, 2008 4:25:30 PM (17 years ago)

Author:

vboxsync

Message:

Guest r3 lib for x11 mouse. The solaris mouse driver doesn't yet work like it should.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/VBoxGuest-solaris.c (modified) (2 diffs)
• VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -499 +499 @@
     LogFlow((DEVICE_NAME ":VBoxAddSolarisOpen\n"));
 
+        /*
+         * Verify we are being opened as a character device
+         */
+        if (fType != OTYP_CHR)
+                return EINVAL;
+
 #ifndef USE_SESSION_HASH
     VBoxAddDevState *pState = NULL;
@@ -565 +571 @@
     }
 #endif
-    LogRel((DEVICE_NAME "VBoxAddSolarisOpen: VBoxGuestCreateUserSession failed. rc=%d\n", rc));
+    LogRel((DEVICE_NAME ":VBoxAddSolarisOpen: VBoxGuestCreateUserSession failed. rc=%d\n", rc));
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -217 +217 @@
 
 
+VBGLR3DECL(int) VbglR3GetMouseStatus(uint32_t *pu32Features, uint32_t *pu32PointerX, uint32_t *pu32PointerY)
+{
+    VMMDevReqMouseStatus Req;
+    vmmdevInitRequest(&Req.header, VMMDevReq_GetMouseStatus);
+    Req.mouseFeatures = 0;
+    Req.pointerXPos = 0;
+    Req.pointerYPos = 0;
+    int rc = VbglR3GRPerform(&Req.header);
+    if (RT_SUCCESS(rc))
+    {
+        if (pu32Features)
+            *pu32Features = Req.mouseFeatures;
+        if (pu32PointerX)
+            *pu32PointerX = Req.pointerXPos;
+        if (pu32PointerY)
+            *pu32PointerY = Req.pointerYPos;
+    }
+    return rc;
+}
+
+
+VBGLR3DECL(int) VbglR3SetMouseStatus(uint32_t u32Features)
+{
+    VMMDevReqMouseStatus Req;
+    vmmdevInitRequest(&Req.header, VMMDevReq_SetMouseStatus);
+    Req.mouseFeatures = u32Features;
+    Req.pointerXPos = 0;
+    Req.pointerYPos = 0;
+    return VbglR3GRPerform(&Req.header);
+}
+
+
 /**
  * Cause any pending WaitEvent calls (VBOXGUEST_IOCTL_WAITEVENT) to return