Changeset 51606 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 11, 2014 2:54:11 PM (11 years ago)

Author:

vboxsync

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

94341

Message:

Main,Frontends: IFramebuffer::NotifyUpdateImage

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/Framebuffer.cpp (modified) (3 diffs)
• VBoxSDL/Framebuffer.h (modified) (1 diff)
• VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UIFrameBuffer.h (modified) (1 diff)

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>
@@ -419 +420 @@
 }
 
+STDMETHODIMP VBoxSDLFB::NotifyUpdateImage(ULONG aX,
+                                          ULONG aY,
+                                          ULONG aWidth,
+                                          ULONG aHeight,
+                                          ComSafeArrayIn(BYTE, aImage))
+{
+    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)
+    {
+        SDL_BlitSurface(surfSrc, &srcRect, mSurfVRAM, &dstRect);
+        SDL_FreeSurface(surfSrc);
+    }
+
+    return NotifyUpdate(aX, aY, aWidth, aHeight);
+}
+
 extern ComPtr<IDisplay> gpDisplay;
 
@@ -434 +469 @@
     /* Disable screen updates. */
     mfUpdates = false;
+
+    // gpDisplay->COMSETTER(FramebufferUpdateMode)(FramebufferUpdateMode_NotifyUpdateImage);
 
     /* Save the new bitmap. */

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

@@ -82 +82 @@
 
     STDMETHOD(NotifyUpdate)(ULONG x, ULONG y, ULONG w, ULONG h);
+    STDMETHOD(NotifyUpdateImage)(ULONG x, ULONG y, ULONG w, ULONG h, ComSafeArrayIn(BYTE, aImage));
     STDMETHOD(NotifyChange)(ULONG aScreenId,
                             ULONG aXOrigin,

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

@@ -263 +263 @@
 }
 
+STDMETHODIMP UIFrameBuffer::NotifyUpdateImage(ULONG aX,
+                                              ULONG aY,
+                                              ULONG aWidth,
+                                              ULONG aHeight,
+                                              ComSafeArrayIn(BYTE, aImage))
+{
+    return E_NOTIMPL;
+}
+
 STDMETHODIMP UIFrameBuffer::VideoModeSupported(ULONG uWidth, ULONG uHeight, ULONG uBPP, BOOL *pfSupported)
 {

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

@@ -127 +127 @@
       * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
     STDMETHOD(NotifyUpdate)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
+    STDMETHOD(NotifyUpdateImage)(ULONG x, ULONG y, ULONG w, ULONG h, ComSafeArrayIn(BYTE, aImage));
 
     /** EMT callback: Returns whether the frame-buffer implementation is willing to support a given video-mode.