Changeset 9826 in vbox

Timestamp:

Jun 19, 2008 4:06:49 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: make the Xorg 1.3+ Additions handle modes specified by the user in xorg.conf

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxvideo_13.c (modified) (5 diffs)
• vboxvideo_15.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c

@@ -352 +352 @@
     int rc = MODE_OK;
     TRACE3("HDisplay=%d, VDisplay=%d\n", mode->HDisplay, mode->VDisplay);
-    if (   vbox_device_available(VBOXGetRec(pScrn))
+    /* We always like modes specified by the user in the configuration
+     * file, as doing otherwise is likely to annoy people. */
+    if (   !(mode->type & M_T_USERDEF)
+        && vbox_device_available(VBOXGetRec(pScrn))
         && !vboxHostLikesVideoMode(pScrn, mode->HDisplay,
                                    mode->VDisplay, pScrn->bitsPerPixel)
@@ -381 +384 @@
 static void
 vbox_output_add_mode (DisplayModePtr *pModes, const char *pszName, int x, int y,
-                      Bool isPreferred)
+                      Bool isPreferred, Bool isUserDef)
 {
     TRACE3("pszName=%s, x=%d, y=%d\n", pszName, x, y);
@@ -387 +390 @@
 
     pMode->status        = MODE_OK;
-    pMode->type          = isPreferred ? M_T_PREFERRED : M_T_BUILTIN;
+    /* We don't ask the host whether it likes user defined modes,
+     * as we assume that the user really wanted that mode. */
+    pMode->type          = isUserDef ? M_T_USERDEF : M_T_BUILTIN;
+    if (isPreferred)
+        pMode->type     |= M_T_PREFERRED;
     /* VBox only supports screen widths which are a multiple of 8 */
     pMode->HDisplay      = (x + 7) & ~7;
@@ -411 +418 @@
     uint32_t x, y, bpp, display;
     bool rc;
+    unsigned i;
     DisplayModePtr pModes = NULL;
     ScrnInfoPtr pScrn = output->scrn;
@@ -433 +441 @@
             /* We prefer a slightly smaller size to a slightly larger one */
             x -= (x % 8);
-            vbox_output_add_mode(&pModes, NULL, x, y, TRUE);
+            vbox_output_add_mode(&pModes, NULL, x, y, TRUE, FALSE);
         }
     }
+    /* Also report any modes the user may have requested in the xorg.conf
+     * configuration file. */
+    for (i = 0; pScrn->display->modes[i] != NULL; i++)
+        if (2 == sscanf(pScrn->display->modes[i], "%dx%d", &x, &y))
+            vbox_output_add_mode(&pModes, pScrn->display->modes[i], x, y,
+                                 FALSE, TRUE);
+    
     TRACE2;
     return pModes;

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c

@@ -385 +385 @@
     int rc = MODE_OK;
     TRACE3("HDisplay=%d, VDisplay=%d\n", mode->HDisplay, mode->VDisplay);
-    if (   vbox_device_available(VBOXGetRec(pScrn))
+    /* We always like modes specified by the user in the configuration
+     * file, as doing otherwise is likely to annoy people. */
+    if (   !(mode->type & M_T_USERDEF)
+        && vbox_device_available(VBOXGetRec(pScrn))
         && !vboxHostLikesVideoMode(pScrn, mode->HDisplay, mode->VDisplay,
                                    pScrn->bitsPerPixel)
@@ -414 +417 @@
 static void
 vbox_output_add_mode (DisplayModePtr *pModes, const char *pszName, int x, int y,
-                      Bool isPreferred)
+                      Bool isPreferred, Bool isUserDef)
 {
     TRACE3("pszName=%s, x=%d, y=%d\n", pszName, x, y);
@@ -420 +423 @@
 
     pMode->status        = MODE_OK;
-    pMode->type          = isPreferred ? M_T_PREFERRED : M_T_BUILTIN;
+    /* We don't ask the host whether it likes user defined modes,
+     * as we assume that the user really wanted that mode. */
+    pMode->type          = isUserDef ? M_T_USERDEF : M_T_BUILTIN;
+    if (isPreferred)
+        pMode->type     |= M_T_PREFERRED;
     /* VBox only supports screen widths which are a multiple of 8 */
     pMode->HDisplay      = (x + 7) & ~7;
@@ -444 +451 @@
     uint32_t x, y, bpp, display;
     bool rc;
+    unsigned i;
     DisplayModePtr pModes = NULL;
     ScrnInfoPtr pScrn = output->scrn;
@@ -460 +468 @@
             /* We prefer a slightly smaller size to a slightly larger one */
             x -= (x % 8);
-            vbox_output_add_mode(&pModes, NULL, x, y, TRUE);
+            vbox_output_add_mode(&pModes, NULL, x, y, TRUE, FALSE);
         }
     }
+    /* Also report any modes the user may have requested in the xorg.conf
+     * configuration file. */
+    for (i = 0; pScrn->display->modes[i] != NULL; i++)
+        if (2 == sscanf(pScrn->display->modes[i], "%dx%d", &x, &y))
+            vbox_output_add_mode(&pModes, pScrn->display->modes[i], x, y,
+                                 FALSE, TRUE);
     TRACE2;
     return pModes;