Changeset 3761 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 22, 2007 10:43:14 AM (17 years ago)

Author:

vboxsync

Message:

Main/Frontends: Cleaned up IFramebuffer interface.

Location:

trunk/src/VBox/Main

Files:

• ConsoleVRDPServer.cpp (modified) (1 diff)
• DisplayImpl.cpp (modified) (18 diffs)
• FramebufferImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (17 diffs)
• include/DisplayImpl.h (modified) (3 diffs)
• include/FramebufferImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -633 +633 @@
 
         ULONG bitsPerPixel = 0;
-        pfb->COMGETTER(ColorDepth) (&bitsPerPixel);
+        pfb->COMGETTER(BitsPerPixel) (&bitsPerPixel);
 
         BYTE *address = NULL;

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -86 +86 @@
 
     mLastAddress = NULL;
-    mLastLineSize = 0;
-    mLastColorDepth = 0,
+    mLastBytesPerLine = 0;
+    mLastBitsPerPixel = 0,
     mLastWidth = 0;
     mLastHeight = 0;
@@ -222 +222 @@
  *  @thread EMT
  */
-static int callFramebufferResize (IFramebuffer *pFramebuffer, unsigned uScreenId, FramebufferPixelFormat_T pixelFormat, void *pvVRAM, uint32_t cbLine, int w, int h)
+static int callFramebufferResize (IFramebuffer *pFramebuffer, unsigned uScreenId,
+                                  ULONG pixelFormat, void *pvVRAM,
+                                  uint32_t bpp, uint32_t cbLine,
+                                  int w, int h)
 {
     Assert (pFramebuffer);
@@ -229 +232 @@
     BOOL finished = TRUE;
 
-    pFramebuffer->RequestResize (uScreenId, pixelFormat, (BYTE *) pvVRAM, cbLine, w, h, &finished);
+    pFramebuffer->RequestResize (uScreenId, pixelFormat, (BYTE *) pvVRAM,
+                                 bpp, cbLine, w, h, &finished);
 
     if (!finished)
@@ -252 +256 @@
  *  @thread EMT
  */
-int Display::handleDisplayResize (unsigned uScreenId, uint32_t bpp, void *pvVRAM, uint32_t cbLine, int w, int h)
-{
-    LogRel (("Display::handleDisplayResize(): uScreenId = %d, pvVRAM=%p w=%d h=%d bpp=%d cbLine=0x%X\n",
+int Display::handleDisplayResize (unsigned uScreenId, uint32_t bpp, void *pvVRAM,
+                                  uint32_t cbLine, int w, int h)
+{
+    LogRel (("Display::handleDisplayResize(): uScreenId = %d, pvVRAM=%p "
+             "w=%d h=%d bpp=%d cbLine=0x%X\n",
              uScreenId, pvVRAM, w, h, bpp, cbLine));
 
@@ -265 +271 @@
 
     mLastAddress = pvVRAM;
-    mLastLineSize = cbLine;
-    mLastColorDepth = bpp,
+    mLastBytesPerLine = cbLine;
+    mLastBitsPerPixel = bpp,
     mLastWidth = w;
     mLastHeight = h;
 
-    FramebufferPixelFormat_T pixelFormat;
+    ULONG pixelFormat;
 
     switch (bpp)
     {
-        case 32:  pixelFormat = FramebufferPixelFormat_PixelFormatRGB32; break;
-        case 24:  pixelFormat = FramebufferPixelFormat_PixelFormatRGB24; break;
-        case 16:  pixelFormat = FramebufferPixelFormat_PixelFormatRGB16; break;
-        default:  pixelFormat = FramebufferPixelFormat_PixelFormatOpaque; cbLine = 0;
+        case 32:
+        case 24:
+        case 16:
+            pixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+            break;
+        default:
+            pixelFormat = FramebufferPixelFormat_PixelFormatOpaque;
+            bpp = cbLine = 0;
+            break;
     }
 
@@ -283 +294 @@
      * disable access to the VGA device by the EMT thread.
      */
-    bool f = ASMAtomicCmpXchgU32 (&maFramebuffers[uScreenId].u32ResizeStatus, ResizeStatus_InProgress, ResizeStatus_Void);
+    bool f = ASMAtomicCmpXchgU32 (&maFramebuffers[uScreenId].u32ResizeStatus,
+                                  ResizeStatus_InProgress, ResizeStatus_Void);
     AssertReleaseMsg(f, ("f = %d\n", f));NOREF(f);
 
@@ -291 +303 @@
     maFramebuffers[uScreenId].pFramebuffer->Lock();
 
-    int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId, pixelFormat, pvVRAM, cbLine, w, h);
+    int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
+                                    pixelFormat, pvVRAM, bpp, cbLine, w, h);
     if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
     {
@@ -303 +316 @@
 
     /* Set the status so the 'handleResizeCompleted' would work.  */
-    f = ASMAtomicCmpXchgU32 (&maFramebuffers[uScreenId].u32ResizeStatus, ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
+    f = ASMAtomicCmpXchgU32 (&maFramebuffers[uScreenId].u32ResizeStatus,
+                             ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
     AssertRelease(f);NOREF(f);
 
@@ -342 +356 @@
     
             /* Check the framebuffer pixel format to setup the rendering in VGA device. */
-            FramebufferPixelFormat_T newPixelFormat;
-            pFBInfo->pFramebuffer->COMGETTER(PixelFormat) (&newPixelFormat);
-
-            pFBInfo->fDefaultFormat = (newPixelFormat == FramebufferPixelFormat_PixelFormatOpaque);
+            BOOL usesGuestVRAM = FALSE;
+            pFBInfo->pFramebuffer->COMGETTER(UsesGuestVRAM) (&usesGuestVRAM);
+
+            pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
 
             mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, pFBInfo->fDefaultFormat);
@@ -1265 +1279 @@
  *
  * @returns COM status code
- * @param colorDepth Address of result variable.
- */
-STDMETHODIMP Display::COMGETTER(ColorDepth) (ULONG *colorDepth)
-{
-    if (!colorDepth)
+ * @param bitsPerPixel Address of result variable.
+ */
+STDMETHODIMP Display::COMGETTER(BitsPerPixel) (ULONG *bitsPerPixel)
+{
+    if (!bitsPerPixel)
         return E_INVALIDARG;
 
@@ -1280 +1294 @@
     int rc = mpDrv->pUpPort->pfnQueryColorDepth(mpDrv->pUpPort, &cBits);
     AssertRC(rc);
-    *colorDepth = cBits;
+    *bitsPerPixel = cBits;
     return S_OK;
 }
@@ -1481 +1495 @@
 }
 
-STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay)
+STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel, ULONG aDisplay)
 {
     AutoLock lock(this);
@@ -1497 +1511 @@
     if (!height)
         height   = mpDrv->Connector.cy;
-    ULONG bpp    = aColorDepth;
+    ULONG bpp    = aBitsPerPixel;
     if (!bpp)
     {
@@ -1522 +1536 @@
     lock.leave ();
     if (mParent->getVMMDev())
-        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aColorDepth, aDisplay);
+        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aBitsPerPixel, aDisplay);
     return S_OK;
 }
@@ -1805 +1819 @@
         rc = pFramebuffer->COMGETTER(Address) (&address);
         AssertComRC (rc);
-        ULONG lineSize = 0;
-        rc = pFramebuffer->COMGETTER(LineSize) (&lineSize);
+        ULONG bytesPerLine = 0;
+        rc = pFramebuffer->COMGETTER(BytesPerLine) (&bytesPerLine);
         AssertComRC (rc);
-        ULONG colorDepth = 0;
-        rc = pFramebuffer->COMGETTER(ColorDepth) (&colorDepth);
+        ULONG bitsPerPixel = 0;
+        rc = pFramebuffer->COMGETTER(BitsPerPixel) (&bitsPerPixel);
         AssertComRC (rc);
         ULONG width = 0;
@@ -1826 +1840 @@
         if (aCheckParams &&
             (mLastAddress != address ||
-             mLastLineSize != lineSize ||
-             mLastColorDepth != colorDepth ||
+             mLastBytesPerLine != bytesPerLine ||
+             mLastBitsPerPixel != bitsPerPixel ||
              mLastWidth != (int) width ||
              mLastHeight != (int) height))
         {
-            handleDisplayResize (VBOX_VIDEO_PRIMARY_SCREEN, mLastColorDepth,
+            handleDisplayResize (VBOX_VIDEO_PRIMARY_SCREEN, mLastBitsPerPixel,
                                  mLastAddress,
-                                 mLastLineSize,
+                                 mLastBytesPerLine,
                                  mLastWidth,
                                  mLastHeight);
@@ -1840 +1854 @@
 
         mpDrv->Connector.pu8Data = (uint8_t *) address;
-        mpDrv->Connector.cbScanline = lineSize;
-        mpDrv->Connector.cBits = colorDepth;
+        mpDrv->Connector.cbScanline = bytesPerLine;
+        mpDrv->Connector.cBits = bitsPerPixel;
         mpDrv->Connector.cx = width;
         mpDrv->Connector.cy = height;
@@ -2335 +2349 @@
         pData->pDisplay->mpVMMDev = NULL;
         pData->pDisplay->mLastAddress = NULL;
-        pData->pDisplay->mLastLineSize = 0;
-        pData->pDisplay->mLastColorDepth = 0,
+        pData->pDisplay->mLastBytesPerLine = 0;
+        pData->pDisplay->mLastBitsPerPixel = 0,
         pData->pDisplay->mLastWidth = 0;
         pData->pDisplay->mLastHeight = 0;

trunk/src/VBox/Main/FramebufferImpl.cpp

@@ -46 +46 @@
     mWidth = width;
     mHeight = height;
-    mDepth = depth;
-    mLineSize = ((width * depth + 31) / 32) * 4;
-    mData = new uint8_t[mLineSize * height];
-    memset(mData, 0, mLineSize * height);
+    mBitsPerPixel = depth;
+    mBytesPerLine = ((width * depth + 31) / 32) * 4;
+    mData = new uint8_t [mBytesPerLine * height];
+    memset (mData, 0, mBytesPerLine * height);
 
     return S_OK;
@@ -81 +81 @@
 }
 
-STDMETHODIMP InternalFramebuffer::COMGETTER(ColorDepth) (ULONG *colorDepth)
-{
-    if (!colorDepth)
-        return E_POINTER;
-    *colorDepth = mDepth;
-    return S_OK;
-}
-
-STDMETHODIMP InternalFramebuffer::COMGETTER(LineSize) (ULONG *lineSize)
-{
-    if (!lineSize)
-        return E_POINTER;
-    *lineSize = mLineSize;
-    return S_OK;
-}
-
-STDMETHODIMP InternalFramebuffer::COMGETTER(PixelFormat) (FramebufferPixelFormat_T *pixelFormat)
+STDMETHODIMP InternalFramebuffer::COMGETTER(BitsPerPixel) (ULONG *bitsPerPixel)
+{
+    if (!bitsPerPixel)
+        return E_POINTER;
+    *bitsPerPixel = mBitsPerPixel;
+    return S_OK;
+}
+
+STDMETHODIMP InternalFramebuffer::COMGETTER(BytesPerLine) (ULONG *bytesPerLine)
+{
+    if (!bytesPerLine)
+        return E_POINTER;
+    *bytesPerLine = mBytesPerLine;
+    return S_OK;
+}
+
+STDMETHODIMP InternalFramebuffer::COMGETTER(PixelFormat) (ULONG *pixelFormat)
 {
     if (!pixelFormat)
         return E_POINTER;
-    *pixelFormat = FramebufferPixelFormat_PixelFormatOpaque;
+    *pixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+    return S_OK;
+}
+
+STDMETHODIMP InternalFramebuffer::COMGETTER(UsesGuestVRAM) (BOOL *usesGuestVRAM)
+{
+    if (!usesGuestVRAM)
+        return E_POINTER;
+    *usesGuestVRAM = FALSE;
     return S_OK;
 }
@@ -151 +159 @@
 
 STDMETHODIMP
-InternalFramebuffer::RequestResize(ULONG iScreenId, FramebufferPixelFormat_T pixelFormat, BYTE *vram,
-                                   ULONG lineSize, ULONG w, ULONG h,
+InternalFramebuffer::RequestResize(ULONG iScreenId, ULONG pixelFormat, BYTE *vram,
+                                   ULONG bpp, ULONG bpl, ULONG w, ULONG h,
                                    BOOL *finished)
 {
+    NOREF (bpp);
+    NOREF (bpl);
+
     if (!finished)
         return E_POINTER;
@@ -164 +175 @@
     mWidth = w;
     mHeight = h;
-    mLineSize = ((w * mDepth + 31) / 32) * 4;
-    mData = new uint8_t[mLineSize * h];
-    memset(mData, 0, mLineSize * h);
+    mBytesPerLine = ((w * mBitsPerPixel + 31) / 32) * 4;
+    mData = new uint8_t [mBytesPerLine * h];
+    memset (mData, 0, mBytesPerLine * h);
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3286 +3286 @@
         refuses to release it for some reason.
 
-        <see>IUSBController::DeviceFilters, USBDeviceState</see>
+        <see>IUSBController::deviceFilters, USBDeviceState</see>
       </desc>
       <param name="id" type="uuid" dir="in">
@@ -3303 +3303 @@
         a possible automatic reattachment.
 
-        <see>IUSBController::DeviceFilters, USBDeviceState</see>
+        <see>IUSBController::deviceFilters, USBDeviceState</see>
       </desc>
       <param name="id" type="uuid" dir="in">
@@ -3777 +3777 @@
         Unless the device is ignored by these filters, filters of all
         currently running virtual machines
-        (<link to="IUSBController::DeviceFilters"/>) are applied to it.
+        (<link to="IUSBController::deviceFilters"/>) are applied to it.
 
         <see>IHostUSBDeviceFilter, USBDeviceState</see>
@@ -6142 +6142 @@
   <enum
      name="FramebufferPixelFormat"
-     uuid="3bd87520-2b5f-4786-a891-f8c6aeb19a1f"
+     uuid="6b27d1fc-4f2c-4e9c-a166-01d06540305d"
      >
     <desc>
-      Format of the virtual video card's memory buffer.  See
-      <link to="IFramebuffer::requestResize()"/> for more information.
+      Format of the video memory buffer. Constants represented by this enum can
+      be used to test for particular values of <link
+      to="IFramebuffer::pixelFormat"/>. See also <link
+      to="IFramebuffer::requestResize()"/>.
+
+      See also www.fourcc.org for more informantion about FOURCC pixel formats. 
     </desc>
-    <const name="PixelFormatOpaque"       value="0"/>
-    <const name="PixelFormatRGB16"        value="1"/>
-    <const name="PixelFormatRGB24"        value="2"/>
-    <const name="PixelFormatRGB32"        value="3"/>
+    <const name="PixelFormatOpaque"       value="0xFFFFFFFF">
+      <desc>
+        Unknown buffer format. The user may not assume any particular
+        format of the buffer.
+      </desc>
+    </const>
+    <const name="FOURCC_RGB"              value="0x32424752">
+      <desc>
+        Basic RGB format. <link to="IFramebuffer::bitsPerPixel"/> determines
+        the bit layout.
+      </desc>
+    </const>
   </enum>
 
   <interface
      name="IFramebuffer" extends="$unknown"
-     uuid="450058a4-fef0-4987-81c2-7b89bfc2242f"
+     uuid="af431304-5b09-40e2-94da-3c3cb03822c1"
      wsmap="suppress"
      >
@@ -6164 +6176 @@
 
     <attribute name="width" type="unsigned long" readonly="yes">
-      <desc>Framebuffer width.</desc>
+      <desc>Framebuffer width, in pixels.</desc>
     </attribute>
 
     <attribute name="height" type="unsigned long" readonly="yes">
-      <desc>Framebuffer height.</desc>
-    </attribute>
-
-    <attribute name="colorDepth" type="unsigned long" readonly="yes">
-      <desc>Framebuffer color depth.</desc>
-    </attribute>
-
-    <attribute name="lineSize" type="unsigned long" readonly="yes">
-      <desc>framebuffer scan line size in bytes.</desc>
-    </attribute>
-
-    <attribute name="pixelFormat" type="FramebufferPixelFormat" readonly="yes">
-      <desc>Framebuffer pixel format.</desc>
+      <desc>Framebuffer height, in pixels.</desc>
+    </attribute>
+
+    <attribute name="bitsPerPixel" type="unsigned long" readonly="yes">
+      <desc>
+        Color depth, in bits per pixel. When <link to="#pixelFormat"/> is <link
+        to="FramebufferPixelFormat::FOURCC_RGB">FOURCC_RGB</link>, valid values
+        are: 8, 15, 16, 24 and 32.
+      </desc>
+    </attribute>
+
+    <attribute name="bytesPerLine" type="unsigned long" readonly="yes">
+      <desc>
+        Scan line size, in bytes. When <link to="#pixelFormat"/> is <link
+        to="FramebufferPixelFormat::FOURCC_RGB">FOURCC_RGB</link>, the
+        size of the scan line must be aligned to 32 bits.
+      </desc>
+    </attribute>
+
+    <attribute name="pixelFormat" type="unsigned long" readonly="yes">
+      <desc>
+        Framebuffer pixel format. It's either one of the values defined by <link
+        to="FramebufferPixelFormat"/> or a raw FOURCC code.
+        <note>
+          This attribute must never return <link
+          to="PixelFormat::PixelFormatOpaque"/> -- the format of the buffer
+          <link to="#address"/> points to must be always known. 
+        </note>
+      </desc>
+    </attribute>
+
+    <attribute name="usesGuestVRAM" type="boolean" readonly="yes">
+      <desc>
+        Defines whether this framebuffer uses the virtual video card's memory
+        buffer (guest VRAM) directly or not. See <link
+        to="IFramebuffer::requestResize()"/> for more information. 
+      </desc>
     </attribute>
 
@@ -6241 +6277 @@
         Requests a size and pixel format change.
 
-        There are two strategies of working with the video buffer of the
-        virtual machine. The first strategy implies that the IFramebuffer
+        There are two modes of working with the video buffer of the virtual
+        machine. The <i>indirect</i> mode implies that the IFramebuffer
         implementation allocates a memory buffer for the requested display mode
-        and provides it to the virtual machine. In the second strategy, the
+        and provides it to the virtual machine. In <i>direct</i> mode, the
         IFramebuffer implementation uses the memory buffer allocated and owned
-        by the virtual machine. The second strategy is usually faster because
-        the implementation gets a pointer to the virtual machine video card's
-        memory which it can directly use for visualising the contents of the
-        virtual display, as opposed to the first strategy where the video
-        card's memory contents are copied to the memory buffer provided by the
-        implementation every time a display update occurs.
-
-        It is important to note that the second strategy is really fast only
-        when the implementation uses the provided video buffer directly, for
-        example, by blitting it to the window representing the virtual
-        machine's display, which saves at least one copy operation comparing
-        to the first strategy. However, using the video card's memory directly
-        is not always possible: for example, the format and the color depth of
-        the window representing the virtual display may differ from the format
-        or the color depth of the virtual video buffer, or the format of the
-        latter may be unknown or unsupported. In this case, the first strategy
-        (that is always available) is used as a fallback: when the virtual
-        video card's memory contents are copied to the implementation-provided
-        memory buffer, color and format conversion is done authomatically by
-        the underlying code.
-
-        The @a pixelFormat and @a VRAM parameters define whether the second
-        strategy is available or not. If @a pixelFormat is
-        <link to="PixelFormat::PixelFormatOpaque"/> (which usually indicates a
-        text mode of the virtual display) or if @a VRAM is <tt>null</tt>
-        (which means a non-linear graphical mode), then direct access to the
-        virtual card's video memory buffer is not available, the @a VRAM
-        parameter must be ignored and the implementation must use the first
-        strategy. In all other cases, @a pixelFormat together with @a lineSize
-        define the format of the video memory buffer pointed to by the @a VRAM
-        parameter and the implementation is free to choose which strategy to
-        use. To indicate that this framebuffer uses the second strategy, its
-        implementation of the <link to="#address()"/> method must return the
-        same address as it gets in the @a VRAM parameter of this method;
-        otherwise it is assumed that the first strategy is chosen.
+        by the virtual machine. The direct mode is usually faster because the
+        implementation gets a pointer to the virtual machine video card's memory
+        which it can directly use for visualising the contents of the virtual
+        display, as opposed to the indirect mode where the video card's memory
+        contents are copied to the memory buffer provided by the implementation
+        every time a display update occurs.
+
+        It is important to note that the direct mode is really fast only when
+        the implementation uses the provided video buffer directly, for example,
+        by blitting it to the window representing the virtual machine's display,
+        which saves at least one copy operation comparing to the indirect mode.
+        However, using the video card's memory directly is not always possible:
+        for example, the format and the color depth of the window representing
+        the virtual display may differ from the format or the color depth of the
+        virtual video buffer, or the format of the latter may be unknown or
+        unsupported. In this case, the indirect mode (that is always available)
+        should be used as a fallback: when the virtual video card's memory
+        contents are copied to the implementation-provided memory buffer, color
+        and format conversion is done authomatically by the underlying code.
+
+        The @a pixelFormat parameter defines whether the direct mode is
+        available or not. If @a pixelFormat is <link
+        to="PixelFormat::PixelFormatOpaque"/> (which usually indicates either a
+        text or a non-linear graphics mode of the virtual display), then direct
+        access to the virtual card's video memory buffer is not available, the
+        @a VRAM, @a bitsPerPixel and @a bytesPerLine parameters must be ingored
+        and the implementation must use the indirect mode when it will provide
+        its own values for the pixel format, color depth and scan line size. In
+        all other cases, @a pixelFormat together with @a bitsPerPixel and @a
+        bytesPerLine define the format of the video memory buffer pointed to by
+        the @a VRAM parameter and the implementation is free to choose which
+        mode to use. To indicate that this framebuffer uses the direct mode, the
+        implementation of the <link to="#usesGuestVRAM"/> attribute must
+        return <tt>true</tt> and <link to="#address"/> must return exactly the
+        same address that is passed in the @a VRAM parameter of this method;
+        otherwise it is assumed that the indirect strategy is chosen.
 
         The @a width and @a height parameters represent the size of the
-        requested display mode in both cases. In case of the first strategy,
-        the provided memory buffer should be enough to store data of the given
-        display mode. In case of the second strategy, it is guaranteed that
-        the given @a VRAM buffer contains enough space to represent the
-        display mode of the given size. Note that this framebuffer's
-        <link to="#width()"/> and <link to="#height()"/> properties must
-        return exactly the same values as passed to this method after the
-        resize is completed (see below).
+        requested display mode in both modes. In case of indirect mode, the
+        provided memory buffer should be big enough to store data of the given
+        display mode. In case of direct mode, it is guaranteed that the given @a
+        VRAM buffer contains enough space to represent the display mode of the
+        given size. Note that this framebuffer's <link to="#width"/> and <link
+        to="#height"/> attributes must return exactly the same values as
+        passed to this method after the resize is completed (see below).
 
         The @a finished output parameter determines if the implementation has
@@ -6301 +6337 @@
         <link to="IDisplay::resizeCompleted()"/> is called.
 
-        Note that if the second strategy is choosen, the
-        <link to="#colorDepth()"/>, <link to="#lineSize()"/> and
-        <link to="#pixelFormat()"/> properties of this framebuffer must return
-        exactly the same values as specified in the parameters of this method
-        after the resize is completed. In case of the first strategy these
-        properties must return values describing the format of the
-        implementation's own memory buffer <link to="#address()"/> points
-        to. Note also that the <link to="#colorDepth()"/> value must always
-        correlate with <link to="#pixelFormat()"/> when the latter returns any
-        value other than <link to="PixelFormat::PixelFormatOpaque"/>.
+        Note that if the direct mode is chosen, the <link to="#bitsPerPixel"/>,
+        <link to="#bytesPerLine"/> and <link to="#pixelFormat"/> attributes of
+        this framebuffer must return exactly the same values as specified in the
+        parameters of this method, after the resize is completed. If the
+        indirect mode is chosen, these attributes must return values describing
+        the format of the implementation's own memory buffer <link
+        to="#address"/> points to. Note also that the <link to="#bitsPerPixel"/>
+        value must always correlate with <link to="#pixelFormat"/>. Note that
+        the <link to="#pixelFormat"/> attribute must never return <link
+        to="PixelFormat::PixelFormatOpaque"/> regardless of the selected mode.
 
         <note>
@@ -6326 +6362 @@
         </desc>
       </param>
-      <param name="pixelFormat" type="FramebufferPixelFormat" dir="in">
-        <desc>Pixel format of the memory buffer pointed to by @a VRAM.</desc>
+      <param name="pixelFormat" type="unsigned long" dir="in">
+        <desc>
+          Pixel format of the memory buffer pointed to by @a VRAM.
+          See also <link to="FramebufferPixelFormat"/>.
+        </desc>
       </param>
       <param name="VRAM" type="octet" mod="ptr" dir="in">
         <desc>Pointer to the virtual video card's VRAM (may be @c null).</desc>
       </param>
-      <param name="lineSize" type="unsigned long" dir="in">
+      <param name="bitsPerPixel" type="unsigned long" dir="in">
+        <desc>Color depth, bits per pixel.</desc>
+      </param>
+      <param name="bytesPerLine" type="unsigned long" dir="in">
         <desc>Size of one scan line, in bytes.</desc>
       </param>
@@ -6512 +6554 @@
   <interface
      name="IDisplay" extends="$unknown"
-     uuid="e740a435-88d1-4f14-b9ca-a1b30e2c5038"
+     uuid="010b00f4-9223-4545-9db3-866809da94a0"
      wsmap="suppress"
      >
@@ -6523 +6565 @@
     </attribute>
 
-    <attribute name="colorDepth" type="unsigned long" readonly="yes">
+    <attribute name="bitsPerPixel" type="unsigned long" readonly="yes">
       <desc>
         Current guest display color depth. Note that this may differ
-        from <link to="IFramebuffer::colorDepth">IFramebuffer::colorDepth</link>.
+        from <link to="IFramebuffer::bitsPerPixel"/>.
       </desc>
     </attribute>
@@ -6591 +6633 @@
       <param name="width" type="unsigned long" dir="in"/>
       <param name="height" type="unsigned long" dir="in"/>
-      <param name="colorDepth" type="unsigned long" dir="in"/>
+      <param name="bitsPerPixel" type="unsigned long" dir="in"/>
       <param name="display" type="unsigned long" dir="in"/>
     </method>
@@ -7011 +7053 @@
         <link to="#insertDeviceFilter()"/>.
 
-        <see>#DeviceFilters</see>
+        <see>#deviceFilters</see>
       </desc>
       <param name="name" type="wstring" dir="in">
@@ -7039 +7081 @@
         </note>
 
-        <see>#DeviceFilters</see>
+        <see>#deviceFilters</see>
       </desc>
       <param name="position" type="unsigned long" dir="in">
@@ -7058 +7100 @@
         the list will produce an error.
 
-        <see>#DeviceFilters</see>
+        <see>#deviceFilters</see>
       </desc>
       <param name="position" type="unsigned long" dir="in">
@@ -7281 +7323 @@
       </note>
 
-      <see>IUSBController::DeviceFilters, IHostUSBDeviceFilter</see>
+      <see>IUSBController::deviceFilters, IHostUSBDeviceFilter</see>
     </desc>
 
@@ -7385 +7427 @@
       either ignore the device, or put ot to #USBDeviceHeld state, or do
       nothing. Unless the device is ignored by global filters, filters of
-      all currently running guests (<link to="IUSBController::DeviceFilters"/>)
+      all currently running guests (<link to="IUSBController::deviceFilters"/>)
       are activated that can put it to #USBDeviceCaptured state.
 
@@ -7574 +7616 @@
         The <link to="#remote"/> attribute is ignored by this type of
         filters, because it makes sense only for
-        <link to="IUSBController::DeviceFilters">machine USB filters</link>.
+        <link to="IUSBController::deviceFilters">machine USB filters</link>.
       </note>
 

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -166 +166 @@
     STDMETHOD(COMGETTER(Width)) (ULONG *width);
     STDMETHOD(COMGETTER(Height)) (ULONG *height);
-    STDMETHOD(COMGETTER(ColorDepth)) (ULONG *colorDepth);
+    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *bitsPerPixel);
 
     // IDisplay methods
@@ -175 +175 @@
     STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer *aFramebuffer);
     STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
-    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth, ULONG display);
+    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG bitsPerPixel, ULONG display);
     STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
     STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
@@ -226 +226 @@
     /* arguments of the last handleDisplayResize() call */
     void *mLastAddress;
-    uint32_t mLastLineSize;
-    uint32_t mLastColorDepth;
+    uint32_t mLastBytesPerLine;
+    uint32_t mLastBitsPerPixel;
     int mLastWidth;
     int mLastHeight;

trunk/src/VBox/Main/include/FramebufferImpl.h

@@ -51 +51 @@
     STDMETHOD(COMGETTER(Width)) (ULONG *width);
     STDMETHOD(COMGETTER(Height)) (ULONG *height);
-    STDMETHOD(COMGETTER(ColorDepth)) (ULONG *colorDepth);
-    STDMETHOD(COMGETTER(LineSize)) (ULONG *lineSize);
-    STDMETHOD(COMGETTER(PixelFormat)) (FramebufferPixelFormat_T *pixelFormat);
+    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *bitsPerPixel);
+    STDMETHOD(COMGETTER(BytesPerLine)) (ULONG *bytesPerLine);
+    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *pixelFormat);
+    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *usesGuestVRAM);
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
@@ -63 +64 @@
                             ULONG w, ULONG h,
                             BOOL *finished);
-    STDMETHOD(RequestResize)(ULONG uScreenId, FramebufferPixelFormat_T pixelFormat, BYTE *vram,
-                             ULONG lineSize, ULONG w, ULONG h,
+    STDMETHOD(RequestResize)(ULONG uScreenId, ULONG pixelFormat, BYTE *vram,
+                             ULONG bpp, ULONG bpl, ULONG w, ULONG h,
                              BOOL *finished);
     STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T operation,
@@ -80 +81 @@
     int mWidth;
     int mHeight;
-    int mDepth;
-    int mLineSize;
+    int mBitsPerPixel;
+    int mBytesPerLine;
     uint8_t *mData;
     RTSEMMUTEX mMutex;