]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - menu.c
glx, sdl, wgl: autodetect all supported video modes, override the Quake menu's list...
[xonotic/darkplaces.git] / menu.c
diff --git a/menu.c b/menu.c
index 7417844b5d67a72792e3837e14c9fd45db3c7917..661ad7b9ac6d21f3f43fc0045be521761e77f332 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2729,8 +2729,7 @@ static void M_Reset_Draw (void)
 //=============================================================================
 /* VIDEO MENU */
 
-// note: if modes are added to the beginning of this list, update VID_DEFAULT
-video_resolution_t video_resolutions[] =
+static video_resolution_t video_resolutions_hardcoded[] =
 {
 {"Standard 4x3"              ,  320, 240, 320, 240, 1     },
 {"Standard 4x3"              ,  400, 300, 400, 300, 1     },
@@ -2791,14 +2790,15 @@ video_resolution_t video_resolutions[] =
 {NULL, 0, 0, 0, 0, 0}
 };
 // this is the number of the default mode (640x480) in the list above
-#define VID_DEFAULT 3
-#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
 
 #define VIDEO_ITEMS 11
 static int video_cursor = 0;
 static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
 static int video_resolution;
 
+video_resolution_t *video_resolutions;
+int video_resolutions_count;
+
 void M_Menu_Video_f (void)
 {
        int i;
@@ -2809,7 +2809,7 @@ void M_Menu_Video_f (void)
 
        // Look for the closest match to the current resolution
        video_resolution = 0;
-       for (i = 1;i < VID_RES_COUNT;i++)
+       for (i = 1;i < video_resolutions_count;i++)
        {
                // if the new mode would be a worse match in width, skip it
                if (fabs(video_resolutions[i].width - vid.width) > fabs(video_resolutions[video_resolution].width - vid.width))
@@ -2927,13 +2927,13 @@ static void M_Menu_Video_AdjustSliders (int dir)
        {
                // Resolution
                int r;
-               for(r = 0;r < VID_RES_COUNT;r++)
+               for(r = 0;r < video_resolutions_count;r++)
                {
                        video_resolution += dir;
-                       if (video_resolution >= VID_RES_COUNT)
+                       if (video_resolution >= video_resolutions_count)
                                video_resolution = 0;
                        if (video_resolution < 0)
-                               video_resolution = VID_RES_COUNT - 1;
+                               video_resolution = video_resolutions_count - 1;
                        if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
                                break;
                }
@@ -4672,6 +4672,121 @@ static void M_Shutdown(void);
 
 void M_Init (void)
 {
+       vid_mode_t res[1024];
+       size_t res_count, i;
+
+       res_count = VID_ListModes(res, sizeof(res) / sizeof(*res));
+       res_count = VID_SortModes(res, res_count, false, false, true);
+       if(res_count)
+       {
+               video_resolutions_count = res_count;
+               video_resolutions = (video_resolution_t *) Mem_Alloc(cls.permanentmempool, sizeof(*video_resolutions) * (video_resolutions_count + 1));
+               memset(&video_resolutions[video_resolutions_count], 0, sizeof(video_resolutions[video_resolutions_count]));
+               for(i = 0; i < res_count; ++i)
+               {
+                       int n, d, t;
+                       video_resolutions[i].type = "Detected mode"; // FIXME make this more dynamic
+                       video_resolutions[i].width = res[i].width;
+                       video_resolutions[i].height = res[i].height;
+                       video_resolutions[i].pixelheight = res[i].pixelheight_num / (double) res[i].pixelheight_denom;
+                       n = res[i].pixelheight_denom * video_resolutions[i].width;
+                       d = res[i].pixelheight_num * video_resolutions[i].height;
+                       while(d)
+                       {
+                               t = n;
+                               n = d;
+                               d = t % d;
+                       }
+                       d = (res[i].pixelheight_num * video_resolutions[i].height) / n;
+                       n = (res[i].pixelheight_denom * video_resolutions[i].width) / n;
+                       switch(n * 0x10000 | d)
+                       {
+                               case 0x00040003:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 480;
+                                       video_resolutions[i].type = "Standard 4x3";
+                                       break;
+                               case 0x00050004:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 512;
+                                       if(res[i].pixelheight_denom == res[i].pixelheight_num)
+                                               video_resolutions[i].type = "Square Pixel (LCD) 5x4";
+                                       else
+                                               video_resolutions[i].type = "Short Pixel (CRT) 5x4";
+                                       break;
+                               case 0x00080005:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 400;
+                                       if(res[i].pixelheight_denom == res[i].pixelheight_num)
+                                               video_resolutions[i].type = "Widescreen 8x5";
+                                       else
+                                               video_resolutions[i].type = "Tall Pixel (CRT) 8x5";
+
+                                       break;
+                               case 0x00050003:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 384;
+                                       video_resolutions[i].type = "Widescreen 5x3";
+                                       break;
+                               case 0x000D0009:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 400;
+                                       video_resolutions[i].type = "Widescreen 14x9";
+                                       break;
+                               case 0x00100009:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 480;
+                                       video_resolutions[i].type = "Widescreen 16x9";
+                                       break;
+                               case 0x00030002:
+                                       video_resolutions[i].conwidth = 720;
+                                       video_resolutions[i].conheight = 480;
+                                       video_resolutions[i].type = "NTSC 3x2";
+                                       break;
+                               case 0x000D000B:
+                                       video_resolutions[i].conwidth = 720;
+                                       video_resolutions[i].conheight = 566;
+                                       video_resolutions[i].type = "PAL 14x11";
+                                       break;
+                               case 0x00080007:
+                                       if(video_resolutions[i].width >= 512)
+                                       {
+                                               video_resolutions[i].conwidth = 512;
+                                               video_resolutions[i].conheight = 448;
+                                               video_resolutions[i].type = "SNES 8x7";
+                                       }
+                                       else
+                                       {
+                                               video_resolutions[i].conwidth = 256;
+                                               video_resolutions[i].conheight = 224;
+                                               video_resolutions[i].type = "NES 8x7";
+                                       }
+                                       break;
+                               default:
+                                       video_resolutions[i].conwidth = 640;
+                                       video_resolutions[i].conheight = 640 * d / n;
+                                       video_resolutions[i].type = "Detected mode";
+                                       break;
+                       }
+                       if(video_resolutions[i].conwidth > video_resolutions[i].width || video_resolutions[i].conheight > video_resolutions[i].height)
+                       {
+                               double f1, f2;
+                               f1 = video_resolutions[i].conwidth > video_resolutions[i].width;
+                               f2 = video_resolutions[i].conheight > video_resolutions[i].height;
+                               if(f1 > f2)
+                               {
+                                       video_resolutions[i].conwidth = video_resolutions[i].width;
+                                       video_resolutions[i].conheight = video_resolutions[i].conheight / f1;
+                               }
+                               else
+                               {
+                                       video_resolutions[i].conwidth = video_resolutions[i].conwidth / f2;
+                                       video_resolutions[i].conheight = video_resolutions[i].height;
+                               }
+                       }
+               }
+       }
+
        menuplyr_load = true;
        menuplyr_pixels = NULL;