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

Timestamp:

Apr 12, 2010 3:31:54 PM (15 years ago)

Author:

vboxsync

Message:

IDisplay API changes for multimonitor (xTracker 4655)

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (5 diffs)
• MouseImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (7 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1980 +1980 @@
 
 
-// IDisplay properties
+// IDisplay methods
 /////////////////////////////////////////////////////////////////////////////
-
-/**
- * Returns the current display width in pixel
- *
- * @returns COM status code
- * @param width Address of result variable.
- */
-STDMETHODIMP Display::COMGETTER(Width) (ULONG *width)
-{
-    CheckComArgNotNull(width);
+STDMETHODIMP Display::GetScreenResolution (ULONG aScreenId,
+    ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel)
+{
+    LogFlowFunc (("aScreenId = %d\n", aScreenId));
 
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    *width = mpDrv->IConnector.cx;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    uint32_t u32Width = 0;
+    uint32_t u32Height = 0;
+    uint32_t u32BitsPerPixel = 0;
+
+    if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+    {
+        CHECK_CONSOLE_DRV (mpDrv);
+
+        u32Width = mpDrv->IConnector.cx;
+        u32Height = mpDrv->IConnector.cy;
+        int rc = mpDrv->pUpPort->pfnQueryColorDepth(mpDrv->pUpPort, &u32BitsPerPixel);
+        AssertRC(rc);
+    }
+    else if (aScreenId < mcMonitors)
+    {
+        DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
+        u32Width = pFBInfo->w;
+        u32Height = pFBInfo->h;
+        u32BitsPerPixel = pFBInfo->u16BitsPerPixel;
+    }
+    else
+    {
+        return E_INVALIDARG;
+    }
+
+    if (aWidth)
+        *aWidth = u32Width;
+    if (aHeight)
+        *aHeight = u32Height;
+    if (aBitsPerPixel)
+        *aBitsPerPixel = u32BitsPerPixel;
 
     return S_OK;
 }
-
-/**
- * Returns the current display height in pixel
- *
- * @returns COM status code
- * @param height Address of result variable.
- */
-STDMETHODIMP Display::COMGETTER(Height) (ULONG *height)
-{
-    CheckComArgNotNull(height);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    *height = mpDrv->IConnector.cy;
-
-    return S_OK;
-}
-
-/**
- * Returns the current display color depth in bits
- *
- * @returns COM status code
- * @param bitsPerPixel Address of result variable.
- */
-STDMETHODIMP Display::COMGETTER(BitsPerPixel) (ULONG *bitsPerPixel)
-{
-    if (!bitsPerPixel)
-        return E_INVALIDARG;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    uint32_t cBits = 0;
-    int rc = mpDrv->pUpPort->pfnQueryColorDepth(mpDrv->pUpPort, &cBits);
-    AssertRC(rc);
-    *bitsPerPixel = cBits;
-
-    return S_OK;
-}
-
-
-// IDisplay methods
-/////////////////////////////////////////////////////////////////////////////
 
 STDMETHODIMP Display::SetFramebuffer (ULONG aScreenId,
@@ -2278 +2248 @@
 }
 
-STDMETHODIMP Display::TakeScreenShot (BYTE *address, ULONG width, ULONG height)
+STDMETHODIMP Display::TakeScreenShot (ULONG aScreenId, BYTE *address, ULONG width, ULONG height)
 {
     /// @todo (r=dmik) this function may take too long to complete if the VM
@@ -2333 +2303 @@
 }
 
-STDMETHODIMP Display::TakeScreenShotSlow (ULONG width, ULONG height,
+STDMETHODIMP Display::TakeScreenShotToArray (ULONG aScreenId, ULONG width, ULONG height,
                                           ComSafeArrayOut(BYTE, aScreenData))
 {
@@ -2420 +2390 @@
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
 
-STDMETHODIMP Display::DrawToScreen (BYTE *address, ULONG x, ULONG y,
+STDMETHODIMP Display::DrawToScreen (ULONG aScreenId, BYTE *address, ULONG x, ULONG y,
                                     ULONG width, ULONG height)
 {
@@ -2570 +2540 @@
         ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
     AssertRelease(f);NOREF(f);
-
-    return S_OK;
-}
-
-/**
- * Notification that the framebuffer has completed the
- * asynchronous update processing
- *
- * @returns COM status code
- */
-STDMETHODIMP Display::UpdateCompleted()
-{
-    LogFlowFunc (("\n"));
-
-    /// @todo (dmik) can we AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); here?
-    //  do it when we switch this class to VirtualBoxBase_NEXT.
-    //  Tthis will require general code review and may add some details.
-    //  In particular, we may want to check whether EMT is really waiting for
-    //  this notification, etc. It might be also good to obey the caller to make
-    //  sure this method is not called from more than one thread at a time
-    //  (and therefore don't use Display lock at all here to save some
-    //  milliseconds).
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is only valid for external framebuffers */
-    if (maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer == NULL)
-        return setError(VBOX_E_NOT_SUPPORTED,
-                        tr("Resize completed notification is valid only for external framebuffers"));
 
     return S_OK;

trunk/src/VBox/Main/MouseImpl.cpp

@@ -409 +409 @@
 
     ULONG displayWidth;
-    HRESULT rc = pDisplay->COMGETTER(Width)(&displayWidth);
+    HRESULT rc = pDisplay->GetScreenResolution (0, &displayWidth, NULL, NULL);
     if (FAILED(rc)) return rc;
 
@@ -429 +429 @@
 
     ULONG displayHeight;
-    HRESULT rc = pDisplay->COMGETTER(Height)(&displayHeight);
+    HRESULT rc = pDisplay->GetScreenResolution (0, NULL, &displayHeight, NULL);
     if (FAILED(rc)) return rc;
 

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

@@ -11314 +11314 @@
   <interface
      name="IDisplay" extends="$unknown"
-     uuid="e2a38ebc-d854-4a3e-bc2e-fdf5ac4a0000"
+     uuid="1fa79e39-0cc9-4ab3-9df3-ed3e96b42496"
      wsmap="managed"
      >
@@ -11328 +11328 @@
       the host computer or an RDP session's display on a remote computer.
     </desc>
-    <attribute name="width" type="unsigned long" readonly="yes">
-      <desc>Current display width.</desc>
-    </attribute>
-
-    <attribute name="height" type="unsigned long" readonly="yes">
-      <desc>Current display height.</desc>
-    </attribute>
-
-    <attribute name="bitsPerPixel" type="unsigned long" readonly="yes">
-      <desc>
-        Current guest display color depth. Note that this may differ
-        from <link to="IFramebuffer::bitsPerPixel"/>.
-      </desc>
-    </attribute>
+    <method name="getScreenResolution">
+      <desc>Queries display width, height and color depth for given screen.</desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
+      <param name="width" type="unsigned long" dir="out"/>
+      <param name="height" type="unsigned long" dir="out"/>
+      <param name="bitsPerPixel" type="unsigned long" dir="out"/>
+    </method>
 
     <method name="setFramebuffer">
@@ -11422 +11415 @@
 
       </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
       <param name="address" type="octet" mod="ptr" dir="in"/>
       <param name="width" type="unsigned long" dir="in"/>
@@ -11427 +11421 @@
     </method>
 
-    <method name="takeScreenShotSlow">
+    <method name="takeScreenShotToArray">
       <desc>
         Takes a guest screen shot of the requested size and returns it as
@@ -11444 +11438 @@
         </result>
       </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
       <param name="width" type="unsigned long" dir="in">
         <desc>
@@ -11474 +11469 @@
 
       </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
       <param name="address" type="octet" mod="ptr" dir="in"/>
       <param name="x" type="unsigned long" dir="in"/>
@@ -11503 +11499 @@
       </desc>
       <param name="screenId" type="unsigned long" dir="in"/>
-    </method>
-
-    <method name="updateCompleted">
-      <desc>
-        Signals that a framebuffer has completed the update operation.
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          Operation only valid for external frame buffers.
-        </result>
-
-      </desc>
     </method>
 

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

@@ -246 +246 @@
     }
 
-    // IDisplay properties
-    STDMETHOD(COMGETTER(Width)) (ULONG *width);
-    STDMETHOD(COMGETTER(Height)) (ULONG *height);
-    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *bitsPerPixel);
-
     // IDisplay methods
+    STDMETHOD(GetScreenResolution)(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel);
     STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer *aFramebuffer);
     STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG bitsPerPixel, ULONG display);
-    STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
-    STDMETHOD(TakeScreenShotSlow)(ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
-    STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
+    STDMETHOD(TakeScreenShot)(ULONG aScreenId, BYTE *address, ULONG width, ULONG height);
+    STDMETHOD(TakeScreenShotToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
+    STDMETHOD(DrawToScreen)(ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();
     STDMETHOD(ResizeCompleted)(ULONG aScreenId);
-    STDMETHOD(UpdateCompleted)();
     STDMETHOD(SetSeamlessMode)(BOOL enabled);