Changeset 55236 in vbox for trunk/src/VBox

Timestamp:

Apr 14, 2015 10:02:04 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: use constants for the maximum and minimum screen and frame-buffer sizes.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

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

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

@@ -863 +863 @@
      * took the first valid values set to these two as maxima over the
      * server lifetime. */
-    pScrn->virtualX = 32000;
-    pScrn->virtualY = 32000;
+    pScrn->virtualX = VBOX_VIDEO_MAX_VIRTUAL;
+    pScrn->virtualY = VBOX_VIDEO_MAX_VIRTUAL;
 #else
     /* We don't validate with xf86ValidateModes and xf86PruneModes as we
@@ -1089 +1089 @@
     /* Set a sane minimum and maximum mode size to match what the hardware
      * supports. */
-    xf86CrtcSetSizeRange(pScrn, 64, 64, 16384, 16384);
+    xf86CrtcSetSizeRange(pScrn, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL, VBOX_VIDEO_MAX_VIRTUAL);
 
     /* Now create our initial CRTC/output configuration. */

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

@@ -129 +129 @@
 #define VBOX_DRI_DRIVER_NAME  "vboxvideo"  /* For starters. */
 #define VBOX_MAX_DRAWABLES    256          /* At random. */
+
+#define VBOX_VIDEO_MIN_SIZE    64
+#define VBOX_VIDEO_MAX_VIRTUAL (INT16_MAX - 1)
 
 #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate))