Changeset 59943 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Mar 7, 2016 3:46:54 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: revert r105407: do not start the display part of VBoxClient at all when not using the user space X.Org vboxvideo driver: all guest systems capable of running the kernel driver should already have equivalent functionality.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (2 diffs)

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

@@ -132 +132 @@
     char szCommand[256];
     int status;
-    Atom atomDummy;
-    int iDummy;
-    unsigned long ulDummy;
-    unsigned char *pcDummy;
 
     /* Initialise the guest library. */
@@ -143 +139 @@
     pState->pDisplay = XOpenDisplay(NULL);
     if (!pState->pDisplay)
-        exit(0);
-    XGetWindowProperty(pState->pDisplay, DefaultRootWindow(pState->pDisplay),
-                       XInternAtom(pState->pDisplay, "VBOXVIDEO_DRIVER", 0), 0, 1, False,
-                       AnyPropertyType, &atomDummy, &iDummy, &ulDummy, &ulDummy, &pcDummy);
-    if (pcDummy == NULL)
-        exit(0);
-    XFree(pcDummy);
+        return VERR_NOT_FOUND;
     pState->fHaveRandR12 = false;
     pState->pcszXrandr = "xrandr";