X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=9d709dbc2685a0aa58e2feb7c00fe199997a5170;hb=99d73d380e7376505a4033813d5d560ebaea05d1;hp=34c264716534427b0a58eb11bcea292389507432;hpb=cbf8f0bfaf3c752f852f0cf87c620305797c73b8;p=lugaru.git diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index 34c2647..9d709db 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -223,6 +223,25 @@ Boolean gDone = false, gfFrontProcess = true; Game * pgame = 0; + +static int _argc = 0; +static char **_argv = NULL; + +bool cmdline(const char *cmd) +{ + for (int i = 1; i < _argc; i++) + { + char *arg = _argv[i]; + while (*arg == '-') + arg++; + if (stricmp(arg, cmd) == 0) + return true; + } + + return false; +} + + // -------------------------------------------------------------------------- void ReportError (char * strError) @@ -438,6 +457,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: @@ -510,13 +531,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; @@ -528,13 +550,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; } @@ -862,16 +885,22 @@ Boolean SetUp (Game & game) return false; } - Uint32 sdlflags = SDL_OPENGL; // !!! FIXME: SDL_FULLSCREEN? + Uint32 sdlflags = SDL_OPENGL; + if (!cmdline("windowed")) + sdlflags |= SDL_FULLSCREEN; + SDL_WM_SetCaption("Lugaru", "lugaru"); + SDL_ShowCursor(0); + if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL) { fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError()); return false; } - + if (!cmdline("nomousegrab")) + SDL_WM_GrabInput(SDL_GRAB_ON); #elif (defined WIN32) //------------------------------------------------------------------ @@ -1323,6 +1352,7 @@ 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... @@ -1362,7 +1392,34 @@ static bool try_launch_browser(const char *browser, const char *url) strcat(dst, " "); strcat(dst, url); } - return(system(buf) == 0); + + #define MAX_BROWSER_ARGS 512 + char *args[MAX_BROWSER_ARGS]; + char *path = NULL; + memset(args, '\0', sizeof (args)); + path = args[0] = strtok(buf, " "); + if (path == NULL) + return false; + + size_t i = 0; + for (i = 1; i < MAX_BROWSER_ARGS; i++) + { + args[i] = strtok(NULL, " "); + if (args[i] == NULL) + break; + } + + if (i == MAX_BROWSER_ARGS) + return false; + #undef MAX_BROWSER_ARGS + + //printf("calling execvp(\"%s\"", path); + //for (i = 0; args[i]; i++) + // printf(", \"%s\"", args[i]); + //printf("); ...\n\n\n"); + + execvp(path, args); + return(false); // exec shouldn't return unless there's an error. } #endif @@ -1401,8 +1458,104 @@ static void launch_web_browser(const char *url) #endif } -int main (void) + +#ifndef WIN32 +// (code lifted from physfs: http://icculus.org/physfs/ ... zlib license.) +static char *findBinaryInPath(const char *bin, char *envr) { + size_t alloc_size = 0; + char *exe = NULL; + char *start = envr; + char *ptr; + + do + { + size_t size; + ptr = strchr(start, ':'); /* find next $PATH separator. */ + if (ptr) + *ptr = '\0'; + + size = strlen(start) + strlen(bin) + 2; + if (size > alloc_size) + { + char *x = (char *) realloc(exe, size); + if (x == NULL) + { + if (exe != NULL) + free(exe); + return(NULL); + } /* if */ + + alloc_size = size; + exe = x; + } /* if */ + + /* build full binary path... */ + strcpy(exe, start); + if ((exe[0] == '\0') || (exe[strlen(exe) - 1] != '/')) + strcat(exe, "/"); + strcat(exe, bin); + + if (access(exe, X_OK) == 0) /* Exists as executable? We're done. */ + { + strcpy(exe, start); /* i'm lazy. piss off. */ + return(exe); + } /* if */ + + start = ptr + 1; /* start points to beginning of next element. */ + } while (ptr != NULL); + + if (exe != NULL) + free(exe); + + return(NULL); /* doesn't exist in path. */ +} /* findBinaryInPath */ + + +char *calcBaseDir(const char *argv0) +{ + /* If there isn't a path on argv0, then look through the $PATH for it. */ + char *retval; + char *envr; + + char *ptr = strrchr(argv0, '/'); + if (strchr(argv0, '/')) + { + retval = strdup(argv0); + if (retval) + *(strrchr(retval, '/')) = '\0'; + return(retval); + } + + envr = getenv("PATH"); + if (!envr) return NULL; + envr = strdup(envr); + if (!envr) return NULL; + retval = findBinaryInPath(argv0, envr); + free(envr); + return(retval); +} + +static inline void chdirToAppPath(const char *argv0) +{ + char *dir = calcBaseDir(argv0); + if (dir) + { + chdir(dir); + free(dir); + } +} +#endif + + +int main(int argc, char **argv) +{ + _argc = argc; + _argv = argv; +#ifndef WIN32 + chdirToAppPath(argv[0]); +#endif + LOGFUNC; #ifndef WIN32 // this is in WinMain, too. @@ -1516,8 +1669,16 @@ int main (void) // if(game.registernow){ if(regnow) { + #if PLATFORM_LINUX // (this may not be necessary any more.) + launch_web_browser("http://www.wolfire.com/registerlinux.html"); + #else launch_web_browser("http://www.wolfire.com/registerpc.html"); + #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) @@ -2070,6 +2231,7 @@ int main (void) 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; } @@ -2086,6 +2248,7 @@ int main (void) 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; } @@ -2097,7 +2260,7 @@ int main (void) while (true) { - if(whichres<=0 || whichres>7){ + if(whichres<=0 || whichres>8){ whichres = 0; width=640; height=480; @@ -2130,6 +2293,16 @@ int main (void) width=1344; height=840; } + if(whichres==8){ + width=1920; + 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)) { @@ -2145,7 +2318,9 @@ int main (void) detail = 0; break; } - else if (0 == whichres) + else + + if (0 == whichres) { break; } @@ -2214,7 +2389,7 @@ int main (void) g_appInstance=hInstance; - main(); + main(0, NULL); UnregisterClass( g_wndClassName, hInstance); @@ -2225,7 +2400,7 @@ int main (void) 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) {