Changeset 7086 in vbox

Timestamp:

Feb 21, 2008 8:06:06 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: reverted the XFree86/X.org 6.8 additions to their old state (not using IPRT or the guest library)

Location:

trunk/src/VBox/Additions/x11

Files:

• xgraphics/Makefile.kmk (modified) (1 diff)
• xgraphics/vboxutils_68.c (moved) (moved from trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c ) (1 diff)
• xgraphics/vboxvideo_68.h (copied) (copied from trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h ) (6 diffs)
• xmouse/Makefile.kmk (modified) (1 diff)
• xmouse/VBoxUtils_68.c (copied) (copied from trunk/src/VBox/Additions/x11/xmouse/VBoxUtils.c ) (2 diffs)

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

@@ -97 +97 @@
  vboxvideo_drv_SOURCES = \
         vboxvideo_68.c \
-        vboxutils-new.c
+        vboxutils_68.c
 endif   # target linux, l4
 

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

@@ -31 +31 @@
 #endif
 
-#include "vboxvideo.h"
+#include "vboxvideo_68.h"
 
 #define VBOX_MAX_CURSOR_WIDTH 64

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h

@@ -75 +75 @@
 /* VBE/DDC support */
 #include "vbe.h"
-#ifdef XORG_7X
-#include "vbeModes.h"
-#endif
 #include "xf86DDC.h"
 
@@ -118 +115 @@
 #include "afb.h"
 #include "mfb.h"
-#ifndef XORG_7X
-#include "cfb24_32.h"
-#endif
 
 #define VBOX_VERSION            4000
@@ -137 +131 @@
     PCITAG pciTag;
     CARD16 maxBytesPerScanline;
-#ifdef XORG_7X
-    unsigned long mapPhys, mapOff;
-    int mapSize;        /* video memory */
-#else
     int mapPhys, mapOff, mapSize;       /* video memory */
-#endif
     void *base, *VGAbase;
     CARD8 *state, *pstate;      /* SVGA state */
@@ -153 +142 @@
     CloseScreenProcPtr CloseScreen;
     OptionInfoPtr Options;
-#ifdef XORG_7X
-    IOADDRESS ioBase;
-#endif  /* XORG_7X defined */
-#if 0
     int vbox_fd;
-#endif
     VMMDevReqMousePointer *reqp;
     xf86CursorInfoPtr pCurs;
@@ -166 +150 @@
     Bool pointerOffscreen;
     Bool useVbva;
-#if 0
     VMMDevVideoAccelFlush *reqf; 
     VMMDevVideoAccelEnable *reqe; 
-#endif
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;
 } VBOXRec, *VBOXPtr;
 
-#ifndef XORG_7X
 typedef struct _ModeInfoData
 {
@@ -181 +162 @@
     VbeCRTCInfoBlock *block;
 } ModeInfoData;
-#endif
 
 Bool vbox_cursor_init (ScreenPtr pScreen);

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

@@ -50 +50 @@
         mouse.c \
         pnp.c \
-        VBoxUtils.c
+        VBoxUtils_68.c
 endif
 

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

@@ -25 +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)
 {
@@ -72 +77 @@
     return rc;
 }
+#else
+/* the vboxadd module file handle */
+static int g_vboxaddHandle = -1;
+/* the request structure */
+static VMMDevReqMouseStatus *g_vmmreqMouseStatus = NULL;
+
+/**
+ * Initialise mouse integration.  Returns 0 on success and 1 on failure
+ * (for example, if the VBox kernel module is not loaded).
+ */
+int VBoxMouseInit(void)
+{
+    VMMDevReqMouseStatus req;
+
+    /* return immediately if already initialized */
+    if (g_vboxaddHandle != -1)
+        return 0;
+
+    /* open the driver */
+    g_vboxaddHandle = open(VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
+    if (g_vboxaddHandle < 0)
+    {
+        ErrorF("Unable to open the virtual machine device: %s\n",
+               strerror(errno));
+        return 1;
+    }
+
+    /* prepare the request structure */
+    g_vmmreqMouseStatus = malloc(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus));
+    if (!g_vmmreqMouseStatus)
+    {
+        ErrorF("Ran out of memory while querying the virtual machine for the mouse capabilities.\n");
+        return 1;
+    }
+    vmmdevInitRequest((VMMDevRequestHeader*)g_vmmreqMouseStatus, VMMDevReq_GetMouseStatus);
+
+    /* tell the host that we want absolute coordinates */
+    vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus);
+    req.mouseFeatures = VBOXGUEST_MOUSE_GUEST_CAN_ABSOLUTE | VBOXGUEST_MOUSE_GUEST_NEEDS_HOST_CURSOR;
+    req.pointerXPos = 0;
+    req.pointerYPos = 0;
+    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) < 0)
+    {
+        ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
+               errno, strerror(errno));
+        return 1;
+    }
+    /* everything is fine, put out some branding */
+    xf86Msg(X_INFO, "VirtualBox mouse pointer integration available.\n");
+    return 0;
+}
+
+/**
+ * Queries the absolute mouse position from the host.
+ *
+ * Returns 0 on success.
+ * Returns 1 when the host doesn't want absolute coordinates (no coordinates returned)
+ * Otherwise > 1 which means unsuccessful.
+ */
+int VBoxMouseQueryPosition(unsigned int *abs_x, unsigned int *abs_y)
+{
+    /* If we failed to initialise, say that we don't want absolute co-ordinates. */
+    if (g_vboxaddHandle < 0)
+        return 1;
+    /* perform VMM request */
+    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)g_vmmreqMouseStatus) >= 0)
+    {
+        if (VBOX_SUCCESS(g_vmmreqMouseStatus->header.rc))
+        {
+            /* does the host want absolute coordinates? */
+            if (g_vmmreqMouseStatus->mouseFeatures & VBOXGUEST_MOUSE_HOST_CAN_ABSOLUTE)
+            {
+                *abs_x = g_vmmreqMouseStatus->pointerXPos;
+                *abs_y = g_vmmreqMouseStatus->pointerYPos;
+                return 0;
+            }
+            else
+                return 1;
+        }
+        else
+        {
+            ErrorF("Error querying host mouse position! header.rc = %d\n", g_vmmreqMouseStatus->header.rc);
+        }
+    }
+    else
+    {
+        ErrorF("Error performing VMM request! errno = %d (%s)\n",
+               errno, strerror(errno));
+    }
+    /* error! */
+    return 2;
+}
+
+int VBoxMouseFini(void)
+{
+    VMMDevReqMouseStatus req;
+    /* If we are not initialised, there is nothing to do */
+    if (g_vboxaddHandle < 0)
+        return 0;
+    /* tell VMM that we no longer support absolute mouse handling */
+    vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus);
+    req.mouseFeatures = 0;
+    req.pointerXPos = 0;
+    req.pointerYPos = 0;
+    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) < 0)
+    {
+        ErrorF("ioctl to vboxadd module failed, rc = %d (%s)\n",
+               errno, strerror(errno));
+    }
+
+    free(g_vmmreqMouseStatus);
+    g_vmmreqMouseStatus = NULL;
+    close(g_vboxaddHandle);
+    g_vboxaddHandle = -1;
+    return 0;
+}
+#endif  /* !RT_OS_SOLARIS */
+