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

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.

Location:

trunk/src/VBox/Additions/x11

Files:

• VBoxClient/display.cpp (modified) (2 diffs)
• vboxvideo/vboxvideo.c (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";

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1162 +1162 @@
 }
 
-#define DRIVER_ATOM_NAME "VBOXVIDEO_DRIVER"
-/* The memory storing the initial value of the XFree86_has_VT root window
- * property.  This has to remain available until server start-up, so we just
- * use a global. */
-static CARD32 InitialPropertyValue = 1;
-
-/** Initialise a property on the root window to say that our driver is running
- *  for the benefit of VBoxClient. */
-static void initialiseProperty(ScrnInfoPtr pScrn)
-{
-    Atom atom = -1;
-    CARD32 *PropertyValue = &InitialPropertyValue;
-    atom = MakeAtom(DRIVER_ATOM_NAME, sizeof(DRIVER_ATOM_NAME) - 1, TRUE);
-    if (xf86RegisterRootWindowProperty(pScrn->scrnIndex, atom, XA_INTEGER,
-                                       32, 1, PropertyValue) != Success)
-        FatalError("vboxvideo: failed to register driver root window property\n");
-}
-
 /*
  * QUOTE from the XFree86 DESIGN document:
@@ -1367 +1349 @@
                    "Unable to start the VirtualBox mouse pointer integration with the host system.\n");
 
-    initialiseProperty(pScrn);
-
     return (TRUE);
 }