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

Timestamp:

Apr 4, 2014 8:08:05 PM (11 years ago)

Author:

vboxsync

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

93154

Message:

Additions/x11/vboxvideo: revert r92593: set a root window property when we do not own the active VT.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• undefined (modified) (3 diffs)
• vboxvideo.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/undefined

@@ -1 @@
-ChangeWindowProperty
-DeleteProperty
 DRI2CloseScreen
 DRI2ScreenInit
@@ -21 +19 @@
 ShadowFBInit2
 VErrorF
-WindowTable
 XNFcalloc
 XNFstrdup
@@ -100 +97 @@
 resVgaShared
 screenInfo
-serverClient
 serverGeneration
 setenv

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

@@ -101 +101 @@
 # include "xf86Crtc.h"
 # include "xf86Modes.h"
-#endif
-
-/* For setting the root window property. */
-#include <X11/Xatom.h>
-#include "property.h"
+# include <X11/Xatom.h>
+#endif
 
 #ifdef VBOX_DRI
@@ -669 +666 @@
 # define SCRNINDEXAPI(pfn) pfn
 #endif /* XF86_SCRN_INTERFACE */
-
-/** Helper to work round different ways of getting the root window in different
- * server versions. */
-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \
-    && XORG_VERSION_CURRENT >= 100900000
-# define ROOT_WINDOW(pScrn) xf86ScrnToScreen(pScrn)->root
-#else
-# define ROOT_WINDOW(pScrn) WindowTable[xf86ScrnToScreen(pScrn)->myNum]
-#endif
-
-/** Helper to work round different prototypes for DeleteProperty in different
- * server versions. */
-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \
-    && XORG_VERSION_CURRENT >= 100500000
-# define DELETE_PROPERTY(client, window, prop) \
-    DeleteProperty(client, window, prop)
-#else
-# define DELETE_PROPERTY(client, window, prop) \
-    DeleteProperty(window, prop)
-#endif
 
 static void setScreenFunctions(ScrnInfoPtr pScrn, xf86ProbeProc pfnProbe)
@@ -1204 +1181 @@
 }
 
-/** FEATURE: Set a property on the root window if the server VT is currently
- * switched out.  This should be called from the EnterVT/LeaveVT hooks.
- * TESTING: the feature works if seamless mode and dynamic resizing are
- *   disabled on the host when a VT switch to a text console is done on an old
- *   X11 guest.  When the vboxvideo DDX is running the property created should
- *   exist exactly when the X server is switched out. */
-static Bool setVTRootProperty(ScrnInfoPtr pScrn, BOOL fLeave)
-{
-    Atom propertyName = MakeAtom("XFree86_NO_VT", sizeof("XFree86_NO_VT") - 1,
-                                 TRUE);
-    int32_t cValue = 0;
-    int rc;
-
-    if (propertyName == BAD_RESOURCE)
-        return FALSE;
-    rc =   fLeave
-         ? ChangeWindowProperty(ROOT_WINDOW(pScrn), propertyName, XA_INTEGER,
-                                32, PropModeReplace, 1, &cValue, TRUE)
-         : DELETE_PROPERTY(serverClient, ROOT_WINDOW(pScrn), propertyName);
-    return rc == Success;
-}
-
 static Bool VBOXEnterVT(ScrnInfoPtr pScrn)
 {
@@ -1254 +1209 @@
         return FALSE;
 #endif
-    setVTRootProperty(pScrn, FALSE);
     return TRUE;
 }
@@ -1276 +1230 @@
 #endif
         VBOXRestoreMode(pScrn);
-    setVTRootProperty(pScrn, TRUE);
     TRACE_EXIT();
 }