Changeset 3761 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

Timestamp:

Jul 22, 2007 10:43:14 AM (17 years ago)

Author:

vboxsync

Message:

Main/Frontends: Cleaned up IFramebuffer interface.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (17 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -73 +73 @@
 {
 public:
-    VBoxResizeEvent (FramebufferPixelFormat_T f, uchar *v, unsigned l, int w, int h) :
-        QEvent ((QEvent::Type) VBoxDefs::ResizeEventType), fmt (f), vr (v), lsz (l), wdt (w), hgt (h) {}
-    FramebufferPixelFormat_T  pixelFormat() { return fmt; }
-    uchar *vram() { return vr; }
-    unsigned lineSize() { return lsz; }
-    int width() { return wdt; }
-    int height() { return hgt; }
-private:
-    FramebufferPixelFormat_T fmt;
-    uchar *vr;
-    unsigned lsz;
-    int wdt;
-    int hgt;
+
+    VBoxResizeEvent (ulong aPixelFormat, uchar *aVRAM,
+                     ulong aBitsPerPixel, ulong aBytesPerLine,
+                     ulong aWidth, ulong aHeight) :
+        QEvent ((QEvent::Type) VBoxDefs::ResizeEventType),
+            mPixelFormat (aPixelFormat), mVRAM (aVRAM), mBitsPerPixel (aBitsPerPixel),
+        mBytesPerLine (aBytesPerLine), mWidth (aWidth), mHeight (aHeight) {}
+    ulong pixelFormat() { return mPixelFormat; }
+    uchar *VRAM() { return mVRAM; }
+    ulong bitsPerPixel() { return mBitsPerPixel; }
+    ulong bytesPerLine() { return mBytesPerLine; }
+    ulong width() { return mWidth; }
+    ulong height() { return mHeight; }
+
+private:
+
+    ulong mPixelFormat;
+    uchar *mVRAM;
+    ulong mBitsPerPixel;
+    ulong mBytesPerLine;
+    ulong mWidth;
+    ulong mHeight;
 };
 
@@ -145 +154 @@
     bool rc = pm.convertFromImage (QImage (addr,
                                            display.GetWidth(), display.GetHeight(),
-                                           display.GetColorDepth(),
+                                           display.GetBitsPerPixel(),
                                            0, 0, QImage::LittleEndian));
     AssertMsg (rc, ("convertFromImage() must always return true"));
@@ -157 +166 @@
 
 /////////////////////////////////////////////////////////////////////////////
-
-/* Framebuffer render mode */
-typedef enum
-{
-    RenderModeNormal     = 0,
-    RenderModeSeamless   = 1,
-    RenderModeHostWindow = 2
-} FramebufferRenderMode;
 
 /**
@@ -198 +199 @@
 
 #if defined (Q_OS_WIN32)
-    STDMETHOD_(ULONG, AddRef)() {
+
+    STDMETHOD_(ULONG, AddRef)()
+    {
         return ::InterlockedIncrement (&refcnt);
     }
+
     STDMETHOD_(ULONG, Release)()
     {
@@ -208 +212 @@
         return cnt;
     }
+
     STDMETHOD(QueryInterface) (REFIID riid , void **ppObj)
     {
@@ -223 +228 @@
         return E_NOINTERFACE;
     }
+
 #endif
 
@@ -229 +235 @@
     STDMETHOD(COMGETTER(Width)) (ULONG *aWidth);
     STDMETHOD(COMGETTER(Height)) (ULONG *aHeight);
-    STDMETHOD(COMGETTER(ColorDepth)) (ULONG *aColorDepth);
-    STDMETHOD(COMGETTER(LineSize)) (ULONG *aLineSize);
-    STDMETHOD(COMGETTER(PixelFormat)) (FramebufferPixelFormat_T *aPixelFormat);
+    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *aBitsPerPixel);
+    STDMETHOD(COMGETTER(BytesPerLine)) (ULONG *aBytesPerLine);
+    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *aPixelFormat);
+    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *aUsesGuestVRAM);
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *aHeightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
-    STDMETHOD(COMGETTER(RenderMode)) (FramebufferRenderMode *renderMode);
-    STDMETHOD(COMSETTER(RenderMode)) (FramebufferRenderMode  renderMode);
 
     STDMETHOD(Lock)();
     STDMETHOD(Unlock)();
 
-    STDMETHOD(RequestResize) (ULONG aScreenId, FramebufferPixelFormat_T aPixelFormat,
-                              BYTE *aVRAM, ULONG aLineSize,
+    STDMETHOD(RequestResize) (ULONG aScreenId, ULONG aPixelFormat,
+                              BYTE *aVRAM, ULONG aBitsPerPixel, ULONG aBytesPerLine,
                               ULONG aWidth, ULONG aHeight,
                               BOOL *aFinished);
@@ -257 +262 @@
     STDMETHOD(SetVisibleRegion)(BYTE *aRectangles, ULONG aCount);
 
-    // Helper functions
-    int width() { return mWdt; }
-    int height() { return mHgt; }
-
-    virtual FramebufferPixelFormat_T pixelFormat()
-    {
-        return FramebufferPixelFormat_PixelFormatOpaque;
+    ulong width() { return mWdt; }
+    ulong height() { return mHgt; }
+
+    virtual ulong pixelFormat()
+    {
+        return FramebufferPixelFormat_FOURCC_RGB;
+    }
+
+    virtual bool usesGuestVRAM()
+    {
+        return false;
     }
 
@@ -270 +279 @@
 
     virtual uchar *address() = 0;
-    virtual int colorDepth() = 0;
-    virtual int lineSize() = 0;
+    virtual ulong bitsPerPixel() = 0;
+    virtual ulong bytesPerLine() = 0;
 
     /**
@@ -302 +311 @@
     int mHgt;
 
-    /* Framebuffer render mode */
-    FramebufferRenderMode mRenderMode;
-
 #if defined (Q_OS_WIN32)
 private:
@@ -325 +331 @@
                              BOOL *aFinished);
 
