Changeset 83045 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 11, 2020 12:31:53 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136075

Message:

bugref:9637. Some build fix to make our GA build box happy

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• display-svga-x11.cpp (modified) (1 diff)
• seamless-x11.cpp (modified) (5 diffs)
• seamless-x11.h (modified) (4 diffs)

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

@@ -54 +54 @@
 #define VMW_MAX_HEADS 32
 
-/* VMWare X.Org driver control parts definitions. */
-
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xrandr.h>
+#include "seamless-x11.h"
 
 #ifdef RT_OS_LINUX

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -26 +26 @@
 #include <VBox/log.h>
 
+#include <X11/Xatom.h>
+#include <X11/Xmu/WinUtil.h>
+
 #include "seamless-x11.h"
 #include "VBoxClient.h"
-
-#include <X11/Xatom.h>
-#include <X11/Xmu/WinUtil.h>
 
 #include <limits.h>
@@ -90 +90 @@
         return VERR_ACCESS_DENIED;
     }
+
+    mRandRMask = 0;
+    mRandRAvailable = false;
+    if (XRRQueryExtension(mDisplay, &mRandREventBase, &mRandRErrorBase))
+    {
+        int iRandRMajor = 0;
+        int iRandRMinor = 0;
+        if (XRRQueryVersion(mDisplay, &iRandRMajor, &iRandRMinor))
+        {
+            mRandRAvailable = true;
+            mRandRMask = RRScreenChangeNotifyMask;
+            if (iRandRMinor >= 2)
+                mRandRMask |=  RRCrtcChangeNotifyMask |
+                    RROutputChangeNotifyMask |
+                    RROutputPropertyNotifyMask;
+        }
+    }
     mHostCallback = pHostCallback;
     mEnabled = false;
@@ -145 +162 @@
     LogRelFlowFuncEnter();
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask);
+}
+
+void SeamlessX11::monitorRandREvents(XEvent *pEvent)
+{
+    if (!pEvent)
+        return;
+    int eventTypeOffset = pEvent->type - mRandREventBase;
+    switch (eventTypeOffset)
+    {
+        case RRScreenChangeNotify:
+            VBClLogError("RRScreenChangeNotify\n");
+            break;
+        case RRNotify:
+            VBClLogError("RRNotify\n");
+            break;
+        default:
+            VBClLogError("Unknown RR event\n");
+            break;
+    }
 }
 
@@ -305 +341 @@
 
     LogRelFlowFuncEnter();
+
+    /* We execute this even when seamless is disabled, as it also waits for
+     * enable and disable notification. */
+    XNextEvent(mDisplay, &event);
+    monitorRandREvents(&event);
     /* Start by sending information about the current window setup to the host.  We do this
        here because we want to send all such information from a single thread. */
@@ -313 +354 @@
     }
     mChanged = false;
-    /* We execute this even when seamless is disabled, as it also waits for
-     * enable and disable notification. */
-    XNextEvent(mDisplay, &event);
     if (!mEnabled)
         return;

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

@@ -31 +31 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xlibint.h>
 #include <X11/extensions/shape.h>
+#include <X11/extensions/Xrandr.h>
 
 #define WM_TYPE_PROP "_NET_WM_WINDOW_TYPE"
@@ -38 +40 @@
 /* This is defined wrong in my X11 header files! */
 #define VBoxShapeNotify 64
+
+/** Following are stolen from randr.h Define XrandR stuff of they are not there (some ancient build box maybe). */
+
+/* Event selection bits */
+#ifndef RRScreenChangeNotifyMask
+#define RRScreenChangeNotifyMask  (1L << 0)
+#endif
+/* V1.2 additions */
+#ifndef RRCrtcChangeNotifyMask
+#define RRCrtcChangeNotifyMask      (1L << 1)
+#endif
+#ifndef RROutputChangeNotifyMask
+#define RROutputChangeNotifyMask    (1L << 2)
+#endif
+
+#ifndef RROutputPropertyNotifyMask
+#define RROutputPropertyNotifyMask  (1L << 3)
+#endif
+
+/* V1.4 additions */
+#ifndef RRProviderChangeNotifyMask
+#define RRProviderChangeNotifyMask   (1L << 4)
+#endif
+
+#ifndef RRProviderPropertyNotifyMask
+#define RRProviderPropertyNotifyMask (1L << 5)
+#endif
+
+#ifndef RRResourceChangeNotifyMask
+#define RRResourceChangeNotifyMask   (1L << 6)
+#endif
+
+#ifndef RRScreenChangeNotify
+/* Event codes */
+#define RRScreenChangeNotify    0
+#endif
+#ifndef RRNotify
+/* V1.2 additions */
+#define RRNotify 1
+#endif
 
 /**
@@ -190 +232 @@
     /** Have there been changes since the last time we sent a notification? */
     bool mChanged;
+    /** Event mask we use to select randr related events. */
+    int  mRandRMask;
+    int  mRandREventBase;
+    int  mRandRErrorBase;
+    bool mRandRAvailable;
 
     // Private methods
@@ -204 +251 @@
     void monitorClientList(void);
     void unmonitorClientList(void);
+    void monitorRandREvents(XEvent *pEvent);
     void rebuildWindowTree(void);
     void addClients(const Window hRoot);