儲存庫 vbox 的更動 34911

時間撮記:

2010-12-9 下午05:14:56 (14 年 以前)

作者:

vboxsync

訊息:

Additions/x11/vboxvideo: fix an off-by-one and let the driver receive mode hints as output properties

位置:

trunk/src/VBox/Additions/x11/vboxvideo

檔案:

• undefined_13 (修改) (2 筆差異)
• vboxvideo.c (修改) (7 筆差異)
• vboxvideo.h (修改) (1 筆差異)

trunk/src/VBox/Additions/x11/vboxvideo/undefined_13

@@ -12 +12 @@
 GlxSetVisualConfigs
 LoaderRefSymLists
+MakeAtom
 PixmapWidthPaddingInfo
+RRConfigureOutputProperty
 ShadowFBInit2
 VBEExtendedInit
@@ -120 +122 @@
 strcmp
 strcpy
+strncpy
 strlen
 strncmp

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

@@ -81 +81 @@
 # include "xf86Crtc.h"
 # include "xf86Modes.h"
+# include <X11/Xatom.h>
 #endif
 
@@ -427 +428 @@
 vbox_output_get_modes (xf86OutputPtr output)
 {
-    bool rc;
     unsigned i;
     DisplayModePtr pModes = NULL;
@@ -436 +436 @@
     if (vbox_device_available(pVBox))
     {
+        Bool rc = FALSE;
         uint32_t x, y, bpp, iScreen;
-        rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &iScreen);
-        /* @todo - check the display number once we support multiple displays. */
+        iScreen = (uintptr_t)output->driver_private;
+        if (   pVBox->aPreferredSize[iScreen].cx
+            && pVBox->aPreferredSize[iScreen].cy)
+        {
+            x = pVBox->aPreferredSize[iScreen].cx;
+            y = pVBox->aPreferredSize[iScreen].cy;
+            rc = TRUE;
+        }
+        else
+            rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &iScreen);
         /* If we don't find a display request, see if we have a saved hint
          * from a previous session. */
@@ -460 +469 @@
 
 #ifdef RANDR_12_INTERFACE
-/* We don't yet have mutable properties, whatever they are. */
+static Atom
+vboxAtomVBoxMode(void)
+{
+    static Atom rc = 0;
+    if (!rc)
+        rc = MakeAtom("VBOX_MODE", sizeof("VBOX_MODE") - 1, TRUE);
+    return rc;
+}
+
+/** We use this for receiving information from clients for the purpose of
+ * dynamic resizing, and later possibly other things too.
+ */
 static Bool
 vbox_output_set_property(xf86OutputPtr output, Atom property,
                          RRPropertyValuePtr value)
-{ (void) output; (void) property; (void) value; return FALSE; }
+{
+    ScrnInfoPtr pScrn = output->scrn;
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    TRACE_LOG("property=%d, value->type=%d, value->format=%d, value->size=%ld\n",
+              (int)property, (int)value->type, value->format, value->size);
+    if (property == vboxAtomVBoxMode())
+    {
+        uint32_t cDisplay = (uintptr_t)output->driver_private;
+        char sz[256] = { 0 };
+        int w, h;
+
+        if (   value->type != XA_STRING
+            || (unsigned) value->size > (sizeof(sz) - 1))
+            return FALSE;
+        strncpy(sz, value->data, value->size);
+        if (sscanf(sz, "%dx%d", &w, &h) != 2)
+            return FALSE;
+        pVBox->aPreferredSize[cDisplay].cx = w;
+        pVBox->aPreferredSize[cDisplay].cy = h;
+        return TRUE;
+    }
+    return FALSE;
+}
 #endif
 
@@ -1034 +1076 @@
             pVBox->paOutputs[i]->possible_crtcs = 1 << i;
             pVBox->paOutputs[i]->possible_clones = 0;
+            pVBox->paOutputs[i]->driver_private = (void *)(uintptr_t)i;
             TRACE_LOG("Created crtc (%p) and output %s (%p)\n",
                       (void *)pVBox->paCrtcs[i], szOutput,
@@ -1054 +1097 @@
     if (!xf86CrtcScreenInit(pScreen)) {
         return FALSE;
+    }
+
+    /* Create our VBOX_MODE display properties. */
+    {
+        uint32_t i;
+
+        for (i = 0; i < pVBox->cScreens; ++i)
+        {
+            char csz[] = "0x0";
+            RRChangeOutputProperty(pVBox->paOutputs[i]->randr_output,
+                                   vboxAtomVBoxMode(), XA_STRING, 8,
+                                   PropModeReplace, sizeof(csz), csz, TRUE,
+                                   FALSE);
+            
+        }
     }
 
@@ -1234 +1292 @@
     unsigned i;
     for (i = 0; i < pVBox->cScreens; ++i)
-        if (     pVBox->aScreenLocation[i].x + pVBox->aScreenLocation[i].cx
-               < pScrn->virtualX
-            &&   pVBox->aScreenLocation[i].y + pVBox->aScreenLocation[i].cy
-               < pScrn->virtualY)
+        if (      pVBox->aScreenLocation[i].x + pVBox->aScreenLocation[i].cx
+               <= pScrn->virtualX
+            &&    pVBox->aScreenLocation[i].y + pVBox->aScreenLocation[i].cy
+               <= pScrn->virtualY)
             return i;
     return 0;  /* This will probably look bad if it can happen. */

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

@@ -223 +223 @@
     /** Context information about the VBVA buffers for each screen */
     struct VBVABUFFERCONTEXT aVbvaCtx[VBOX_VIDEO_MAX_SCREENS];
+    /** The current preferred resolution for the screen */
+    RTRECTSIZE aPreferredSize[VBOX_VIDEO_MAX_SCREENS];
     /** HGSMI guest heap context */
     HGSMIGUESTCOMMANDCONTEXT guestCtx;
-    Bool fAnyX;   /* Unrestricted horizontal resolution flag. */
+    /** Unrestricted horizontal resolution flag. */
+    Bool fAnyX;
 #ifdef VBOX_DRI
     Bool useDRI;