X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=b4faa6658a93c66891d652b7198503e657334681;hb=44146d06c780d3aaa283672fedb08b8870ebe1b9;hp=a64f5e4408f3bda69737bacc04f7f2834fdfb4b9;hpb=9a34028dd6a8526a18c1a23c21cbb86b325e1560;p=lugaru.git diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index a64f5e4..b4faa66 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -1,3 +1,24 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games + +This file is part of Lugaru. + +Lugaru is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + #ifdef WIN32 #include @@ -103,6 +124,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); @@ -456,6 +491,7 @@ static inline int clamp_sdl_mouse_button(Uint8 button) static void sdlEventProc(const SDL_Event &e, Game &game) { int val; + bool skipkey = false; SDLMod mod; switch(e.type) @@ -494,6 +530,7 @@ static void sdlEventProc(const SDL_Event &e, Game &game) { if (e.key.keysym.mod & KMOD_CTRL) { + skipkey = true; SDL_GrabMode mode = SDL_GRAB_ON; if ((SDL_GetVideoSurface()->flags & SDL_FULLSCREEN) == 0) { @@ -507,10 +544,13 @@ static void sdlEventProc(const SDL_Event &e, Game &game) else if (e.key.keysym.sym == SDLK_RETURN) { if (e.key.keysym.mod & KMOD_ALT) + { + skipkey = true; SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()); + } } - if (e.key.keysym.sym < SDLK_LAST) + if ((!skipkey) && (e.key.keysym.sym < SDLK_LAST)) { if (KeyTable[e.key.keysym.sym] != 0xffff) SetKey(KeyTable[e.key.keysym.sym]); @@ -521,6 +561,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 +877,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 +908,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 +954,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; } @@ -2135,6 +2238,7 @@ int main(int argc, char **argv) } #endif +#if !USE_SDL int resolutionID(int width, int height) { int whichres; @@ -2168,10 +2272,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) @@ -2214,12 +2323,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; @@ -2245,6 +2348,7 @@ int main(int argc, char **argv) } bpp = resolutionDepths[whichres][(detail != 0)]; + #endif return res; }