Add xinerama support to the vmware video driver. (Better late than never).

With this change, the VMWARE_CTRL extension is updated so that it can
receive topology updates at runtime. I will add some sample client code
separately.

I also intend to add support for a static initial topology defined in
xorg.conf but I haven't got around to it yet due to hating to write
string parsing code.

1 files changed, 19 insertions, 1 deletions

diff --git a/src/vmware.h b/src/vmware.h
index 4b98ebb..7f138a6 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -14,6 +14,8 @@
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 
+#include <X11/extensions/panoramiXproto.h>
+
 #include "compiler.h"	        /* inb/outb */
 
 #include "xf86PciInfo.h"	/* pci vendor id */
@@ -52,6 +54,8 @@ typedef struct {
     CARD32 svga_reg_id;
 } VMWARERegRec, *VMWARERegPtr;
 
+typedef xXineramaScreenInfo VMWAREXineramaRec, *VMWAREXineramaPtr;
+
 typedef struct {
     EntityInfoPtr pEnt;
     pciVideoPtr PciInfo;
@@ -138,6 +142,18 @@ typedef struct {
     SVGASurface* curPict;
     int op;
 
+    /*
+     * Xinerama state
+     */
+    Bool xinerama;
+    Bool xineramaStatic;
+
+    VMWAREXineramaPtr xineramaState;
+    unsigned int xineramaNumOutputs;
+
+    VMWAREXineramaPtr xineramaNextState;
+    unsigned int xineramaNextNumOutputs;
+
 } VMWARERec, *VMWAREPtr;
 
 #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
@@ -254,8 +270,10 @@ void vmwareXAACloseScreen(
    ScreenPtr pScreen
    );
 
-/* vmware_ctl.c */
+/* vmwarectrl.c */
 void VMwareCtrl_ExtInit(ScrnInfoPtr pScrn);
 
+/* vmwarexinerama.c */
+void VMwareXinerama_ExtInit(ScrnInfoPtr pScrn);
 
 #endif