Changeset 6492 in vbox

Timestamp:

Jan 24, 2008 5:22:43 PM (17 years ago)

Author:

vboxsync

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

27498

Message:

Additions (x11): limit the maximum virtual screen size to 64000x64000 as the X randr extension uses a uint16_t to report it to clients

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c (modified) (16 diffs)

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

@@ -198 +198 @@
     Bool rc = TRUE;
 
-    TRACE3("width=%d, height=%d\n", width, height);
     /* We only support horizontal resolutions which are a multiple of 8.  Round down if
        necessary. */
@@ -224 +223 @@
     }
     if (rc) {
-        TRACE3("Setting screen pixmap parameters: width=%d, height=%d, depth=%d, bpp=%d, stride=%d, VRAM=%p\n", width, height, scrn->depth, bpp, width * bpp / 8, pVBox->base);
         if (
             !pScreen->ModifyPixmapHeader(pPixmap, width, height,
@@ -240 +238 @@
         scrn->displayWidth = width;
     }
-    TRACE3("returning %s\n", rc ? "TRUE" : "FALSE");
     return rc;
 }
@@ -250 +247 @@
 static void
 vbox_crtc_dpms(xf86CrtcPtr crtc, int mode)
-{ TRACE; (void) crtc; (void) mode; }
+{ (void) crtc; (void) mode; }
 
 static Bool
 vbox_crtc_lock (xf86CrtcPtr crtc)
-{ TRACE; (void) crtc; return FALSE; }
+{ (void) crtc; return FALSE; }
 
 static Bool
@@ -263 +260 @@
     int xRes = adjusted_mode->HDisplay;
 
-    TRACE;
     (void) mode;
     /* We only support horizontal resolutions which are a multiple of 8.  Round down if
@@ -274 +270 @@
         adjusted_mode->HDisplay = xRes - (xRes % 8);
     }
-    TRACE2;
     return TRUE;
 }
@@ -280 +275 @@
 static void
 vbox_crtc_stub (xf86CrtcPtr crtc)
-{ TRACE; (void) crtc; }
+{ (void) crtc; }
 
 static void
@@ -287 +282 @@
 {
     (void) mode;
-    TRACE;
     VBOXSetMode(crtc->scrn, adjusted_mode);
     VBOXAdjustFrame(crtc->scrn->scrnIndex, x, y, 0);
-    TRACE2;
 }
 
@@ -296 +289 @@
 vbox_crtc_gamma_set (xf86CrtcPtr crtc, CARD16 *red,
                      CARD16 *green, CARD16 *blue, int size)
-{ TRACE; (void) crtc; (void) red; (void) green; (void) blue; (void) size; }
+{ (void) crtc; (void) red; (void) green; (void) blue; (void) size; }
 
 static void *
 vbox_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
-{ TRACE; (void) crtc; (void) width; (void) height; return NULL; }
+{ (void) crtc; (void) width; (void) height; return NULL; }
 
 static const xf86CrtcFuncsRec VBOXCrtcFuncs = {
@@ -327 +320 @@
 static void
 vbox_output_stub (xf86OutputPtr output)
-{ TRACE; (void) output; }
+{ (void) output; }
 
 static void
 vbox_output_dpms (xf86OutputPtr output, int mode)
-{ TRACE; (void) output; (void) mode; }
+{ (void) output; (void) mode; }
 
 static int
 vbox_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode)
 {
-    TRACE3("Modeline %s   %f  %d %d %d %d  %d %d %d %d\n",
-           mode->name, mode->Clock * 1.0 / 1000, mode->HDisplay, mode->HSyncStart,
-           mode->HSyncEnd, mode->HTotal, mode->VDisplay, mode->VSyncStart,
-           mode->VSyncEnd, mode->VTotal);
     (void) output; (void) mode;
     return MODE_OK;
@@ -347 +336 @@
 vbox_output_mode_fixup (xf86OutputPtr output, DisplayModePtr mode,
                         DisplayModePtr adjusted_mode)
-{ TRACE; (void) output; (void) mode; (void) adjusted_mode; return TRUE; }
+{ (void) output; (void) mode; (void) adjusted_mode; return TRUE; }
 
 static void
 vbox_output_mode_set (xf86OutputPtr output, DisplayModePtr mode,
                         DisplayModePtr adjusted_mode)
-{ TRACE; (void) output; (void) mode; (void) adjusted_mode; }
+{ (void) output; (void) mode; (void) adjusted_mode; }
 
 /* A virtual monitor is always connected. */
@@ -396 +385 @@
     ScrnInfoPtr pScrn = output->scrn;
 
-    TRACE;
     rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, 0, 0);
     if (RT_SUCCESS(rc) && (0 != x) && (0 != y)) {
-        TRACE3("Adding host mode %dx%d\n", x, y);
         vbox_output_add_mode(&pModes, NULL, x, y, TRUE);
         vbox_output_add_mode(&pModes, "1024x768", 1024, 768, FALSE);
@@ -409 +396 @@
         vbox_output_add_mode(&pModes, "640x480", 640, 480, FALSE);
     }
-    TRACE2;
     return pModes;
 }
@@ -418 +404 @@
 vbox_output_set_property(xf86OutputPtr output, Atom property,
                          RRPropertyValuePtr value)
-{ TRACE; (void) output, (void) property, (void) value; return FALSE; }
+{ (void) output, (void) property, (void) value; return FALSE; }
 #endif
 
@@ -732 +718 @@
 
     /* Set a sane minimum and maximum mode size */
-    xf86CrtcSetSizeRange(pScrn, 64, 64, 102400, 76800);
+    xf86CrtcSetSizeRange(pScrn, 64, 64, 64000, 64000);
 
     /* I don't know exactly what these are for (and they are only used in a couple
@@ -738 +724 @@
        an upper limit on possible resolutions.  To add to the fun, they get set
        automatically if we don't do it ourselves. */
-    pScrn->display->virtualX = 102400;
-    pScrn->display->virtualY = 76800;
+    pScrn->display->virtualX = 64000;
+    pScrn->display->virtualY = 64000;
 
     /* We are not interested in the monitor section in the configuration file. */