X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=64fce3903fed9ceee1857e4b16b62a8fb405bf13;hb=3c8f67c3c66a86fc9e45469ce2fed4222d486c9f;hp=59df351e4574ceea0416e978c3e18ddb1757ef52;hpb=90366961d7188d661017383ab2f4718e4cbc89d3;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 59df351..64fce39 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -103,6 +103,20 @@ extern float volume;
 using namespace std;
 
 
+#if USE_SDL
+SDL_Rect **resolutions = NULL;
+static SDL_Rect rect_1024_768 = { 0, 0, 1024, 768 };
+static SDL_Rect rect_800_600  = { 0, 0, 800,  600 };
+static SDL_Rect rect_640_480  = { 0, 0, 640,  480 };
+static SDL_Rect *hardcoded_resolutions[] = {
+    &rect_1024_768,
+    &rect_800_600,
+    &rect_640_480,
+    NULL
+};
+#endif
+
+
 unsigned int resolutionDepths[8][2] = {0};
 
 bool selectDetail(int & width, int & height, int & bpp, int & detail);
@@ -521,6 +535,8 @@ static void sdlEventProc(const SDL_Event &e, Game &game)
                 SetKey(MAC_CONTROL_KEY);
             if (mod & KMOD_ALT)
                 SetKey(MAC_OPTION_KEY);
+            if (mod & KMOD_META)
+                SetKey(MAC_COMMAND_KEY);
             if (mod & KMOD_SHIFT)
                 SetKey(MAC_SHIFT_KEY);
             if (mod & KMOD_CAPS)
@@ -835,10 +851,12 @@ Boolean SetUp (Game & game)
 
 		if(detail>2)detail=2;
 		if(detail<0)detail=0;
-		if(screenwidth>3000)screenwidth=640;
 		if(screenwidth<0)screenwidth=640;
-		if(screenheight>3000)screenheight=480;
 		if(screenheight<0)screenheight=480;
+#if !USE_SDL  // we'll take anything that works.
+		if(screenwidth>3000)screenwidth=640;
+		if(screenheight>3000)screenheight=480;
+#endif
 	}
 	if(kBitsPerPixel!=32&&kBitsPerPixel!=16){
 		kBitsPerPixel=16;
@@ -864,6 +882,42 @@ Boolean SetUp (Game & game)
             SDL_Quit();
             return false;
         }
+
+        SDL_Rect **res = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL);
+        if ( (res == NULL) || (res == ((SDL_Rect **)-1)) || (res[0] == NULL) || (res[0]->w < 640) || (res[0]->h < 480) )
+            res = hardcoded_resolutions;
+
+        // reverse list (it was sorted biggest to smallest by SDL)...
+        int count;
+        for (count = 0; res[count]; count++)
+        {
+            if ((res[count]->w < 640) || (res[count]->h < 480))
+                break;   // sane lower limit.
+        }
+
+        static SDL_Rect *resolutions_block = NULL;
+        resolutions_block = (SDL_Rect*) realloc(resolutions_block, sizeof (SDL_Rect) * count);
+        resolutions = (SDL_Rect**) realloc(resolutions, sizeof (SDL_Rect *) * (count + 1));
+        if ((resolutions_block == NULL) || (resolutions == NULL))
+        {
+            SDL_Quit();
+            fprintf(stderr, "Out of memory!\n");
+            return false;
+        }
+
+        resolutions[count--] = NULL;
+        for (int i = 0; count >= 0; i++, count--)
+        {
+            memcpy(&resolutions_block[count], res[i], sizeof (SDL_Rect));
+            resolutions[count] = &resolutions_block[count];
+        }
+
+        if (cmdline("showresolutions"))
+        {
+            printf("Resolutions we think are okay:\n");
+            for (int i = 0; resolutions[i]; i++)
+                printf("  %d x %d\n", (int) resolutions[i]->w, (int) resolutions[i]->h);
+        }
     }
 
     Uint32 sdlflags = SDL_OPENGL;
@@ -874,9 +928,32 @@ Boolean SetUp (Game & game)
 
     SDL_ShowCursor(0);
 
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
     if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
     {
         fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+        fprintf(stderr, "forcing 640x480...\n");
+        kContextWidth = 640;
+        kContextHeight = 480;
+        if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
+        {
+            fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+            fprintf(stderr, "forcing 640x480 windowed mode...\n");
+            sdlflags &= ~SDL_FULLSCREEN;
+            if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
+            {
+                fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+                return false;
+            }
+        }
+    }
+
+    int dblbuf = 0;
+    if ((SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &dblbuf) == -1) || (!dblbuf))
+    {
+        fprintf(stderr, "Failed to get double buffered GL context!\n");
+        SDL_Quit();
         return false;
     }
 
@@ -1442,6 +1519,19 @@ static inline void chdirToAppPath(const char *argv0)
     char *dir = calcBaseDir(argv0);
     if (dir)
     {
+        #if (defined(__APPLE__) && defined(__MACH__))
+        // Chop off /Contents/MacOS if it's at the end of the string, so we
+        //  land in the base of the app bundle.
+        const size_t len = strlen(dir);
+        const char *bundledirs = "/Contents/MacOS";
+        const size_t bundledirslen = strlen(bundledirs);
+        if (len > bundledirslen)
+        {
+            char *ptr = (dir + len) - bundledirslen;
+            if (strcasecmp(ptr, bundledirs) == 0)
+                *ptr = '\0';
+        }
+        #endif
         chdir(dir);
         free(dir);
     }
@@ -2122,6 +2212,7 @@ int main(int argc, char **argv)
 	}
 #endif
 
+#if !USE_SDL
 	int resolutionID(int width, int height)
 	{
 		int whichres;
@@ -2155,10 +2246,15 @@ int main(int argc, char **argv)
 
 		return whichres;
 	}
+#endif
 
 	bool selectDetail(int & width, int & height, int & bpp, int & detail)
 	{
 		bool res = true;
+
+		// currently with SDL, we just use whatever is requested
+		//  and don't care.  --ryan.
+		#if !USE_SDL
 		int whichres = closestResolution(width, height);
 
 		while (true)
@@ -2201,12 +2297,6 @@ int main(int argc, char **argv)
 				height=1200;
 			}
 
-            // currently with SDL, we just use whatever the native bitdepth
-            //  of the display is and don't care.
-            #if USE_SDL
-            break;
-            #endif
-
 			if ((detail != 0) && (resolutionDepths[whichres][1] != 0))
 			{
 				break;
@@ -2232,6 +2322,7 @@ int main(int argc, char **argv)
 		}
 
 		bpp = resolutionDepths[whichres][(detail != 0)];
+		#endif
 
 		return res;
 	}