X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=b4faa6658a93c66891d652b7198503e657334681;hb=44146d06c780d3aaa283672fedb08b8870ebe1b9;hp=0eae638af8864af97cce3cad2c745d07bd9540e7;hpb=21af29986bbe6c1ab71c8c68244cf3250caf15f6;p=lugaru.git diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index 0eae638..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); @@ -142,23 +177,22 @@ typedef struct tagPOINT { #include "glstubs.h" #undef GL_FUNC -static bool lookup_glsym(const char *funcname, void **func, const char *libname) +static bool lookup_glsym(const char *funcname, void **func) { *func = SDL_GL_GetProcAddress(funcname); if (*func == NULL) { - fprintf(stderr, "Failed to find OpenGL symbol \"%s\" in \"%s\"\n", - funcname, libname); + fprintf(stderr, "Failed to find OpenGL symbol \"%s\"\n", funcname); return false; } return true; } -static bool lookup_all_glsyms(const char *libname) +static bool lookup_all_glsyms(void) { bool retval = true; #define GL_FUNC(ret,fn,params,call,rt) \ - if (!lookup_glsym(#fn, (void **) &p##fn, libname)) retval = false; + if (!lookup_glsym(#fn, (void **) &p##fn)) retval = false; #include "glstubs.h" #undef GL_FUNC return retval; @@ -227,7 +261,7 @@ Game * pgame = 0; static int _argc = 0; static char **_argv = NULL; -static bool cmdline(const char *cmd) +bool cmdline(const char *cmd) { for (int i = 1; i < _argc; i++) { @@ -457,6 +491,9 @@ 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) { case SDL_MOUSEMOTION: @@ -467,17 +504,10 @@ static void sdlEventProc(const SDL_Event &e, Game &game) case SDL_MOUSEBUTTONDOWN: { val = clamp_sdl_mouse_button(e.button.button); - if (val >= 0) + if ((val >= 0) && (val <= 2)) { if (val == 0) - { g_button = true; - SetKey(MAC_MOUSEBUTTON1); - } - - else if (val == 1) - SetKey(MAC_MOUSEBUTTON2); - buttons[val] = true; } } @@ -486,17 +516,10 @@ static void sdlEventProc(const SDL_Event &e, Game &game) case SDL_MOUSEBUTTONUP: { val = clamp_sdl_mouse_button(e.button.button); - if (val >= 0) + if ((val >= 0) && (val <= 2)) { if (val == 0) - { g_button = false; - ClearKey(MAC_MOUSEBUTTON1); - } - - else if (val == 1) - ClearKey(MAC_MOUSEBUTTON2); - buttons[val] = false; } } @@ -507,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) { @@ -520,22 +544,28 @@ 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]); } - if (e.key.keysym.mod & KMOD_CTRL) + mod = SDL_GetModState(); + if (mod & KMOD_CTRL) SetKey(MAC_CONTROL_KEY); - if (e.key.keysym.mod & KMOD_ALT) + if (mod & KMOD_ALT) SetKey(MAC_OPTION_KEY); - if (e.key.keysym.mod & KMOD_SHIFT) + if (mod & KMOD_META) + SetKey(MAC_COMMAND_KEY); + if (mod & KMOD_SHIFT) SetKey(MAC_SHIFT_KEY); - if (e.key.keysym.mod & KMOD_CAPS) + if (mod & KMOD_CAPS) SetKey(MAC_CAPS_LOCK_KEY); return; @@ -547,13 +577,14 @@ static void sdlEventProc(const SDL_Event &e, Game &game) ClearKey(KeyTable[e.key.keysym.sym]); } - if (e.key.keysym.mod & KMOD_CTRL) + mod = SDL_GetModState(); + if ((mod & KMOD_CTRL) == 0) ClearKey(MAC_CONTROL_KEY); - if (e.key.keysym.mod & KMOD_ALT) + if ((mod & KMOD_ALT) == 0) ClearKey(MAC_OPTION_KEY); - if (e.key.keysym.mod & KMOD_SHIFT) + if ((mod & KMOD_SHIFT) == 0) ClearKey(MAC_SHIFT_KEY); - if (e.key.keysym.mod & KMOD_CAPS) + if ((mod & KMOD_CAPS) == 0) ClearKey(MAC_CAPS_LOCK_KEY); return; } @@ -846,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; @@ -869,35 +902,95 @@ Boolean SetUp (Game & game) return false; } - const char *libname = "libGL.so.1"; // !!! FIXME: Linux specific! - if (SDL_GL_LoadLibrary(libname) == -1) + if (SDL_GL_LoadLibrary(NULL) == -1) { - fprintf(stderr, "SDL_GL_LoadLibrary(\"%s\") failed: %s\n", - libname, SDL_GetError()); + fprintf(stderr, "SDL_GL_LoadLibrary() failed: %s\n", SDL_GetError()); + SDL_Quit(); return false; } - if (!lookup_all_glsyms(libname)) + 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; if (!cmdline("windowed")) sdlflags |= SDL_FULLSCREEN; - SDL_WM_SetCaption("Lugaru", "lugaru"); - - if (!cmdline("nomousegrab")) - SDL_WM_GrabInput(SDL_GRAB_ON); + SDL_WM_SetCaption("Lugaru", "Lugaru"); 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; + } + + if (!lookup_all_glsyms()) + { + SDL_Quit(); return false; } + if (!cmdline("nomousegrab")) + SDL_WM_GrabInput(SDL_GRAB_ON); #elif (defined WIN32) //------------------------------------------------------------------ @@ -1346,85 +1439,26 @@ static bool IsFocused() } -#if PLATFORM_LINUX -#include -#include -#include -static bool try_launch_browser(const char *browser, const char *url) -{ - // make sure string isn't empty... - while ( (*browser) && (isspace(*browser)) ) browser++; - if (*browser == '\0') return false; - - bool seenurl = false; - char buf[4096]; // !!! FIXME: we aren't checking for overflow here! - char *dst = buf; - while (*browser) - { - char ch = *(browser++); - if (ch == '%') - { - ch = *(browser++); - if (ch == '%') - *(dst++) = '%'; - else if (ch == 's') // "%s" == insert URL here. - { - *(dst++) = '\''; - strcpy(dst, url); - dst += strlen(url); - *(dst++) = '\''; - seenurl = true; - } - // (not %% or %s? Drop the char.) - } - else - { - *(dst++) = ch; - } - } - - *dst = '\0'; - if (!seenurl) - { - strcat(dst, " "); - strcat(dst, url); - } - return(system(buf) == 0); -} -#endif - - static void launch_web_browser(const char *url) { #ifdef WIN32 ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL); -// lousy linux doesn't have a clean way to do this, but you can point people -// to docs on the BROWSER variable: -// http://www.catb.org/~esr/BROWSER/ -#elif PLATFORM_LINUX - if (strchr(url, '\'') != NULL) // Prevent simple shell injection. - return; - - const char *envr = getenv("BROWSER"); - if (envr == NULL) // not specified? We'll try a pseudo-sane list... - envr = "opera:mozilla:konqueror:firefox:netscape:xterm -e links:xterm -e lynx:"; - - char *ptr = (char *) alloca(strlen(envr) + 1); - if (ptr == NULL) - return; - strcpy(ptr, envr); - envr = ptr; - - while ((ptr = strchr(envr, ':')) != NULL) - { - *ptr = '\0'; - if (try_launch_browser(envr, url)) - return; - envr = ptr + 1; - } +#elif (defined(__APPLE__) && defined(__MACH__)) + const char *fmt = "open '%s'"; + const size_t len = strlen(fmt) + strlen(url) + 16; + char *buf = new char[len]; + snprintf(buf, len, fmt, url); + system(buf); + delete[] buf; - try_launch_browser(envr, url); +#elif PLATFORM_LINUX + const char *fmt = "PATH=$PATH:. xdg-open '%s'"; + const size_t len = strlen(fmt) + strlen(url) + 16; + char *buf = new char[len]; + snprintf(buf, len, fmt, url); + system(buf); + delete[] buf; #endif } @@ -1511,6 +1545,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); } @@ -1639,8 +1686,18 @@ int main(int argc, char **argv) // if(game.registernow){ if(regnow) { - launch_web_browser("http://www.wolfire.com/registerpc.html"); + #if (defined(__APPLE__) && defined(__MACH__)) + launch_web_browser("http://www.wolfire.com/purchase/lugaru/mac"); + #elif PLATFORM_LINUX + launch_web_browser("http://www.wolfire.com/purchase/lugaru/linux"); + #else + launch_web_browser("http://www.wolfire.com/purchase/lugaru/pc"); + #endif } + + #if PLATFORM_LINUX // (this may not be necessary any more.) + _exit(0); // !!! FIXME: hack...crashes on exit! + #endif return 0; } catch (const std::exception& error) @@ -2181,6 +2238,7 @@ int main(int argc, char **argv) } #endif +#if !USE_SDL int resolutionID(int width, int height) { int whichres; @@ -2193,6 +2251,7 @@ int main(int argc, char **argv) if(width==840 && height==524)whichres=5; if(width==1024 && height==640)whichres=6; if(width==1344 && height==840)whichres=7; + if(width==1920 && height==1200)whichres=8; return whichres; } @@ -2209,18 +2268,24 @@ int main(int argc, char **argv) if(width==840 && height==524)whichres=5; if(width==1024 && height==640)whichres=6; if(width==1344 && height==840)whichres=7; + if(width>=1920 && height>=1200)whichres=8; 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) { - if(whichres<=0 || whichres>7){ + if(whichres<=0 || whichres>8){ whichres = 0; width=640; height=480; @@ -2253,6 +2318,10 @@ int main(int argc, char **argv) width=1344; height=840; } + if(whichres==8){ + width=1920; + height=1200; + } if ((detail != 0) && (resolutionDepths[whichres][1] != 0)) { @@ -2268,7 +2337,9 @@ int main(int argc, char **argv) detail = 0; break; } - else if (0 == whichres) + else + + if (0 == whichres) { break; } @@ -2277,6 +2348,7 @@ int main(int argc, char **argv) } bpp = resolutionDepths[whichres][(detail != 0)]; + #endif return res; } @@ -2348,7 +2420,7 @@ int main(int argc, char **argv) extern int channels[100]; extern FSOUND_SAMPLE * samp[100]; - extern FSOUND_STREAM * strm[10]; + extern FSOUND_STREAM * strm[20]; extern "C" void PlaySoundEx(int chan, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused) { @@ -2627,10 +2699,6 @@ static bool load_png(const char *file_name, TGAImageRec &tex) if (!row_pointers) goto png_done; - retval = malloc(width * height * 4); - if (!retval) - goto png_done; - if (!hasalpha) { png_byte *dst = tex.data;