Changeset 53777 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Jan 12, 2015 8:28:13 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: more refactoring.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• getmode.c (modified) (3 diffs)
• helpers.c (modified) (2 diffs)
• vboxvideo.h (modified) (1 diff)

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

@@ -29 +29 @@
 #include "windowstr.h"
 #include <X11/extensions/randrproto.h>
-#include <X11/Xatom.h>
 
 #ifdef XORG_7X
@@ -258 +257 @@
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    Atom atom = MakeAtom(SIZE_HINTS_PROPERTY, sizeof(SIZE_HINTS_PROPERTY) - 1,
-                         FALSE);
-    PropertyPtr prop = NULL;
+    size_t cModes;
+    int32_t *paModes;
     unsigned i;
 
@@ -282 +280 @@
     }
 #endif
-    /* We can get called early, before the root window is created. */
-    if (!ROOT_WINDOW(pScrn))
+    if (vbvxGetIntegerPropery(pScrn, SIZE_HINTS_PROPERTY, &cModes, &paModes) != VINF_SUCCESS)
         return;
-    if (atom != BAD_RESOURCE)
-    {
-        for (prop = wUserProps(ROOT_WINDOW(pScrn));
-             prop != NULL && prop->propertyName != atom; prop = prop->next);
-    }
-    if (prop && prop->type == XA_INTEGER && prop->format == 32)
-        for (i = 0; i < prop->size && i < pVBox->cScreens; ++i)
+    for (i = 0; i < cModes && i < pVBox->cScreens; ++i)
+    {
+        if (paModes[i] != 0)
         {
-            if (((int32_t *)prop->data)[i] != 0)
-            {
-                pVBox->pScreens[i].aPreferredSize.cx =
-                    ((int32_t *)prop->data)[i] >> 16;
-                pVBox->pScreens[i].aPreferredSize.cy =
-                    ((int32_t *)prop->data)[i] & 0x8fff;
-            }
+            pVBox->pScreens[i].aPreferredSize.cx =
+                paModes[i] >> 16;
+            pVBox->pScreens[i].aPreferredSize.cy =
+                paModes[i] & 0x8fff;
         }
+    }
 }
 

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

@@ -23 +23 @@
 #include "vboxvideo.h"
 #include <os.h>
+#include <propertyst.h>
+#include <windowstr.h>
+#include <X11/Xatom.h>
+#ifdef XORG_7X
+# include <string.h>
+#endif
 
 void vbvxMsg(const char *pszFormat, ...)
@@ -47 +53 @@
     return ((VBOXPtr)pScrn->driverPrivate);
 }
+
+/* TESTING: if this is broken, dynamic resizing will not work on old X servers (1.2 and older). */
+int vbvxGetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t *pcData, int32_t **ppaData)
+{
+    Atom atom;
+    PropertyPtr prop;
+
+    /* We can get called early, before the root window is created. */
+    if (!ROOT_WINDOW(pScrn))
+        return VERR_NOT_FOUND;
+    atom = MakeAtom(pszName, strlen(pszName), FALSE);
+    if (atom == BAD_RESOURCE)
+        return VERR_NOT_FOUND;
+    for (prop = wUserProps(ROOT_WINDOW(pScrn));
+         prop != NULL && prop->propertyName != atom; prop = prop->next);
+    if (prop == NULL)
+        return VERR_NOT_FOUND;
+    if (prop->type != XA_INTEGER || prop->format != 32)
+        return VERR_NOT_FOUND;
+    *pcData = prop->size;
+    *ppaData = (int32_t *)prop->data;
+    return VINF_SUCCESS;
+}

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

@@ -239 +239 @@
 extern VBOXPtr vbvxGetRec(ScrnInfoPtr pScrn);
 #define VBOXGetRec vbvxGetRec  /* Temporary */
+extern int vbvxGetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t *pcData, int32_t **ppaData);
 
 /* setmode.c */