Changeset 51634 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Jun 17, 2014 2:06:13 PM (10 years ago)

Author:

vboxsync

Message:

VBoxSDL: implemented NotifyUpdateImage (not used by default).

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (11 diffs)
• Framebuffer.h (modified) (2 diffs)

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

@@ -18 +18 @@
 
 #include <VBox/com/com.h>
+#include <VBox/com/array.h>
 #include <VBox/com/string.h>
 #include <VBox/com/Guid.h>
@@ -89 +90 @@
                      bool fFullscreen, bool fResizable, bool fShowSDLConfig,
                      bool fKeepHostRes, uint32_t u32FixedWidth,
-                     uint32_t u32FixedHeight, uint32_t u32FixedBPP)
+                     uint32_t u32FixedHeight, uint32_t u32FixedBPP,
+                     bool fUpdateImage)
 {
     int rc;
@@ -99 +101 @@
 
     mScreenId       = uScreenId;
+    mfUpdateImage   = fUpdateImage;
     mScreen         = NULL;
 #ifdef VBOX_WITH_SDL13
@@ -425 +428 @@
                                           ComSafeArrayIn(BYTE, aImage))
 {
-    return E_NOTIMPL;
+    LogFlow(("NotifyUpdateImage: %d,%d %dx%d\n", aX, aY, aWidth, aHeight));
+
+    com::SafeArray<BYTE> image(ComSafeArrayInArg(aImage));
+
+    /* Copy to mSurfVRAM. */
+    SDL_Rect srcRect;
+    SDL_Rect dstRect;
+    srcRect.x = 0;
+    srcRect.y = 0;
+    srcRect.w = (uint16_t)aWidth;
+    srcRect.h = (uint16_t)aHeight;
+    dstRect.x = (int16_t)aX;
+    dstRect.y = (int16_t)aY;
+    dstRect.w = (uint16_t)aWidth;
+    dstRect.h = (uint16_t)aHeight;
+
+    const uint32_t Rmask = 0x00FF0000, Gmask = 0x0000FF00, Bmask = 0x000000FF, Amask = 0;
+    SDL_Surface *surfSrc = SDL_CreateRGBSurfaceFrom(image.raw(), aWidth, aHeight, 32, aWidth * 4,
+                                                    Rmask, Gmask, Bmask, Amask);
+    if (surfSrc)
+    {
+        RTCritSectEnter(&mUpdateLock);
+        if (mfUpdates)
+            SDL_BlitSurface(surfSrc, &srcRect, mSurfVRAM, &dstRect);
+        RTCritSectLeave(&mUpdateLock);
+
+        SDL_FreeSurface(surfSrc);
+    }
+
+    return NotifyUpdate(aX, aY, aWidth, aHeight);
 }
 
@@ -439 +471 @@
             aScreenId, aXOrigin, aYOrigin, aWidth, aHeight));
 
+    ComPtr<IDisplaySourceBitmap> pSourceBitmap;
+    if (!mfUpdateImage)
+        gpDisplay->QuerySourceBitmap(aScreenId, pSourceBitmap.asOutParam());
+
     RTCritSectEnter(&mUpdateLock);
 
@@ -444 +480 @@
     mfUpdates = false;
 
-    /* Save the new bitmap. */
-    mpPendingSourceBitmap.setNull();
-    gpDisplay->QuerySourceBitmap(aScreenId, mpPendingSourceBitmap.asOutParam());
+    if (mfUpdateImage)
+    {
+        mGuestXRes   = aWidth;
+        mGuestYRes   = aHeight;
+        mPtrVRAM     = NULL;
+        mBitsPerPixel = 0;
+        mBytesPerLine = 0;
+    }
+    else
+    {
+        /* Save the new bitmap. */
+        mpPendingSourceBitmap = pSourceBitmap;
+    }
 
     RTCritSectLeave(&mUpdateLock);
@@ -546 +592 @@
     RTCritSectEnter(&mUpdateLock);
 
-    if (mpPendingSourceBitmap.isNull())
+    if (!mfUpdateImage && mpPendingSourceBitmap.isNull())
     {
         /* Do nothing. Change event already processed. */
@@ -603 +649 @@
 
     resizeGuest();
+
+    if (mfUpdateImage)
+    {
+        gpDisplay->SetFramebufferUpdateMode(aScreenId, FramebufferUpdateMode_NotifyUpdateImage);
+        gpDisplay->InvalidateAndUpdate();
+    }
 }
 
@@ -614 +666 @@
     AssertMsg(gSdlNativeThread == RTThreadNativeSelf(),
               ("Wrong thread! SDL is not threadsafe!\n"));
+
+    RTCritSectEnter(&mUpdateLock);
 
     const uint32_t Rmask = 0x00FF0000, Gmask = 0x0000FF00, Bmask = 0x000000FF, Amask = 0;
@@ -651 +705 @@
 
     /* Enable screen updates. */
-    RTCritSectEnter(&mUpdateLock);
     mfUpdates = true;
+
     RTCritSectLeave(&mUpdateLock);
 
@@ -896 +950 @@
     AssertMsg(gSdlNativeThread == RTThreadNativeSelf(), ("Wrong thread! SDL is not threadsafe!\n"));
 #endif
+    RTCritSectEnter(&mUpdateLock);
+    Log(("Updates %d, %d,%d %dx%d\n", mfUpdates, x, y, w, h));
+    if (!mfUpdates)
+    {
+        RTCritSectLeave(&mUpdateLock);
+        return;
+    }
+
     Assert(mScreen);
     Assert(mSurfVRAM);
     if (!mScreen || !mSurfVRAM)
-        return;
-
-    RTCritSectEnter(&mUpdateLock);
-    Log(("Updates %d, %d,%d %dx%d\n", mfUpdates, x, y, w, h));
-    if (!mfUpdates)
     {
         RTCritSectLeave(&mUpdateLock);
         return;
     }
+
     /* the source and destination rectangles */
     SDL_Rect srcRect;

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

@@ -49 +49 @@
               bool fFullscreen = false, bool fResizable = true, bool fShowSDLConfig = false,
               bool fKeepHostRes = false, uint32_t u32FixedWidth = ~(uint32_t)0,
-              uint32_t u32FixedHeight = ~(uint32_t)0, uint32_t u32FixedBPP = ~(uint32_t)0);
+              uint32_t u32FixedHeight = ~(uint32_t)0, uint32_t u32FixedBPP = ~(uint32_t)0,
+              bool fUpdateImage = false);
     virtual ~VBoxSDLFB();
 
@@ -141 +142 @@
     /** the screen number of this framebuffer */
     uint32_t mScreenId;
+    /** use NotifyUpdateImage */
+    bool mfUpdateImage;
     /** maximum possible screen width in pixels (~0 = no restriction) */
     uint32_t mMaxScreenWidth;