Changeset 3153 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 19, 2007 9:40:23 AM (18 years ago)

Author:

vboxsync

Message:

Multimonitor support.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleVRDPServer.h (modified) (3 diffs)
• DisplayImpl.h (modified) (7 diffs)
• FramebufferImpl.h (modified) (1 diff)

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

@@ -79 +79 @@
      * Forwarders to VRDP server library.
      */
-    void SendUpdate (void *pvUpdate, uint32_t cbUpdate) const;
+    void SendUpdate (unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate) const;
     void SendResize (void) const;
-    void SendUpdateBitmap (uint32_t x, uint32_t y, uint32_t w, uint32_t h) const;
+    void SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const;
     void SetFramebuffer (IFramebuffer *framebuffer, uint32_t fFlags) const;
 
@@ -113 +113 @@
     static void (VBOXCALL *mpfnVRDPSetCallback)     (HVRDPSERVER hServer, VRDPSERVERCALLBACK *pcallback, void *pvUser);
     static void (VBOXCALL *mpfnVRDPShutdownServer)  (HVRDPSERVER hServer);
-    static void (VBOXCALL *mpfnVRDPSendUpdateBitmap)(HVRDPSERVER hServer, unsigned x, unsigned y, unsigned w, unsigned h);
+    static void (VBOXCALL *mpfnVRDPSendUpdateBitmap)(HVRDPSERVER hServer, unsigned uScreenId, unsigned x, unsigned y, unsigned w, unsigned h);
     static void (VBOXCALL *mpfnVRDPSendResize)      (HVRDPSERVER hServer);
     static void (VBOXCALL *mpfnVRDPSendAudioSamples)(HVRDPSERVER hserver, void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format);
@@ -122 +122 @@
     static void (VBOXCALL *mpfnVRDPSendUSBRequest)  (HVRDPSERVER hserver, void *pvParms, uint32_t cbParms);
 #endif /* VRDP_MC */
-    static void (VBOXCALL *mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, void *pvUpdate, uint32_t cbUpdate);
+    static void (VBOXCALL *mpfnVRDPSendUpdate)      (HVRDPSERVER hServer, unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate);
     static void (VBOXCALL *mpfnVRDPQueryInfo)       (HVRDPSERVER hserver, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
     static void (VBOXCALL *mpfnVRDPClipboard)       (HVRDPSERVER hserver, uint32_t u32Function, uint32_t u32Format, const void *pvData, uint32_t cbData, uint32_t *pcbActualRead);

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

@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
+#include "SchemaDefs.h"
 #include <iprt/semaphore.h>
 #include <VBox/pdm.h>
 #include <VBox/VBoxGuest.h>
+#include <VBox/VBoxVideo.h>
 
 class Console;
+
+enum {
+    ResizeStatus_Void,
+    ResizeStatus_InProgress,
+    ResizeStatus_UpdateDisplayData
+};
+
+typedef struct _DISPLAYFBINFO
+{
+    uint32_t u32Offset;
+    uint32_t u32MaxFramebufferSize;
+    uint32_t u32InformationSize;
+
+    ComPtr<IFramebuffer> pFramebuffer;
+
+    LONG xOrigin;
+    LONG yOrigin;
+
+    ULONG w;
+    ULONG h;
+
+    VBOXVIDEOINFOHOSTEVENTS *pHostEvents;
+
+    volatile uint32_t u32ResizeStatus;
+    
+    /* The Framebuffer has default format and must be updates immediately. */
+    bool fDefaultFormat;
+    
+    struct {
+        /* The rectangle that includes all dirty rectangles. */
+        int32_t xLeft;
+        int32_t xRight;
+        int32_t yTop;
+        int32_t yBottom;
+    } dirtyRect;
+
+} DISPLAYFBINFO;
 
 class ATL_NO_VTABLE Display :
@@ -59 +98 @@
 
     // public methods only for internal purposes
-    int handleDisplayResize (uint32_t bpp, void *pvVRAM, uint32_t cbLine, int w, int h);
+    int handleDisplayResize (unsigned uScreenId, uint32_t bpp, void *pvVRAM, uint32_t cbLine, int w, int h);
     void handleDisplayUpdate (int x, int y, int cx, int cy);
     IFramebuffer *getFramebuffer()
     {
-        return mFramebuffer;
+        return maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
     }
 
@@ -138 +177 @@
     STDMETHOD(UnlockFramebuffer)();
     STDMETHOD(RegisterExternalFramebuffer)(IFramebuffer *frameBuf);
+    STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer * aFramebuffer);
+    STDMETHOD(QueryFramebuffer)(ULONG aScreenId, IFramebuffer * * aFramebuffer, LONG * aXOrigin, LONG * aYOrigin);
     STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth, ULONG display);
     STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
     STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();
-    STDMETHOD(ResizeCompleted)();
+    STDMETHOD(ResizeCompleted)(ULONG aScreenId);
     STDMETHOD(UpdateCompleted)();
 
@@ -155 +196 @@
 
     static DECLCALLBACK(int) changeFramebuffer (Display *that, IFramebuffer *aFB,
-                                                bool aInternal);
+                                                bool aInternal, unsigned uScreenId);
 
     static DECLCALLBACK(void*) drvQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
@@ -166 +207 @@
     static DECLCALLBACK(void)  displayResetCallback(PPDMIDISPLAYCONNECTOR pInterface);
     static DECLCALLBACK(void)  displayLFBModeChangeCallback(PPDMIDISPLAYCONNECTOR pInterface, bool fEnabled);
+    static DECLCALLBACK(void)  displayProcessAdapterDataCallback(PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, uint32_t u32VRAMSize);
+    static DECLCALLBACK(void)  displayProcessDisplayDataCallback(PPDMIDISPLAYCONNECTOR pInterface, void *pvVRAM, unsigned uScreenId);
 
     ComObjPtr <Console, ComWeakRef> mParent;
@@ -175 +218 @@
     bool                    mfVMMDevInited;
     bool mInternalFramebuffer;
-    ComPtr<IFramebuffer> mFramebuffer;
+//    ComPtr<IFramebuffer> mFramebuffer;
+
+    unsigned mcMonitors;
+    DISPLAYFBINFO maFramebuffers[SchemaDefs::MaxGuestMonitors];
+
     bool mFramebufferOpened;
     /** bitmask of acceleration operations supported by current framebuffer */
@@ -206 +253 @@
 
     void handleResizeCompletedEMT (void);
-    volatile uint32_t mu32ResizeStatus;
-    
-    enum {
-        ResizeStatus_Void,
-        ResizeStatus_InProgress,
-        ResizeStatus_UpdateDisplayData
-    };
+//    volatile uint32_t mu32ResizeStatus;
 };
 

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

@@ -63 +63 @@
                             ULONG w, ULONG h,
                             BOOL *finished);
-    STDMETHOD(RequestResize)(FramebufferPixelFormat_T pixelFormat, BYTE *vram,
+    STDMETHOD(RequestResize)(ULONG uScreenId, FramebufferPixelFormat_T pixelFormat, BYTE *vram,
                              ULONG lineSize, ULONG w, ULONG h,
                              BOOL *finished);