Changeset 6241 in vbox

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

Files:

• Config.kmk (modified) (1 diff)
• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (1 diff)
• src/VBox/Additions/x11/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/x11/xmouse/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/x11/xmouse/VBoxUtils.c (modified) (3 diffs)
• src/VBox/Additions/x11/xmouse/xorg71/mouse.c (modified) (1 diff)

trunk/Config.kmk

@@ -2671 +2671 @@
  TEMPLATE_VBOXGUESTR3EXE_DEFS  += IN_RT_R3
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS) -static
+else if1of ($(BUILD_TARGET),solaris)
+ TEMPLATE_VBOXGUESTR3EXE_DEFS   += PIC
+ TEMPLATE_VBOXGUESTR3EXE_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -fPIC
+ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fPIC
 endif
 

trunk/include/VBox/VBoxGuest.h

@@ -1375 +1375 @@
 VBGLR3DECL(int)     VbglR3SeamlessSendRects(uint32_t cRects, PRTRECT pRects);
 
+/* Mouse */
+
+VBGLR3DECL(int)     VbglR3GetMouseStatus(uint32_t *pu32Features, uint32_t *pu32PointerX, uint32_t *pu32PointerY);
+VBGLR3DECL(int)     VbglR3SetMouseStatus(uint32_t u32Features);
+
 /* Backdoor logging */
 

trunk/src/VBox/Additions/Makefile.kmk

@@ -86 +86 @@
   endif
  endif
+endif
+
+# Solaris additions
+ifeq ($(BUILD_TARGET),solaris)
+ SUBDIRS += x11
 endif
 

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 

trunk/src/VBox/Additions/x11/Makefile.kmk

@@ -28 +28 @@
 endif
 
+ifeq ($(BUILD_TARGET),solaris)
+SUBDIRS += xmouse
+endif
+
 include $(PATH_KBUILD)/subfooter.kmk
 

trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

@@ -19 +19 @@
 include $(PATH_KBUILD)/header.kmk
 
+if1of ($(BUILD_TARGET),linux l4)
 SYSMODS  = vboxmouse_drv
 DLLS     = vboxmouse_drv_70 vboxmouse_drv_71 vboxmouse_drv_14
@@ -100 +101 @@
         xorg14/pnp.c \
         VBoxUtils.c
+endif
 
+ifeq ($(BUILD_TARGET),solaris)
+DLLS = vboxmouse_drv
+
+vboxmouse_drv_TEMPLATE = VBOXGUESTR3EXE
+vboxmouse_drv_DEFS =    \
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT \
+        IN_RING3 VBOX XORG_7X PIC
+vboxmouse_drv_INCS = \
+        /usr/X11/include/xorg \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_SOURCES  = \
+        xorg71/mouse.c \
+        xorg71/pnp.c \
+        VBoxUtils.c
+vboxmouse_drv_LIBS = \
+        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3)
+endif
 
 include $(PATH_KBUILD)/footer.kmk

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

@@ -16 +16 @@
  */
 
+#include <iprt/assert.h>
 #include <VBox/VBoxGuest.h>
 #include "VBoxUtils.h"
@@ -24 +25 @@
 #include "compiler.h"
 
+#ifndef RT_OS_SOLARIS
 #include <asm/ioctl.h>
+#endif
 
+#ifdef RT_OS_SOLARIS        /** @todo later Linux should also use R3 lib for this */
+int VBoxMouseInit(void)
+{
+    int rc = VbglR3Init();
+    if (RT_FAILURE(rc))
+    {
+        ErrorF("VbglR3Init failed.\n");
+        return 1;
+    }
+
+    rc = VbglR3SetMouseStatus(VBOXGUEST_MOUSE_GUEST_CAN_ABSOLUTE | VBOXGUEST_MOUSE_GUEST_NEEDS_HOST_CURSOR);
+    if (VBOX_FAILURE(rc))
+    {
+        ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
+               errno, strerror(errno));
+        return 1;
+    }
+    xf86Msg(X_INFO, "VirtualBox mouse pointer integration available.\n");
+    return 0;
+}
+
+
+int VBoxMouseQueryPosition(unsigned int *puAbsXPos, unsigned int *puAbsYPos)
+{
+    int rc;
+    uint32_t pointerXPos;
+    uint32_t pointerYPos;
+
+    AssertPtrReturn(puAbsXPos, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(puAbsYPos, VERR_INVALID_PARAMETER);
+    rc = VbglR3GetMouseStatus(NULL, &pointerXPos, &pointerYPos);
+    if (VBOX_SUCCESS(rc))
+    {
+        *puAbsXPos = pointerXPos;
+        *puAbsYPos = pointerYPos;
+        xf86Msg(X_INFO, "VBoxMouseQueryPosition x=%u y=%u\n", *puAbsXPos, *puAbsYPos);
+        return 0;
+    }
+    ErrorF("Error querying host mouse position! rc = %d\n", rc);
+    return 2;
+}
+
+
+int VBoxMouseFini(void)
+{
+    int rc = VbglR3SetMouseStatus(0);
+    VbglR3Term();
+    return rc;
+}
+#else
 /* the vboxadd module file handle */
 static int g_vboxaddHandle = -1;
@@ -141 +194 @@
     return 0;
 }
+#endif  /* !RT_OS_SOLARIS */
+

trunk/src/VBox/Additions/x11/xmouse/xorg71/mouse.c

@@ -81 +81 @@
 #include <X11/Xproto.h>
 
+#if defined(VBOX) && defined(RT_OS_SOLARIS)
+# undef RANDR
+#endif
 #include "xf86.h"