Changeset 7440 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 12, 2008 4:13:27 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: set the graphics capability correctly for X.org 1.3 and 1.4

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxutils.c (modified) (2 diffs)
• vboxvideo.h (modified) (1 diff)
• vboxvideo_13.c (modified) (4 diffs)

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

@@ -16 +16 @@
 
 #include <VBox/VBoxGuest.h>
+#include <VBox/VBoxDev.h>
 
 #include <xf86Pci.h>
@@ -823 +824 @@
 
 /**
+ * Inform VBox that we are aware of advanced graphics functions
+ * (i.e. dynamic resizing, seamless).
+ *
+ * @returns TRUE for success, FALSE for failure
+ */
+Bool
+vboxEnableGraphicsCap(void)
+{
+    return RT_SUCCESS(VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0));
+}
+
+/**
+ * Inform VBox that we are no longer aware of advanced graphics functions
+ * (i.e. dynamic resizing, seamless).
+ *
+ * @returns TRUE for success, FALSE for failure
+ */
+Bool
+vboxDisableGraphicsCap(void)
+{
+    return RT_SUCCESS(VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS));
+}
+
+/**
  * Query the last display change request.
  *

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

@@ -161 +161 @@
 
 extern Bool vboxEnableVbva(ScrnInfoPtr pScrn);
+extern Bool vboxDisableVbva(ScrnInfoPtr pScrn);
 
-extern Bool vboxDisableVbva(ScrnInfoPtr pScrn);
+extern Bool vboxEnableGraphicsCap(void);
+extern Bool vboxDisableGraphicsCap(void);
 
 extern Bool vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx,

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

@@ -925 +925 @@
             xf86DrvMsg(scrnIndex, X_INFO,
                       "The VBox video extensions are now enabled.\n");
+        vboxEnableGraphicsCap();
     } else
         xf86DrvMsg(scrnIndex, X_ERROR, "Failed to open the VBox system device - make sure that the VirtualBox guest additions are properly installed.  If you are not sure, try reinstalling them.\n");
@@ -947 +948 @@
     if (pVBox->useVbva == TRUE)
         vboxDisableVbva(pScrn);
+    vboxDisableGraphicsCap();
 }
 
@@ -957 +959 @@
     if (pVBox->useVbva == TRUE)
         vboxDisableVbva(pScrn);
+    vboxDisableGraphicsCap();
     if (pScrn->vtSema) {
         VBOXSaveRestore(xf86Screens[scrnIndex], MODE_RESTORE);
@@ -1075 +1078 @@
         if (vboxEnableVbva(pScrn) != TRUE)  /* Bad but not fatal */
             pVBox->useVbva = FALSE;
+    vboxEnableGraphicsCap();
     return (TRUE);
 }