Changeset 83200 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

Timestamp:

Mar 4, 2020 3:13:17 PM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. Call vmw_ctrl extension to connect outputs to crtcs

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -54 +54 @@
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/extensions/panoramiXproto.h>
+
+#ifndef sz_XineramaScreenInfo
+#define sz_XineramaScreenInfo 8
+#endif
 
 /** Maximum number of supported screens.  DRM and X11 both limit this to 32. */
@@ -68 +73 @@
 #define OLD_JUNK
 
-struct X11VMWRECT /* xXineramaScreenInfo in Xlib headers. */
+typedef struct {
+   CARD8  reqType;           /* always X_VMwareCtrlReqCode */
+   CARD8  VMwareCtrlReqType; /* always X_VMwareCtrlSetTopology */
+   CARD16 length B16;
+   CARD32 screen B32;
+   CARD32 number B32;
+   CARD32 pad1   B32;
+} xVMwareCtrlSetTopologyReq;
+#define sz_xVMwareCtrlSetTopologyReq 16
+
+#define X_VMwareCtrlSetTopology 2
+
+typedef struct {
+   BYTE   type; /* X_Reply */
+   BYTE   pad1;
+   CARD16 sequenceNumber B16;
+   CARD32 length B32;
+   CARD32 screen B32;
+   CARD32 pad2   B32;
+   CARD32 pad3   B32;
+   CARD32 pad4   B32;
+   CARD32 pad5   B32;
+   CARD32 pad6   B32;
+} xVMwareCtrlSetTopologyReply;
+#define sz_xVMwareCtrlSetTopologyReply 32
+
+struct X11VMWRECT
 {
     int16_t x;
@@ -81 +112 @@
     Display *pDisplay;
     int hRandRMajor;
-    int hVMWMajor;
+    int hVMWCtrlMajorOpCode;
     int hRandRMinor;
     int hRandREventBase;
@@ -101 +132 @@
 static const char *pcszCvt = "cvt";
 
-struct DRMCONTEXT
-{
-    RTFILE hDevice;
-};
-
 struct RANDROUTPUT
 {
@@ -121 +147 @@
 
 #ifndef OLD_JUNK
+
+bool VMwareCtrlSetTopology(Display *dpy, int hExtensionMajorOpcode,
+                            int screen, xXineramaScreenInfo extents[], int number)
+{
+   xVMwareCtrlSetTopologyReply rep;
+   xVMwareCtrlSetTopologyReq *req;
+
+   long len;
+
+   LockDisplay(dpy);
+
+   GetReq(VMwareCtrlSetTopology, req);
+   req->reqType = hExtensionMajorOpcode;
+   req->VMwareCtrlReqType = X_VMwareCtrlSetTopology;
+   req->screen = screen;
+   req->number = number;
+
+   len = ((long) number) << 1;
+   SetReqLen(req, len, len);
+   len <<= 2;
+   _XSend(dpy, (char *)extents, len);
+
+   if (!_XReply(dpy, (xReply *)&rep,
+                (SIZEOF(xVMwareCtrlSetTopologyReply) - SIZEOF(xReply)) >> 2,
+                xFalse))
+   {
+       UnlockDisplay(dpy);
+       SyncHandle();
+       return false;
+   }
+   UnlockDisplay(dpy);
+   SyncHandle();
+   return true;
+}
+
 /** This function assumes monitors are named as from Virtual1 to VirtualX. */
 static int getMonitorIdFromName(const char *sMonitorName)
@@ -270 +331 @@
 }
 
+static bool callVMWCTRL()
+{
+#ifndef OLD_JUNK
+    const int hHeight = 600;
+    const int hWidth = 800;
+
+    xXineramaScreenInfo *extents = (xXineramaScreenInfo *)malloc(x11Context.hOutputCount * sizeof(xXineramaScreenInfo));
+    if (!extents)
+        return false;
+    int hRunningOffset = 0;
+    for (int i = 0; i < x11Context.hOutputCount; ++i)
+    {
+        extents[i].x_org = hRunningOffset;
+        extents[i].y_org = 0;
+        extents[i].width = hWidth;
+        extents[i].height = hHeight;
+        hRunningOffset += hWidth;
+    }
+    return VMwareCtrlSetTopology(x11Context.pDisplay, x11Context.hVMWCtrlMajorOpCode,
+                                 DefaultScreen(x11Context.pDisplay),
+                                 extents, x11Context.hOutputCount);
+#else
+    return true;
+#endif
+}
+
 static bool init()
 {
@@ -275 +362 @@
     if (x11Context.pDisplay == NULL)
         return false;
+    callVMWCTRL();
     if (RT_FAILURE(startX11MonitorThread()))
         return false;
@@ -302 +390 @@
         return;
     if (!XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
-                         &x11Context.hVMWMajor, &dummy, &dummy))
+                         &x11Context.hVMWCtrlMajorOpCode, &dummy, &dummy))
     {
         XCloseDisplay(x11Context.pDisplay);