Changeset 51436 in vbox for trunk/src/VBox/Main/include

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleVRDPServer.h (modified) (1 diff)
• DisplayImpl.h (modified) (6 diffs)

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -197 +197 @@
     int m_mousey;
 
-    IFramebuffer *maFramebuffers[SchemaDefs::MaxGuestMonitors];
+    ComPtr<IDisplaySourceBitmap> maSourceBitmaps[SchemaDefs::MaxGuestMonitors];
 
     ComPtr<IEventListener> mConsoleListener;

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -32 +32 @@
 #endif
 
+#include "DisplaySourceBitmapWrap.h"
+
 class Console;
 struct VIDEORECCONTEXT;
@@ -49 +51 @@
 
     ComPtr<IFramebuffer> pFramebuffer;
+    ComPtr<IDisplaySourceBitmap> pSourceBitmap;
     bool fDisabled;
 
@@ -219 +222 @@
     STDMETHOD(GetScreenResolution)(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer *aFramebuffer);
+    STDMETHOD(AttachFramebuffer)(ULONG aScreenId,
+                                 IFramebuffer *aFramebuffer);
+    STDMETHOD(DetachFramebuffer)(ULONG aScreenId);
+    STDMETHOD(QueryFramebuffer)(ULONG aScreenId,
+                                IFramebuffer **aFramebuffer);
     STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetVideoModeHint)(ULONG aDisplay, BOOL aEnabled, BOOL aChangeOrigin, LONG aOriginX, LONG aOriginY, ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel);
@@ -232 +240 @@
 
     STDMETHOD(ViewportChanged)(ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height);
+    STDMETHOD(QuerySourceBitmap)(ULONG aScreenId,
+                                 IDisplaySourceBitmap **aDisplaySourceBitmap);
 
     static const PDMDRVREG  DrvReg;
@@ -237 +247 @@
 private:
 
+    HRESULT querySourceBitmap(ULONG aScreenId,
+                              IDisplaySourceBitmap **ppDisplaySourceBitmap);
     int updateDisplayData(void);
 
@@ -423 +435 @@
                    uint8_t fLimitSize);
 
+class ATL_NO_VTABLE DisplaySourceBitmap:
+    public DisplaySourceBitmapWrap
+{
+public:
+
+    DECLARE_EMPTY_CTOR_DTOR(DisplaySourceBitmap)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    /* Public initializer/uninitializer for internal purposes only. */
+    HRESULT init(ComObjPtr<Display> pDisplay, unsigned uScreenId, DISPLAYFBINFO *pFBInfo);
+    void uninit();
+
+    bool usesVRAM(void) { return m.pu8Allocated == NULL; }
+
+private:
+    // wrapped IDisplaySourceBitmap properties
+    virtual HRESULT getScreenId(ULONG *aScreenId);
+
+    // wrapped IDisplaySourceBitmap methods
+    virtual HRESULT queryBitmapInfo(BYTE **aAddress,
+                                    ULONG *aWidth,
+                                    ULONG *aHeight,
+                                    ULONG *aBitsPerPixel,
+                                    ULONG *aBytesPerLine,
+                                    ULONG *aPixelFormat);
+
+    int initSourceBitmap(unsigned aScreenId, DISPLAYFBINFO *pFBInfo);
+
+    struct Data
+    {
+        ComObjPtr<Display> pDisplay;
+        unsigned uScreenId;
+        DISPLAYFBINFO *pFBInfo;
+
+        uint8_t *pu8Allocated;
+
+        uint8_t *pu8Address;
+        ULONG ulWidth;
+        ULONG ulHeight;
+        ULONG ulBitsPerPixel;
+        ULONG ulBytesPerLine;
+        ULONG ulPixelFormat;
+    };
+
+    Data m;
+};
+
 #endif // ____H_DISPLAYIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */