Changeset 4244 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Aug 20, 2007 3:07:41 PM (18 years ago)

Author:

vboxsync

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

23744

Message:

add 800x600 and 640x480 as default screen resultions to Linux/X11 guests as well

Location:

trunk/src/VBox/Additions/linux/xgraphics

Files:

• vboxvideo_13.c (modified) (2 diffs)
• vboxvideo_68.c (modified) (2 diffs)
• vboxvideo_70.c (modified) (2 diffs)

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

@@ -494 +494 @@
     {
         /* The user specified no modes at all - specify 1024x768 as a default. */
-        pScrn->display->modes    = xnfalloc(2 * sizeof(char*));
+        pScrn->display->modes    = xnfalloc(4 * sizeof(char*));
         pScrn->display->modes[0] = "1024x768";
-        pScrn->display->modes[1] = NULL;
+        pScrn->display->modes[1] = "800x600";
+        pScrn->display->modes[2] = "640x480";
+        pScrn->display->modes[3] = NULL;
     }
     else
@@ -502 +504 @@
         /* Add 1024x768 to the end of the mode list in case the others are all invalid. */
         for (i = 0; pScrn->display->modes[i] != NULL; i++);
-        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 2)
+        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 4)
                                    * sizeof(char *));
         pScrn->display->modes[i  ] = "1024x768";
-        pScrn->display->modes[i+1] = NULL;
+        pScrn->display->modes[i+1] = "800x600";
+        pScrn->display->modes[i+2] = "640x480";
+        pScrn->display->modes[i+3] = NULL;
     }
 

trunk/src/VBox/Additions/linux/xgraphics/vboxvideo_68.c

@@ -477 +477 @@
     {
         /* The user specified no modes at all - specify 1024x768 as a default. */
-        pScrn->display->modes    = xnfalloc(2 * sizeof(char*));
+        pScrn->display->modes    = xnfalloc(4 * sizeof(char*));
         pScrn->display->modes[0] = "1024x768";
-        pScrn->display->modes[1] = NULL;
+        pScrn->display->modes[1] = "800x600";
+        pScrn->display->modes[2] = "640x480";
+        pScrn->display->modes[3] = NULL;
     }
     else
@@ -485 +487 @@
         /* Add 1024x768 to the end of the mode list in case the others are all invalid. */
         for (i = 0; pScrn->display->modes[i] != NULL; i++);
-        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 2)
+        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 4)
                                    * sizeof(char *));
         pScrn->display->modes[i  ] = "1024x768";
-        pScrn->display->modes[i+1] = NULL;
+        pScrn->display->modes[i+1] = "800x600";
+        pScrn->display->modes[i+2] = "640x480";
+        pScrn->display->modes[i+3] = NULL;
     }
 

trunk/src/VBox/Additions/linux/xgraphics/vboxvideo_70.c

@@ -492 +492 @@
     {
         /* The user specified no modes at all - specify 1024x768 as a default. */
-        pScrn->display->modes    = xnfalloc(2 * sizeof(char*));
+        pScrn->display->modes    = xnfalloc(4 * sizeof(char*));
         pScrn->display->modes[0] = "1024x768";
-        pScrn->display->modes[1] = NULL;
+        pScrn->display->modes[1] = "800x600";
+        pScrn->display->modes[2] = "640x480";
+        pScrn->display->modes[3] = NULL;
     }
     else
@@ -500 +502 @@
         /* Add 1024x768 to the end of the mode list in case the others are all invalid. */
         for (i = 0; pScrn->display->modes[i] != NULL; i++);
-        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 2)
+        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 4)
                                    * sizeof(char *));
         pScrn->display->modes[i  ] = "1024x768";
-        pScrn->display->modes[i+1] = NULL;
+        pScrn->display->modes[i+1] = "800x600";
+        pScrn->display->modes[i+2] = "640x480";
+        pScrn->display->modes[i+3] = NULL;
     }