Changeset 51436 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

May 28, 2014 9:12:15 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93991

Message:

Main,Frontends: IDisplay provides the guest screen bitmap to frontends.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Framebuffer.cpp (modified) (2 diffs)
• Framebuffer.h (modified) (2 diffs)
• NullFramebuffer.h (modified) (1 diff)
• VBoxHeadless.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/Framebuffer.cpp

@@ -42 +42 @@
 
     RTCritSectInit (&m_CritSect);
-
-    // start with a standard size
-    RequestResize(0, FramebufferPixelFormat_Opaque,
-                  NULL, 0, 0, 640, 480, NULL);
 }
 
@@ -241 +237 @@
 
     return S_OK;
+}
+
+extern ComPtr<IDisplay> display;
+
+STDMETHODIMP VRDPFramebuffer::NotifyChange(ULONG aScreenId,
+                                           ULONG aXOrigin,
+                                           ULONG aYOrigin,
+                                           ULONG aWidth,
+                                           ULONG aHeight)
+{
+    LogRelFlow(("NotifyChange: %d %d,%d %dx%d\n",
+                aScreenId, aXOrigin, aYOrigin, aWidth, aHeight));
+
+    HRESULT hr = S_OK;
+
+    hr = display->QuerySourceBitmap(aScreenId, mpSourceBitmap.asOutParam());
+    if (SUCCEEDED(hr))
+    {
+        BYTE *pAddress = NULL;
+        ULONG ulWidth = 0;
+        ULONG ulHeight = 0;
+        ULONG ulBitsPerPixel = 0;
+        ULONG ulBytesPerLine = 0;
+        ULONG ulPixelFormat = 0;
+
+        hr = mpSourceBitmap->QueryBitmapInfo(&pAddress,
+                                        &ulWidth,
+                                        &ulHeight,
+                                        &ulBitsPerPixel,
+                                        &ulBytesPerLine,
+                                        &ulPixelFormat);
+
+        if (SUCCEEDED(hr))
+        {
+            mScreen = pAddress;
+            mWidth = ulWidth;
+            mHeight = ulHeight;
+            mBitsPerPixel = ulBitsPerPixel;
+            mBytesPerLine = ulBytesPerLine;
+            mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+            mUsesGuestVRAM = TRUE;
+
+            Log(("Using screen bitmap, %d BPP\n", mBitsPerPixel));
+        }
+    }
+
+    if (FAILED(hr))
+    {
+        /* Just reset everything. */
+        mScreen = NULL;
+        mWidth = 0;
+        mHeight = 0;
+        mBitsPerPixel = 0;
+        mBytesPerLine = 0;
+        mPixelFormat = FramebufferPixelFormat_Opaque;
+        mUsesGuestVRAM = FALSE;
+
+        Log(("No screen w = %d, h = %d!!!\n", aWidth, aHeight));
+    }
+
+    return hr;
 }
 

trunk/src/VBox/Frontends/VBoxHeadless/Framebuffer.h

@@ -63 +63 @@
                              ULONG bitsPerPixel, ULONG bytesPerLine, ULONG w, ULONG h,
                              BOOL *finished);
+    STDMETHOD(NotifyChange)(ULONG aScreenId,
+                            ULONG aXOrigin,
+                            ULONG aYOrigin,
+                            ULONG aWidth,
+                            ULONG aHeight);
     STDMETHOD(VideoModeSupported)(ULONG width, ULONG height, ULONG bpp, BOOL *supported);
 
@@ -92 +97 @@
     long refcnt;
 #endif
+
+    ComPtr<IDisplaySourceBitmap> mpSourceBitmap;
 };
 

trunk/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h

@@ -180 +180 @@
         return S_OK;
     }
+    STDMETHOD(NotifyChange)(ULONG aScreenId,
+                            ULONG aXOrigin,
+                            ULONG aYOrigin,
+                            ULONG aWidth,
+                            ULONG aHeight)
+    {
+        /* Do nothing. */
+        return S_OK;
+    }
     STDMETHOD(VideoModeSupported)(ULONG width, ULONG height, ULONG bpp, BOOL *supported)
     {

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -639 +639 @@
 static CComModule _Module;
 #endif
+
+ComPtr<IDisplay> display;
 
 /**
@@ -968 +970 @@
         CHECK_ERROR_BREAK(console, COMGETTER(Machine)(machine.asOutParam()));
 
-        ComPtr<IDisplay> display;
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
@@ -1009 +1010 @@
                 Log2(("VBoxHeadless: Registering framebuffer\n"));
                 pFramebuffer->AddRef();
-                display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
+                display->AttachFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
             }
             if (!RT_SUCCESS(rrc) || rcc != S_OK)
@@ -1039 +1040 @@
             }
             pVRDPFramebuffer->AddRef();
-            display->SetFramebuffer(uScreenId, pVRDPFramebuffer);
+            display->AttachFramebuffer(uScreenId, pVRDPFramebuffer);
         }
         if (uScreenId < cMonitors)
@@ -1050 +1051 @@
         {
             ComPtr<IFramebuffer> fb;
-            LONG xOrigin, yOrigin;
-            HRESULT hrc2 = display->GetFramebuffer(uScreenId,
-                                                   fb.asOutParam(),
-                                                   &xOrigin, &yOrigin);
+            HRESULT hrc2 = display->QueryFramebuffer(uScreenId,
+                                                     fb.asOutParam());
             if (hrc2 == S_OK && fb.isNull())
             {
@@ -1059 +1058 @@
                 pNullFB->AddRef();
                 pNullFB->init();
-                display->SetFramebuffer(uScreenId, pNullFB);
+                display->AttachFramebuffer(uScreenId, pNullFB);
             }
         }
@@ -1330 +1329 @@
     while (0);
 
+    display.setNull();
+
     /*
      * Get the machine state.