Changeset 32692 in vbox

Timestamp:

Sep 22, 2010 10:30:34 AM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: some more simplification

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxutils.c (modified) (8 diffs)
• vboxvideo.h (modified) (1 diff)
• vboxvideo_13.c (modified) (1 diff)
• vboxvideo_70.c (modified) (1 diff)

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

@@ -173 +173 @@
     TRACE_ENTRY();
 
-    free (pVBox->reqp);
-    pVBox->reqp = NULL;
+    xf86DestroyCursorInfoRec(pVBox->pCurs);
+    pVBox->pCurs = NULL;
     TRACE_EXIT();
 }
@@ -419 +419 @@
 vbox_open(ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox)
 {
-    int rc;
-    void *p;
-    size_t size;
-    int scrnIndex = pScrn->scrnIndex;
-
     TRACE_ENTRY();
 
     if (!pVBox->useDevice)
         return FALSE;
-
-    if (pVBox->reqp)
-    {
-        /* still open, just re-enable VBVA after CloseScreen was called */
-        pVBox->useVbva = vboxInitVbva(scrnIndex, pScreen, pVBox);
-        return TRUE;
-    }
-
-    size = vmmdevGetRequestSize(VMMDevReq_SetPointerShape);
-    p = calloc(1, size);
-    if (p)
-    {
-        rc = vmmdevInitRequest(p, VMMDevReq_SetPointerShape);
-        if (RT_SUCCESS(rc))
-        {
-            pVBox->reqp = p;
-            pVBox->pCurs = NULL;
-            pVBox->pointerHeaderSize = size;
-            pVBox->useVbva = vboxInitVbva(scrnIndex, pScreen, pVBox);
-            return TRUE;
-        }
-        xf86DrvMsg(scrnIndex, X_ERROR, "Could not init VMM request: rc = %d\n", rc);
-        free(p);
-    }
-    xf86DrvMsg(scrnIndex, X_ERROR, "Could not allocate %lu bytes for VMM request\n", (unsigned long)size);
-    return FALSE;
+    pVBox->useVbva = vboxInitVbva(pScrn->scrnIndex, pScreen, pVBox);
+    return TRUE;
 }
 
@@ -467 +438 @@
     int rc;
 
-    pVBox->reqp->fFlags = 0;
-    rc = VbglR3SetPointerShapeReq(pVBox->reqp);
+    rc = VbglR3SetPointerShape(0, 0, 0, 0, 0, NULL, 0);
     if (RT_FAILURE(rc))
     {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer.\n");
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer, VBox error %d.\n", rc);
         /* Play safe, and disable the hardware cursor until the next mode
          * switch, since obviously something happened that we didn't
@@ -484 +454 @@
     int rc;
 
-    if (vbox_host_uses_hwcursor(pScrn)) {
-        pVBox->reqp->fFlags = VBOX_MOUSE_POINTER_VISIBLE;
-        rc = VbglR3SetPointerShapeReq(pVBox->reqp);
-        if (RT_FAILURE(rc)) {
-            xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
-            /* Play safe, and disable the hardware cursor until the next mode
-             * switch, since obviously something happened that we didn't
-             * anticipate. */
-            pVBox->forceSWCursor = TRUE;
-        }
+    if (!vbox_host_uses_hwcursor(pScrn))
+        return;
+    rc = VbglR3SetPointerShape(VBOX_MOUSE_POINTER_VISIBLE, 0, 0, 0, 0, NULL, 0);
+    if (RT_FAILURE(rc)) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
+        /* Play safe, and disable the hardware cursor until the next mode
+         * switch, since obviously something happened that we didn't
+         * anticipate. */
+        pVBox->forceSWCursor = TRUE;
     }
 }
@@ -606 +575 @@
     sizeMask = ((dstPitch * h) + 3) & (size_t) ~3;
     sizeRgba = w * h * 4;
-    pVBox->pointerSize = sizeMask + sizeRgba;
-    sizeRequest = pVBox->pointerSize + pVBox->pointerHeaderSize;
+    sizeRequest = sizeMask + sizeRgba + sizeof(VMMDevReqMousePointer);
 
     p = c = calloc (1, sizeRequest);
@@ -740 +708 @@
     unsigned char *pm;
     CARD32 *pc;
-    size_t sizeRequest, sizeMask;
+    size_t sizeData, sizeMask;
     CARD8 *p;
     int scrnIndex;
+    uint32_t fFlags =   VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE
+                      | VBOX_MOUSE_POINTER_ALPHA;
+    int rc;
 
     TRACE_ENTRY();
@@ -764 +735 @@
                  bitsp->xhot, bitsp->yhot, w, h);
 
-    pVBox->pointerSize = w * h * 4 + sizeMask;
-    sizeRequest = pVBox->pointerSize + pVBox->pointerHeaderSize;
-    p = calloc(1, sizeRequest);
+    sizeData = w * h * 4 + sizeMask;
+    p = calloc(1, sizeData);
     if (!p)
         RETERROR(scrnIndex, ,
                  "Error failed to alloc %lu bytes for cursor\n",
-                 (unsigned long)sizeRequest);
-
-    reqp = (VMMDevReqMousePointer *)p;
-    *reqp = *pVBox->reqp;
-    reqp->width  = w;
-    reqp->height = h;
-    reqp->xHot   = bitsp->xhot;
-    reqp->yHot   = bitsp->yhot;
-    reqp->fFlags =   VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE
-                   | VBOX_MOUSE_POINTER_ALPHA;
-    reqp->header.size = sizeRequest;
-
-    memcpy(p + offsetof(VMMDevReqMousePointer, pointerData) + sizeMask, bitsp->argb, w * h * 4);
+                 (unsigned long)sizeData);
+
+    memcpy(p + sizeMask, bitsp->argb, w * h * 4);
 
     /* Emulate the AND mask. */
-    pm = p + offsetof(VMMDevReqMousePointer, pointerData);
+    pm = p;
     pc = bitsp->argb;
 
@@ -815 +775 @@
     }
 
-    VbglR3SetPointerShapeReq(reqp);
+    rc = VbglR3SetPointerShape(fFlags, bitsp->xhot, bitsp->yhot, w, h, p, sizeData);
+    TRACE_LOG(": leaving, returning %d\n", rc);
     free(p);
 }

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -207 +207 @@
     Bool accessEnabled;
     OptionInfoPtr Options;
-    VMMDevReqMousePointer *reqp;  /** @todo get rid of this */
-    size_t pointerHeaderSize;
-    size_t pointerSize;
+    /** @todo we never actually free this */
     xf86CursorInfoPtr pCurs;
     Bool useDevice;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_13.c

@@ -1068 +1068 @@
     vgaHWFreeHWRec(pScrn);
 
+    /* And do additional bits which are separate for historical reasons */
+    vbox_close(pScrn, pVBox);
+
     /* Remove our observer functions from the X server call chains. */
     pScrn->EnableDisableFBAccess = pVBox->EnableDisableFBAccess;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_70.c

@@ -865 +865 @@
     vgaHWFreeHWRec(pScrn);
 
+    /* And do additional bits which are separate for historical reasons */
+    vbox_close(pScrn, pVBox);
+
     pScreen->CloseScreen = pVBox->CloseScreen;
     return pScreen->CloseScreen(scrnIndex, pScreen);