Changeset 51436 in vbox for trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

Timestamp:

May 28, 2014 9:12:15 AM (11 years ago)

Author:

vboxsync

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

93991

Message:

Main,Frontends: IDisplay provides the guest screen bitmap to frontends.

File:

• trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (7 diffs)

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

@@ -130 +130 @@
     mLabelOffs      = 0;
 #endif
+
+    mfUpdates = false;
 
     rc = RTCritSectInit(&mUpdateLock);
@@ -553 +555 @@
 }
 
+extern ComPtr<IDisplay> gpDisplay;
+
+/* This method runs on the main SDL thread. */
+void VBoxSDLFB::notifyChange(ULONG aScreenId)
+{
+    /* Disable screen updates. */
+    RTCritSectEnter(&mUpdateLock);
+
+    if (mpPendingSourceBitmap.isNull())
+    {
+        /* Do nothing. Change event already processed. */
+        RTCritSectLeave(&mUpdateLock);
+        return;
+    }
+
+    /* Disable screen updates. */
+    mfUpdates = false;
+
+    /* Release the current bitmap and keep the pending one. */
+    mpSourceBitmap = mpPendingSourceBitmap;
+    mpPendingSourceBitmap.setNull();
+
+    RTCritSectLeave(&mUpdateLock);
+
+    BYTE *pAddress = NULL;
+    ULONG ulWidth = 0;
+    ULONG ulHeight = 0;
+    ULONG ulBitsPerPixel = 0;
+    ULONG ulBytesPerLine = 0;
+    ULONG ulPixelFormat = 0;
+
+    mpSourceBitmap->QueryBitmapInfo(&pAddress,
+                                    &ulWidth,
+                                    &ulHeight,
+                                    &ulBitsPerPixel,
+                                    &ulBytesPerLine,
+                                    &ulPixelFormat);
+
+    if (   mGuestXRes    == ulWidth
+        && mGuestYRes    == ulHeight
+        && mBitsPerPixel == ulBitsPerPixel
+        && mBytesPerLine == ulBytesPerLine
+        && mPtrVRAM == pAddress
+       )
+    {
+        mfSameSizeRequested = true;
+    }
+    else
+    {
+        mfSameSizeRequested = false;
+    }
+
+    mGuestXRes   = ulWidth;
+    mGuestYRes   = ulHeight;
+    mPixelFormat = FramebufferPixelFormat_Opaque;
+    mPtrVRAM     = pAddress;
+    mBitsPerPixel = ulBitsPerPixel;
+    mBytesPerLine = ulBytesPerLine;
+    mUsesGuestVRAM = FALSE; /* yet */
+
+    resizeGuest();
+}
+
+STDMETHODIMP VBoxSDLFB::NotifyChange(ULONG aScreenId,
+                                     ULONG aXOrigin,
+                                     ULONG aYOrigin,
+                                     ULONG aWidth,
+                                     ULONG aHeight)
+{
+    LogRel(("NotifyChange: %d %d,%d %dx%d\n",
+             aScreenId, aXOrigin, aYOrigin, aWidth, aHeight));
+
+    /* Obtain the new screen bitmap. */
+    RTCritSectEnter(&mUpdateLock);
+
+    /* Save the new bitmap. */
+    mpPendingSourceBitmap.setNull();
+    gpDisplay->QuerySourceBitmap(aScreenId, mpPendingSourceBitmap.asOutParam());
+
+    RTCritSectLeave(&mUpdateLock);
+
+    SDL_Event event;
+    event.type       = SDL_USEREVENT;
+    event.user.type  = SDL_USER_EVENT_NOTIFYCHANGE;
+    event.user.code  = mScreenId;
+
+    PushSDLEventForSure(&event);
+
+    RTThreadYield();
+
+    return S_OK;
+}
+
 /**
  * Returns whether we like the given video mode.
@@ -686 +781 @@
 
     /* is the guest in a linear framebuffer mode we support? */
-    if (mUsesGuestVRAM)
+    if (mPtrVRAM || mUsesGuestVRAM)
     {
         /* Create a source surface from guest VRAM. */
@@ -710 +805 @@
         mfSameSizeRequested = false;
         LogFlow(("VBoxSDL:: the same resolution requested, skipping the resize.\n"));
+
+        /* Enable screen updates. */
+        RTCritSectEnter(&mUpdateLock);
+        mfUpdates = true;
+        RTCritSectLeave(&mUpdateLock);
+
         return;
     }
@@ -715 +816 @@
     /* now adjust the SDL resolution */
     resizeSDL();
+
+    /* Enable screen updates. */
+    RTCritSectEnter(&mUpdateLock);
+    mfUpdates = true;
+    RTCritSectLeave(&mUpdateLock);
+
+    repaint();
 }
 
@@ -961 +1069 @@
         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;
@@ -1039 +1154 @@
         paintSecureLabel(0, 0, 0, 0, false);
 #endif
+    RTCritSectLeave(&mUpdateLock);
 }