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

Timestamp:

Oct 13, 2017 3:04:27 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: Remove helpers.c and adjust places depending on it.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• helpers.c (deleted)
• vboxvideo.c (modified) (3 diffs)
• vboxvideo.h (modified) (3 diffs)

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

@@ -124 +124 @@
 vboxvideo_drv_SOURCES = \
         getmode.c \
-        helpers.c \
         pointer.c \
         setmode.c \

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

@@ -252 +252 @@
     VBVXASSERT(pPixmap != NULL, ("Failed to get the screen pixmap.\n"));
     TRACE_LOG("pPixmap=%p adjustedWidth=%d height=%d pScrn->depth=%d pScrn->bitsPerPixel=%d cbLine=%d pVBox->base=%p pPixmap->drawable.width=%d pPixmap->drawable.height=%d\n",
-              pPixmap, adjustedWidth, height, pScrn->depth, pScrn->bitsPerPixel, cbLine, pVBox->base, pPixmap->drawable.width,
+              (void *)pPixmap, adjustedWidth, height, pScrn->depth, pScrn->bitsPerPixel, cbLine, pVBox->base, pPixmap->drawable.width,
               pPixmap->drawable.height);
     if (   adjustedWidth != pPixmap->drawable.width
@@ -1026 +1026 @@
 #endif
 
+static void reprobeCursor(ScrnInfoPtr pScrn)
+{
+    if (ROOT_WINDOW(pScrn) == NULL)
+        return;
+#ifdef XF86_SCRN_INTERFACE
+    pScrn->EnableDisableFBAccess(pScrn, FALSE);
+    pScrn->EnableDisableFBAccess(pScrn, TRUE);
+#else
+    pScrn->EnableDisableFBAccess(pScrn->scrnIndex, FALSE);
+    pScrn->EnableDisableFBAccess(pScrn->scrnIndex, TRUE);
+#endif
+}
+
 static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, Bool fScreenInitTime)
 {
@@ -1041 +1054 @@
     /* This calls EnableDisableFBAccess(), so only use when switched in. */
     if (pScrn->vtSema)
-        vbvxReprobeCursor(pScrn);
+        reprobeCursor(pScrn);
 }
 

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

@@ -54 +54 @@
 #endif
 
+#include <VBoxVideoVBE.h>
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "xf86Cursor.h"
+
 #ifdef DEBUG
 
-#define TRACE_ENTRY() \
-do { \
-    vbvxMsg(RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
-    vbvxMsg(": entering\n"); \
-} while(0)
-#define TRACE_EXIT() \
-do { \
-    vbvxMsg(RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
-    vbvxMsg(": leaving\n"); \
-} while(0)
+#define TRACE_ENTRY() do { xf86ErrorF("%s: entering\n", __func__); } while(0)
+#define TRACE_EXIT() do { xf86ErrorF("%s: leaving\n", __func__); } while(0)
+#define TRACE_LINE() \
+    do { xf86ErrorF("%s: line\n", __func__, __LINE__); } while(0)
 #define TRACE_LOG(...) \
 do { \
-    vbvxMsg("%s: ", RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
-    vbvxMsg(__VA_ARGS__); \
+    xf86ErrorF("%s: ", __func__); \
+    xf86ErrorF(__VA_ARGS__); \
 } while(0)
-# define TRACE_LINE() do \
-{ \
-    vbvxMsg("%s: line %d\n", __FUNCTION__, __LINE__); \
-} while(0)
+
 #else  /* !DEBUG */
 
@@ -87 +84 @@
 if (!(expr)) \
 { \
-    vbvxMsg("\nAssertion failed!\n\n"); \
-    vbvxMsg("%s\n", #expr); \
-    vbvxMsg("at %s (%s:%d)\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, __FILE__, __LINE__); \
-    vbvxMsg out; \
-    vbvxAbortServer(); \
+    xf86ErrorF("\nAssertion failed!\n\n"); \
+    xf86ErrorF("%s\n", #expr); \
+    xf86ErrorF("at %s (%s:%d)\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, __FILE__, __LINE__); \
+    xf86ErrorF out; \
+    FatalError("Assertion"); \
 }
-
-#include <VBoxVideoVBE.h>
-
-#include "xf86str.h"
-#include "xf86Cursor.h"
 
 #define VBOX_VERSION            VBOX_VERSION_MAJOR * 10000 \
@@ -200 +192 @@
 } VBOXRec, *VBOXPtr;
 
-/* helpers.c */
-extern void vbvxMsg(const char *pszFormat, ...);
-extern void vbvxMsgV(const char *pszFormat, va_list args);
-extern void vbvxAbortServer(void);
-extern VBOXPtr vbvxGetRec(ScrnInfoPtr pScrn);
-#define VBOXGetRec vbvxGetRec  /* Temporary */
-extern int vbvxGetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t *pcData, int32_t **ppaData);
-extern void vbvxSetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t cData, int32_t *paData, Bool fSendEvent);
-extern void vbvxReprobeCursor(ScrnInfoPtr pScrn);
+#define VBOXGetRec(pScrn) ((VBOXPtr)(pScrn)->driverPrivate)
 
 /* setmode.c */