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

Timestamp:

Apr 7, 2014 7:15:37 AM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: set a root window property to say whether we own the active VT. Adjusted to match what was accepted in upstream X.Org.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

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

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

@@ +1 @@
+ChangeWindowProperty
 DRI2CloseScreen
 DRI2ScreenInit
@@ -19 +20 @@
 ShadowFBInit2
 VErrorF
+WindowTable
 XNFcalloc
 XNFstrdup
@@ -166 +168 @@
 xf86PrintDepthBpp
 xf86PrintModes
+xf86RegisterRootWindowProperty
 xf86SaveScreen
 xf86ScreenToScrn

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

@@ -66 +66 @@
 #endif
 
+/* This was accepted upstream in X.Org Server 1.16 which bumped the video
+ * driver ABI to 17. */
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 17
+# define SET_HAVE_VT_PROPERTY
+#endif
+
 #ifndef PCIACCESS
 /* Drivers for PCI hardware need this */
@@ -101 +107 @@
 # include "xf86Crtc.h"
 # include "xf86Modes.h"
-# include <X11/Xatom.h>
-#endif
+#endif
+
+/* For setting the root window property. */
+#include <X11/Xatom.h>
+#include "property.h"
 
 #ifdef VBOX_DRI
@@ -979 +988 @@
 }
 
+#ifdef SET_HAVE_VT_PROPERTY
+# define HAS_VT_ATOM_NAME "XFree86_has_VT"
+/* 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 HasVTValue = 1;
+
+/** Initialise a flag property on the root window to say whether the server VT
+ *  is currently the active one as some clients need to know this. */
+static void initialiseHasVTProperty(ScrnInfoPtr pScrn)
+{
+    Atom HasVTAtom = -1;
+    CARD32 *HasVT = &HasVTValue;
+    HasVTAtom = MakeAtom(HAS_VT_ATOM_NAME, sizeof(HAS_VT_ATOM_NAME) - 1, TRUE);
+    if (!xf86RegisterRootWindowProperty(pScrn->scrnIndex, HasVTAtom, XA_INTEGER,
+                                        32, 1, HasVT))
+        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+                   "Failed to register VT property\n");
+}
+
+/** 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
+
+/** Update a flag property on the root window to say whether the server VT
+ *  is currently the active one as some clients need to know this. */
+static void updateHasVTProperty(ScrnInfoPtr pScrn, Bool hasVT)
+{
+    Atom property_name;
+    int32_t value = hasVT ? 1 : 0;
+    int i;
+
+    property_name = MakeAtom(HAS_VT_ATOM_NAME, sizeof(HAS_VT_ATOM_NAME) - 1,
+                             FALSE);
+    if (property_name == BAD_RESOURCE)
+        FatalError("Failed to retrieve \"HAS_VT\" atom\n");
+    ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32,
+                         PropModeReplace, 1, &value, TRUE);
+}
+#endif /* SET_HAVE_VT_PROPERTY */
+
 /*
  * QUOTE from the XFree86 DESIGN document:
@@ -1178 +1233 @@
         pVBox->useDRI = VBOXDRIFinishScreenInit(pScreen);
 #endif
+
+#ifdef SET_HAVE_VT_PROPERTY
+    initialiseHasVTProperty(pScrn);
+#endif
+
     return (TRUE);
 }
@@ -1209 +1269 @@
         return FALSE;
 #endif
+#ifdef SET_HAVE_VT_PROPERTY
+    updateHasVTProperty(pScrn, TRUE);
+#endif
     return TRUE;
 }
@@ -1230 +1293 @@
 #endif
         VBOXRestoreMode(pScrn);
+#ifdef SET_HAVE_VT_PROPERTY
+    updateHasVTProperty(pScrn, FALSE);
+#endif
     TRACE_EXIT();
 }