X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=2efaac415be6bcf6fdc188de8a408bd63ad35fee;hb=5d346cad6a50bbd83d84721caae9235dff8132f0;hp=9b0dfad415062b579e7d2ea87ae9aab4160344ed;hpb=c33352410441ce5656f7c65eea696b5f799fefeb;p=lugaru.git diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index 9b0dfad..2efaac4 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -142,23 +142,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 +226,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 +456,8 @@ static inline int clamp_sdl_mouse_button(Uint8 button) static void sdlEventProc(const SDL_Event &e, Game &game) { int val; + SDLMod mod; + switch(e.type) { case SDL_MOUSEMOTION: @@ -467,17 +468,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 +480,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; } } @@ -517,6 +504,16 @@ static void sdlEventProc(const SDL_Event &e, Game &game) } } + #if (defined(__APPLE__) && defined(__MACH__)) + if (e.key.keysym.sym == SDLK_q) + { + if (e.key.keysym.mod & KMOD_META) + { + gDone=true; + } + } + #endif + else if (e.key.keysym.sym == SDLK_RETURN) { if (e.key.keysym.mod & KMOD_ALT) @@ -529,13 +526,14 @@ static void sdlEventProc(const SDL_Event &e, Game &game) 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_SHIFT) SetKey(MAC_SHIFT_KEY); - if (e.key.keysym.mod & KMOD_CAPS) + if (mod & KMOD_CAPS) SetKey(MAC_CAPS_LOCK_KEY); return; @@ -547,13 +545,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; } @@ -869,26 +868,19 @@ 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)) - return false; } 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); @@ -898,6 +890,14 @@ Boolean SetUp (Game & game) return false; } + if (!lookup_all_glsyms()) + { + SDL_Quit(); + return false; + } + + if (!cmdline("nomousegrab")) + SDL_WM_GrabInput(SDL_GRAB_ON); #elif (defined WIN32) //------------------------------------------------------------------ @@ -1346,85 +1346,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; +#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; - while ((ptr = strchr(envr, ':')) != NULL) - { - *ptr = '\0'; - if (try_launch_browser(envr, url)) - return; - envr = ptr + 1; - } - - 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 +1452,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 +1593,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) @@ -2362,7 +2326,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) { @@ -2641,10 +2605,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;