Changeset 22382 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 21, 2009 11:12:34 AM (16 years ago)

Author:

vboxsync

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

51327

Message:

qgl framebuffer: proper viewport resize & scrol handlng

File:

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

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

@@ -672 +672 @@
 
     void init(VBoxVHWASurfaceBase * pPrimary, uchar *pvMem);
-    void setupMatricies(VBoxVHWASurfaceBase *pPrimary);
 
     void uninit();
@@ -679 +678 @@
 
 //    int blt(const QRect * aDstRect, VBoxVHWASurfaceBase * aSrtSurface, const QRect * aSrcRect, const VBoxVHWAColorKey * pDstCKeyOverride, const VBoxVHWAColorKey * pSrcCKeyOverride);
-//    int overlay(VBoxVHWASurfaceBase * aOverlaySurface);
 
     int lock(const QRect * pRect, uint32_t flags);
@@ -703 +701 @@
     ulong width()  { return mRect.width();  }
     ulong height() { return mRect.height(); }
+    const QSize size() {return mRect.size();}
 
     GLenum format() {return mColorFormat.format(); }
@@ -839 +838 @@
     void doMultiTex2FB(const QRect * pDstRect, VBoxVHWATexture * pDstTex, const QRect * pSrcRect, int cSrcTex);
     void doMultiTex2FB(const QRect * pDstRect, const QRect * pSrcRect, int cSrcTex);
-
-    void doSetupMatrix(const QSize & aSize , bool bInverted);
 
     QRect mRect; /* == Inv FB size */
@@ -1220 +1217 @@
 
     void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData);
+
+    static void doSetupMatrix(const QSize & aSize, bool bInverted);
 protected:
 
@@ -1237 +1236 @@
     void initializeGL();
 private:
+    static void setupMatricies(const QSize &display);
+    static void adjustViewport(const QSize &display, const QRect &viewport);
     void vboxDoResize(void *re);
     void vboxDoPaint(void *rec);
@@ -1317 +1318 @@
     bool   mUsesGuestVRAM;
     bool   mbVGASurfCreated;
+    QRect mViewport;
 
     RTCRITSECT mCritSect;