Changeset 83140 in vbox for trunk

Timestamp:

Feb 21, 2020 10:55:34 PM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. build fix. ifdef'ing some code for now until we decide what to do with build machines with old libXranr library.

File:

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

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

@@ -66 +66 @@
 static bool g_fMonitorThreadShutdown = false;
 
+#define OLD_JUNK
+
 struct X11VMWRECT /* xXineramaScreenInfo in Xlib headers. */
 {
@@ -117 +119 @@
 static int determineOutputCount();
 
+
+#ifndef OLD_JUNK
 /** This function assumes monitors are named as from Virtual1 to VirtualX. */
 static int getMonitorIdFromName(const char *sMonitorName)
@@ -140 +144 @@
 static void queryMonitorPositions()
 {
-    printf("===========================================================================================================================================");
     static const int iSentinelPosition = -1;
     if (mpMonitorPositions)
@@ -147 +150 @@
         mpMonitorPositions = NULL;
     }
-    // if (!mHostMonitorPositionSendCallback)
-    // {
-    //     VBClLogFatalError("No monitor positions update callback\n");
-    //     return;
-    // }
 
     XRRScreenResources *pScreenResources = XRRGetScreenResources (x11Context.pDisplay, DefaultRootWindow(x11Context.pDisplay));
@@ -188 +186 @@
     XRRFreeMonitors(pMonitorInfo);
 }
+#endif
 
 static void monitorRandREvents()
 {
+#ifndef OLD_JUNK
     XEvent event;
     XNextEvent(x11Context.pDisplay, &event);
@@ -207 +207 @@
             break;
     }
+#endif
 }
 
@@ -307 +308 @@
         x11Context.pDisplay = NULL;
     }
+    x11Context.hEventMask = 0;
+#ifndef OLD_JUNK
     x11Context.hEventMask = RRScreenChangeNotifyMask;
     if (x11Context.hRandRMinor >= 2)
@@ -312 +315 @@
                                | RROutputChangeNotifyMask
                                | RROutputPropertyNotifyMask;
+#endif
     x11Context.rootWindow = DefaultRootWindow(x11Context.pDisplay);
     x11Context.hOutputCount = determineOutputCount();
@@ -571 +575 @@
         VBClLogFatalError("Failed to register resizing support, rc=%Rrc\n", rc);
 
-    int eventMask = RRScreenChangeNotifyMask;
-    if (x11Context.hRandRMinor >= 2)
-        eventMask |= RRCrtcChangeNotifyMask
-                   | RROutputChangeNotifyMask
-                   | RROutputPropertyNotifyMask;
-    if (x11Context.hRandRMinor >= 4)
-        eventMask |= RRProviderChangeNotifyMask
-                   | RRProviderPropertyNotifyMask
-                   | RRResourceChangeNotifyMask;
     for (;;)
     {