+    ulong pixelFormat() { return mPixelFormat; }
+    bool usesGuestVRAM() { return mUsesGuestVRAM; }
+
     uchar *address() { return mImg.bits(); }
-    int colorDepth() { return mImg.depth(); }
-    int lineSize() { return mImg.bytesPerLine(); }
+    ulong bitsPerPixel() { return mImg.depth(); }
+    ulong bytesPerLine() { return mImg.bytesPerLine(); }
 
     void paintEvent (QPaintEvent *pe);
@@ -336 +345 @@
     QPixmap mPM;
     QImage mImg;
+    ulong mPixelFormat;
+    bool mUsesGuestVRAM;
 };
 
@@ -357 +368 @@
     uchar *address()
     {
-        if (mSurfVRAM)
-        {
-            return (uchar*) (mScreen ? (uintptr_t) mSurfVRAM->pixels : 0);
-        }
-        else
-        {
-            return (uchar*) (mScreen ? (uintptr_t) mScreen->pixels : 0);
-        }
-    }
-
-    int colorDepth()
-    {
-        SDL_Surface *surf = mSurfVRAM ? mSurfVRAM: mScreen;
+        SDL_Surface *surf = mSurfVRAM ? mSurfVRAM : mScreen;
+        return surf ? (uchar *) (uintptr_t) mScreen->pixels : 0;
+    }
+
+    ulong bitsPerPixel()
+    {
+        SDL_Surface *surf = mSurfVRAM ? mSurfVRAM : mScreen;
         return surf ? surf->format->BitsPerPixel : 0;
     }
 
-    int lineSize()
-    {
-        SDL_Surface *surf = mSurfVRAM ? mSurfVRAM: mScreen;
+    ulong bytesPerLine()
+    {
+        SDL_Surface *surf = mSurfVRAM ? mSurfVRAM : mScreen;
         return surf ? surf->pitch : 0;
     }
 
-    FramebufferPixelFormat_T pixelFormat()
+    ulong pixelFormat()
     {
         return mPixelFormat;
+    }
+
+    bool usesGuestVRAM()
+    {
+        return mSurfVRAM != NULL;
     }
 
@@ -392 +402 @@
     SDL_Surface *mSurfVRAM;
 
-    uchar *mPtrVRAM;
-    ULONG mLineSize;
-    FramebufferPixelFormat_T mPixelFormat;
+    ulong mPixelFormat;
 };
 
@@ -414 +422 @@
                              BOOL *aFinished);
 
-    uchar *address() { return (uchar *)mSurfaceDesc.lpSurface; }
-    int colorDepth() { return mSurfaceDesc.ddpfPixelFormat.dwRGBBitCount; }
-    int lineSize() { return mSurfaceDesc.lPitch; }
-
-    FramebufferPixelFormat_T pixelFormat() { return mPixelFormat; };
+    uchar *address() { return (uchar *) mSurfaceDesc.lpSurface; }
+    ulong bitsPerPixel() { return mSurfaceDesc.ddpfPixelFormat.dwRGBBitCount; }
+    ulong bytesPerLine() { return (ulong) mSurfaceDesc.lPitch; }
+
+    ulong pixelFormat() { return mPixelFormat; };
+
+    bool usesGuestVRAM() { return mUsesGuestVRAM; }
 
     void paintEvent (QPaintEvent *pe);
@@ -425 +435 @@
 
 private:
+
     void releaseObjects();
 
-    void setupSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
-    void recreateSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
-    void deleteSurface ();
+    bool createSurface (ULONG aPixelFormat, uchar *pvVRAM,
+                        ULONG aBitsPerPixel, ULONG aBytesPerLine,
+                        ULONG aWidth, ULONG aHeight);
+    void deleteSurface();
     void drawRect (ULONG x, ULONG y, ULONG w, ULONG h);
     void getWindowPosition (void);
@@ -439 +451 @@
     LPDIRECTDRAWSURFACE7 mPrimarySurface;
 
-    FramebufferPixelFormat_T mPixelFormat;
-
-    BOOL mGuestVRAMSurface;
+    ulong mPixelFormat;
+
+    bool mUsesGuestVRAM;
 
     int mWndX;
     int mWndY;
 
-    BOOL mSynchronousUpdates;
+    bool mSynchronousUpdates;
 };