Changeset 63822 in vbox for trunk

Timestamp:

Sep 14, 2016 6:18:20 AM (8 years ago)

Author:

vboxsync

Message:

include,Main,DevVGA: bugref:8387: support for guest request to blank the virtual monitor (VBVA_SCREEN_F_BLANK2)

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/include/VBox/VBoxVideo.h

@@ -994 +994 @@
  * out by the host. */
 #define VBVA_SCREEN_F_BLANK    0x0004
+/** The virtual monitor has been blanked by the guest and should be blacked
+ * out by the host using the previous mode values for width. height, etc. */
+#define VBVA_SCREEN_F_BLANK2   0x0008
 
 typedef struct VBVAINFOSCREEN

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2137 +2137 @@
     else if (u32Index == VBOX_VBVA_CONF32_SCREEN_FLAGS)
     {
-        pConf32->u32Value = VBVA_SCREEN_F_ACTIVE | VBVA_SCREEN_F_DISABLED | VBVA_SCREEN_F_BLANK;
+        pConf32->u32Value =  VBVA_SCREEN_F_ACTIVE
+                           | VBVA_SCREEN_F_DISABLED
+                           | VBVA_SCREEN_F_BLANK
+                           | VBVA_SCREEN_F_BLANK2;
     }
     else if (u32Index == VBOX_VBVA_CONF32_MAX_RECORD_SIZE)

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -1476 +1476 @@
 {
     const uint32_t u32ViewIndex = pScreen->u32ViewIndex;
-    const bool fDisabled = RT_BOOL(pScreen->u16Flags & VBVA_SCREEN_F_DISABLED);
-
-    if (fDisabled)
+    const uint16_t u16Flags = pScreen->u16Flags;
+
+    if (u16Flags & VBVA_SCREEN_F_DISABLED)
     {
         if (   u32ViewIndex < pVGAState->cMonitors
@@ -1491 +1491 @@
     else
     {
+        if (u16Flags & VBVA_SCREEN_F_BLANK2)
+        {
+            /* Special case for blanking using current video mode.
+             * Only 'u16Flags' field is relevant.
+             */
+            RT_ZERO(*pScreen);
+            pScreen->u16Flags = u16Flags;
+            return VINF_SUCCESS;
+        }
+
         if (   u32ViewIndex < pVGAState->cMonitors
             && pScreen->u16BitsPerPixel <= 32
@@ -1561 +1571 @@
             continue;
 
-        if (!fDisable || !CurView.u32ViewSize)
+        /* The view does not change if _BLANK2 is set. */
+        if (   (!fDisable || !CurView.u32ViewSize)
+            && !RT_BOOL(Screen.u16Flags & VBVA_SCREEN_F_BLANK2))
         {
             View.u32ViewIndex = Screen.u32ViewIndex;

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -4072 +4072 @@
     }
 
+    VBVAINFOSCREEN screenInfo;
+    RT_ZERO(screenInfo);
+
+    if (pScreen->u16Flags & VBVA_SCREEN_F_BLANK2)
+    {
+        /* Init a local VBVAINFOSCREEN structure, which will be used instead of
+         * the original pScreen. Set VBVA_SCREEN_F_BLANK, which will force
+         * the code below to choose the "blanking" branches.
+         */
+        screenInfo.u32ViewIndex    = pScreen->u32ViewIndex;
+        screenInfo.i32OriginX      = pFBInfo->xOrigin;
+        screenInfo.i32OriginY      = pFBInfo->yOrigin;
+        screenInfo.u32StartOffset  = 0; /* Irrelevant */
+        screenInfo.u32LineSize     = pFBInfo->u32LineSize;
+        screenInfo.u32Width        = pFBInfo->w;
+        screenInfo.u32Height       = pFBInfo->h;
+        screenInfo.u16BitsPerPixel = pFBInfo->u16BitsPerPixel;
+        screenInfo.u16Flags        = pScreen->u16Flags | VBVA_SCREEN_F_BLANK;
+
+        pScreen = &screenInfo;
+    }
+
     /* If display was disabled or there is no framebuffer, a resize will be required,
      * because the framebuffer was/will be changed.