Changeset 6518 in vbox

Timestamp:

Jan 28, 2008 4:39:32 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27535

Message:

VbglR3SetPointerShape accept image size, and cleanups to vboxutils (x11 video)

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)
• src/VBox/Additions/x11/xgraphics/vboxutils-new.c (modified) (11 diffs)
• src/VBox/Additions/x11/xgraphics/vboxvideo.h (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1422 +1422 @@
 VBGLR3DECL(int)     VbglR3VideoAccelEnable(bool fEnable);
 VBGLR3DECL(int)     VbglR3VideoAccelFlush(void);
-VBGLR3DECL(int)     VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbReq);
+VBGLR3DECL(int)     VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbImg);
 /** @}  */
 

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

@@ -68 +68 @@
  * @param   cy          Pointer height.
  * @param   pvImg       Pointer to the image data (can be NULL).
- * @param   cbReq       The complete size of the request.
+ * @param   cbImg       Size of the image data pointed to by pvImg.
  */
-VBGLR3DECL(int) VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbReq)
+VBGLR3DECL(int) VbglR3SetPointerShape(uint32_t fFlags, uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy, const void *pvImg, size_t cbImg)
 {
     VMMDevReqMousePointer *pReq;
-    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, cbReq, VMMDevReq_SetPointerShape);
+    int rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq, RT_OFFSETOF(VMMDevReqMousePointer, pointerData) + cbImg, VMMDevReq_SetPointerShape);
     if (RT_SUCCESS(rc))
     {
@@ -82 +82 @@
         pReq->height = cy;
         if (pvImg)
-            memcpy(pReq->pointerData, pvImg, cbReq - sizeof(VMMDevReqMousePointer) + sizeof(pReq->pointerData));
+            memcpy(pReq->pointerData, pvImg, cbImg);
 
         rc = vbglR3GRPerform(&pReq->header);

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

@@ -345 +345 @@
             pVBox->reqp = p;
             pVBox->pCurs = NULL;
-            pVBox->use_hw_cursor = vbox_host_can_hwcursor(pScrn, pVBox);
-            pVBox->set_pointer_shape_size = size;
-            pVBox->pointer_offscreen = FALSE;
+            pVBox->useHwCursor = vbox_host_can_hwcursor(pScrn, pVBox);
+            pVBox->pointerHeaderSize = size;
+            pVBox->pointerOffscreen = FALSE;
             pVBox->useVbva = vboxInitVbva(scrnIndex, pScreen, pVBox);
             return TRUE;
@@ -366 +366 @@
     rc = VbglR3SetPointerShape(0, pVBox->reqp->xHot, pVBox->reqp->yHot, pVBox->reqp->width,
                                pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->reqp->header.size);
+                               pVBox->pointerSize);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not hide the virtual mouse pointer.\n");
@@ -378 +378 @@
     rc = VbglR3SetPointerShape(VBOX_MOUSE_POINTER_VISIBLE, pVBox->reqp->xHot, pVBox->reqp->yHot,
                                pVBox->reqp->width, pVBox->reqp->height, pVBox->reqp->pointerData,
-                               pVBox->reqp->header.size);
+                               pVBox->pointerSize);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Could not unhide the virtual mouse pointer.\n");
@@ -397 +397 @@
 
     rc = VbglR3SetPointerShape(reqp->fFlags, reqp->xHot, reqp->yHot, reqp->width, reqp->height,
-                               reqp->pointerData, reqp->header.size);
+                               reqp->pointerData, pVBox->pointerSize);
     if (RT_FAILURE(rc))
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,  "Unable to set the virtual mouse pointer image.\n");
@@ -426 +426 @@
         || (y < 0 || y > pScrn->pScreen->height))
     {
-        if (!pVBox->pointer_offscreen)
-        {
-            pVBox->pointer_offscreen = TRUE;
+        if (!pVBox->pointerOffscreen)
+        {
+            pVBox->pointerOffscreen = TRUE;
             vbox_vmm_hide_cursor(pScrn, pVBox);
         }
@@ -434 +434 @@
     else
     {
-        if (pVBox->pointer_offscreen)
-        {
-            pVBox->pointer_offscreen = FALSE;
+        if (pVBox->pointerOffscreen)
+        {
+            pVBox->pointerOffscreen = FALSE;
             vbox_vmm_show_cursor(pScrn, pVBox);
         }
@@ -478 +478 @@
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     VBOXPtr pVBox = pScrn->driverPrivate;
-    return pVBox->use_hw_cursor;
+    return pVBox->useHwCursor;
 }
 
@@ -517 +517 @@
     size_mask = ((dst_pitch * h) + 3) & (size_t) ~3;
     size_rgba = w * h * 4;
-    size      = size_mask + size_rgba + pVBox->set_pointer_shape_size;
+    pVBox->pointerSize = size_mask + size_rgba;
+    size      = pVBox->pointerSize + pVBox->pointerHeaderSize;
 
     p = c = xcalloc (1, size);
@@ -657 +658 @@
             bitsp->xhot, bitsp->yhot, w, h);
 
-    size = w * h * 4 + pVBox->set_pointer_shape_size + mask_size;
+    pVBox->pointerSize = w * h * 4 + mask_size;
+    size = pVBox->pointerSize + pVBox->pointerHeaderSize;
     p = xcalloc(1, size);
     if (!p)
@@ -708 +710 @@
 
     VbglR3SetPointerShape(VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA, bitsp->xhot, bitsp->yhot, w, h,
-                          pm, reqp->header.size);
+                          pm, pVBox->pointerSize);
     xfree(p);
 }
@@ -721 +723 @@
     Bool rc;
 
-    if (pVBox->use_hw_cursor)
+    if (pVBox->useHwCursor)
     {
         xf86DrvMsg(pScrn->scrnIndex, X_INFO,

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

@@ -156 +156 @@
     IOADDRESS ioBase;
 #endif  /* XORG_7X defined */
-#ifndef RT_OS_SOLARIS
-    int vbox_fd;
-#endif
     VMMDevReqMousePointer *reqp;
     xf86CursorInfoPtr pCurs;
-    Bool use_hw_cursor;
-    size_t set_pointer_shape_size;
-    Bool pointer_offscreen;
+    Bool useHwCursor;
+    size_t pointerHeaderSize;
+    size_t pointerSize;
+    Bool pointerOffscreen;
     Bool useVbva;
-#ifndef RT_OS_SOLARIS
-    VMMDevVideoAccelFlush *reqf;
-    VMMDevVideoAccelEnable *reqe;
-#endif
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;
@@ -174 +168 @@
 
 #ifndef XORG_7X
-typedef struct _ModeInfoData {
+typedef struct _ModeInfoData
+{
     int mode;
     VbeModeInfoBlock *data;
@@ -185 +180 @@
 void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBOX);
 
-extern Bool
-vboxEnableVbva(ScrnInfoPtr pScrn);
+extern Bool vboxEnableVbva(ScrnInfoPtr pScrn);
 
-extern Bool
-vboxDisableVbva(ScrnInfoPtr pScrn);
+extern Bool vboxDisableVbva(ScrnInfoPtr pScrn);
 
-extern Bool
-vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
+extern Bool vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
                             uint32_t *pcBits, uint32_t fEventAck, uint32_t iDisplay);