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

Timestamp:

Oct 12, 2017 6:18:01 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: use X.Org Bool rather than C++ bool.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• getmode.c (modified) (3 diffs)
• setmode.c (modified) (2 diffs)
• vboxvideo.c (modified) (4 diffs)
• vboxvideo.h (modified) (4 diffs)
• vbva.c (modified) (3 diffs)

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

@@ -175 +175 @@
 }
 
-static bool useHardwareCursor(uint32_t fCursorCapabilities)
+static Bool useHardwareCursor(uint32_t fCursorCapabilities)
 {
     if (fCursorCapabilities & VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE)
@@ -182 +182 @@
 }
 
-static void compareAndMaybeSetUseHardwareCursor(VBOXPtr pVBox, uint32_t fCursorCapabilities, bool *pfChanged, bool fSet)
+static void compareAndMaybeSetUseHardwareCursor(VBOXPtr pVBox, uint32_t fCursorCapabilities, Bool *pfChanged, Bool fSet)
 {
     if (pVBox->fUseHardwareCursor != useHardwareCursor(fCursorCapabilities))
@@ -202 +202 @@
 /** Read in information about the most recent size hints and cursor
  * capabilities requested for the guest screens from HGSMI. */
-void vbvxReadSizesAndCursorIntegrationFromHGSMI(ScrnInfoPtr pScrn, bool *pfNeedUpdate)
+void vbvxReadSizesAndCursorIntegrationFromHGSMI(ScrnInfoPtr pScrn, Bool *pfNeedUpdate)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     int rc;
     unsigned i;
-    bool fChanged = false;
+    Bool fChanged = false;
     uint32_t fCursorCapabilities;
 

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

@@ -85 +85 @@
  * mode set and tell the host we support advanced graphics functions.
  */
-void vbvxSetMode(ScrnInfoPtr pScrn, unsigned cDisplay, unsigned cWidth, unsigned cHeight, int x, int y, bool fEnabled,
-                 bool fConnected, struct vbvxFrameBuffer *pFrameBuffer)
+void vbvxSetMode(ScrnInfoPtr pScrn, unsigned cDisplay, unsigned cWidth, unsigned cHeight, int x, int y, Bool fEnabled,
+                 Bool fConnected, struct vbvxFrameBuffer *pFrameBuffer)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
@@ -92 +92 @@
     uint16_t fFlags;
     int rc;
-    bool fEnabledAndVisible = fEnabled && x + cWidth <= pFrameBuffer->cWidth && y + cHeight <= pFrameBuffer->cHeight;
+    Bool fEnabledAndVisible = fEnabled && x + cWidth <= pFrameBuffer->cWidth && y + cHeight <= pFrameBuffer->cHeight;
     /* Recent host code has a flag to blank the screen; older code needs BPP set to zero. */
     uint32_t cBPP = fEnabledAndVisible || pVBox->fHostHasScreenBlankingFlag ? pFrameBuffer->cBPP : 0;

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

@@ -117 +117 @@
 static void VBOXSaveMode(ScrnInfoPtr pScrn);
 static void VBOXRestoreMode(ScrnInfoPtr pScrn);
-static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, bool fScreenInitTime);
+static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, Bool fScreenInitTime);
 
 #ifndef XF86_SCRN_INTERFACE
@@ -289 +289 @@
  * the virtual frame-
  * buffer matching what the X server expects. */
-static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime, bool fEnterVTTime,
+static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, Bool fScreenInitTime, Bool fEnterVTTime,
                            int cXOverRide, int cYOverRide)
 {
@@ -1031 +1031 @@
 #endif
 
-static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, bool fScreenInitTime)
+static void setSizesAndCursorIntegration(ScrnInfoPtr pScrn, Bool fScreenInitTime)
 {
     RT_NOREF(fScreenInitTime);
@@ -1056 +1056 @@
 {
     ScrnInfoPtr pScrn = (ScrnInfoPtr)pData;
-    bool fNeedUpdate = false;
+    Bool fNeedUpdate = false;
 
     (void)pTimeout;

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

@@ -162 +162 @@
     unsigned long cbView;
     /** Whether the pre-X-server mode was a VBE mode */
-    bool fSavedVBEMode;
+    Bool fSavedVBEMode;
     /** Paramters of the saved pre-X-server VBE mode, invalid if there is none
      */
@@ -179 +179 @@
     struct VBoxScreen *pScreens;
     /** Can we get mode hint and cursor integration information from HGSMI? */
-    bool fHaveHGSMIModeHints;
+    Bool fHaveHGSMIModeHints;
     /** Does the host support the screen blanking flag? */
-    bool fHostHasScreenBlankingFlag;
+    Bool fHostHasScreenBlankingFlag;
     /** Array of structures for receiving mode hints. */
     VBVAMODEHINT *paVBVAModeHints;
@@ -226 +226 @@
 
 extern void vbvxClearVRAM(ScrnInfoPtr pScrn, size_t cbOldSize, size_t cbNewSize);
-extern void vbvxSetMode(ScrnInfoPtr pScrn, unsigned cDisplay, unsigned cWidth, unsigned cHeight, int x, int y, bool fEnabled,
-                        bool fConnected, struct vbvxFrameBuffer *pFrameBuffer);
+extern void vbvxSetMode(ScrnInfoPtr pScrn, unsigned cDisplay, unsigned cWidth, unsigned cHeight, int x, int y, Bool fEnabled,
+                        Bool fConnected, struct vbvxFrameBuffer *pFrameBuffer);
 extern void vbvxSetSolarisMouseRange(int width, int height);
 
@@ -243 +243 @@
 extern void vboxAddModes(ScrnInfoPtr pScrn);
 extern void VBoxInitialiseSizeHints(ScrnInfoPtr pScrn);
-extern void vbvxReadSizesAndCursorIntegrationFromProperties(ScrnInfoPtr pScrn, bool *pfNeedUpdate);
-extern void vbvxReadSizesAndCursorIntegrationFromHGSMI(ScrnInfoPtr pScrn, bool *pfNeedUpdate);
+extern void vbvxReadSizesAndCursorIntegrationFromProperties(ScrnInfoPtr pScrn, Bool *pfNeedUpdate);
+extern void vbvxReadSizesAndCursorIntegrationFromHGSMI(ScrnInfoPtr pScrn, Bool *pfNeedUpdate);
 extern void vbvxSetUpLinuxACPI(ScreenPtr pScreen);
 extern void vbvxCleanUpLinuxACPI(ScreenPtr pScreen);

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

@@ -183 +183 @@
 }
 
-static bool haveHGSMIModeHintAndCursorReportingInterface(VBOXPtr pVBox)
+static Bool haveHGSMIModeHintAndCursorReportingInterface(VBOXPtr pVBox)
 {
     uint32_t fModeHintReporting, fCursorReporting;
@@ -193 +193 @@
 }
 
-static bool hostHasScreenBlankingFlag(VBOXPtr pVBox)
+static Bool hostHasScreenBlankingFlag(VBOXPtr pVBox)
 {
     uint32_t fScreenFlags;
@@ -211 +211 @@
 vboxEnableVbva(ScrnInfoPtr pScrn)
 {
-    bool rc = TRUE;
+    Bool rc = TRUE;
     unsigned i;
     VBOXPtr pVBox = pScrn->driverPrivate;