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

Timestamp:

Jan 14, 2015 1:53:30 PM (10 years ago)

Author:

vboxsync

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

97611

Message:

FE/Qt: 6278: Support for scaled video-output: 2D Video Acceleration support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (2 diffs)
• VBoxFBOverlay.h (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -3859 +3859 @@
 
     ulong bytesPerPixel = bitsPerPixel/8;
-    ulong displayWidth = bytesPerLine/bytesPerPixel;
-    ulong displayHeight = size.height();
+    const QSize scaledSize = size.scaledSize();
+    const ulong displayWidth = scaledSize.isValid() ? scaledSize.width() : bytesPerLine / bytesPerPixel;
+    const ulong displayHeight = scaledSize.isValid() ? scaledSize.height() : size.height();
 
 #ifdef VBOXQGL_DBG_SURF
@@ -4406 +4407 @@
 }
 
-bool VBoxQGLOverlay::onNotifyUpdate(ULONG aX, ULONG aY,
-                         ULONG aW, ULONG aH)
-{
+bool VBoxQGLOverlay::onNotifyUpdate(ULONG uX, ULONG uY,
+                                    ULONG uW, ULONG uH)
+{
+    /* Prepare corresponding viewport part: */
+    QRect rect;
+
+    /* Take the scale-factor into account: */
+    const double dScaleFactor = mSizeInfo.scaleFactor();
+    if (dScaleFactor == 1.0)
+    {
+        /* Adjust corresponding viewport part: */
+        rect.moveTo(uX, uY);
+        rect.setSize(QSize(uW, uH));
+    }
+    else
+    {
+        /* Adjust corresponding viewport part: */
+        rect.moveTo(uX * dScaleFactor - 1,
+                    uY * dScaleFactor - 1);
+        rect.setSize(QSize(uW * dScaleFactor + 2 * dScaleFactor + 1,
+                           uH * dScaleFactor + 2 * dScaleFactor + 1));
+    }
+
     /* we do not to miss notify updates, because we have to update bg textures for it,
      * so no not check for m_fUnused here,
      * mOverlay will store the required info for us */
-    QRect r(aX, aY, aW, aH);
-    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &r);
+    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &rect);
+
     return true;
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1341 +1341 @@
 {
 public:
+
     VBoxFBSizeInfo() {}
-    template<class T> VBoxFBSizeInfo(T * fb) :
-        mPixelFormat(fb->pixelFormat()), mVRAM(fb->address()), mBitsPerPixel(fb->bitsPerPixel()),
-        mBytesPerLine(fb->bytesPerLine()), mWidth(fb->width()), mHeight(fb->height()),
+    template<class T> VBoxFBSizeInfo(T *pFb) :
+        mPixelFormat(pFb->pixelFormat()), mVRAM(pFb->address()), mBitsPerPixel(pFb->bitsPerPixel()),
+        mBytesPerLine(pFb->bytesPerLine()), mWidth(pFb->width()), mHeight(pFb->height()),
+        m_dScaleFactor(pFb->scaleFactor()), m_scaledSize(pFb->scaledSize()),
         mUsesGuestVram(true) {}
 
     VBoxFBSizeInfo(ulong aPixelFormat, uchar *aVRAM,
-                     ulong aBitsPerPixel, ulong aBytesPerLine,
-                     ulong aWidth, ulong aHeight,
-                     bool bUsesGuestVram) :
-        mPixelFormat (aPixelFormat), mVRAM (aVRAM), mBitsPerPixel (aBitsPerPixel),
-        mBytesPerLine (aBytesPerLine), mWidth (aWidth), mHeight (aHeight),
+                   ulong aBitsPerPixel, ulong aBytesPerLine,
+                   ulong aWidth, ulong aHeight,
+                   bool bUsesGuestVram) :
+        mPixelFormat(aPixelFormat), mVRAM(aVRAM), mBitsPerPixel(aBitsPerPixel),
+        mBytesPerLine(aBytesPerLine), mWidth(aWidth), mHeight(aHeight),
         mUsesGuestVram(bUsesGuestVram) {}
+
     ulong pixelFormat() const { return mPixelFormat; }
     uchar *VRAM() const { return mVRAM; }
@@ -1360 +1363 @@
     ulong width() const { return mWidth; }
     ulong height() const { return mHeight; }
+    double scaleFactor() const { return m_dScaleFactor; }
+    QSize scaledSize() const { return m_scaledSize; }
     bool usesGuestVram() const {return mUsesGuestVram;}
 
 private:
+
     ulong mPixelFormat;
     uchar *mVRAM;
@@ -1369 +1375 @@
     ulong mWidth;
     ulong mHeight;
+    double m_dScaleFactor;
+    QSize m_scaledSize;
     bool mUsesGuestVram;
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -183 +183 @@
     void unlock() const { RTCritSectLeave(&m_critSect); }
 
-    /** Returns host-to-guest scale ratio. */
+    /** Returns the scale-factor used by the scaled-size. */
+    double scaleFactor() const { return m_dScaleFactor; }
+    /** Returns the frame-buffer's scaled-size. */
     QSize scaledSize() const { return m_scaledSize; }
     /** Defines host-to-guest scale ratio as @a size. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -357 +357 @@
     /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
     sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
+    frameBuffer()->resizeEvent(frameBuffer()->width(), frameBuffer()->height());
     machineWindow()->normalizeGeometry(true /* adjust position */);
     adjustGuestScreenSize();
@@ -370 +371 @@
     /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
     sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
+    frameBuffer()->resizeEvent(frameBuffer()->width(), frameBuffer()->height());
     machineWindow()->normalizeGeometry(true /* adjust position */);
     adjustGuestScreenSize();