Changeset 6519 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

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

Author:

vboxsync

Message:

Build fix... vboxvideo is still shared.

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxutils.c (modified) (6 diffs)
• vboxvideo.h (modified) (2 diffs)

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

@@ -479 +479 @@
         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);
     } else {
@@ -558 +558 @@
     if (((x < 0) || (x > pScrn->pScreen->width))
         || ((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);
         }
     }
     else {
-        if (pVBox->pointer_offscreen) {
-            pVBox->pointer_offscreen = FALSE;
+        if (pVBox->pointerOffscreen) {
+            pVBox->pointerOffscreen = FALSE;
             vbox_vmm_show_cursor (pScrn, pVBox);
         }
@@ -604 +604 @@
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     VBOXPtr pVBox = pScrn->driverPrivate;
-    return pVBox->use_hw_cursor;
+    return pVBox->useHwCursor;
 }
 
@@ -642 +642 @@
     size_mask = ((dst_pitch * h) + 3) & (size_t) ~3;
     size_rgba = w * h * 4;
-    size      = size_mask + size_rgba + pVBox->set_pointer_shape_size;
+    size      = size_mask + size_rgba + pVBox->pointerHeaderSize;
 
     p = c = xcalloc (1, size);
@@ -780 +780 @@
             bitsp->xhot, bitsp->yhot, w, h);
 
-    size = w * h * 4 + pVBox->set_pointer_shape_size + mask_size;
+    size = w * h * 4 + pVBox->pointerHeaderSize + mask_size;
     p = xcalloc (1, size);
     if (!p)
@@ -847 +847 @@
     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;
@@ -163 +166 @@
     Bool pointerOffscreen;
     Bool useVbva;
+#ifndef RT_OS_SOLARIS 
+    VMMDevVideoAccelFlush *reqf; 
+    VMMDevVideoAccelEnable *reqe; 
+#endif
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;