X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=9b0dfad415062b579e7d2ea87ae9aab4160344ed;hb=c33352410441ce5656f7c65eea696b5f799fefeb;hp=34c264716534427b0a58eb11bcea292389507432;hpb=cbf8f0bfaf3c752f852f0cf87c620305797c73b8;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 34c2647..9b0dfad 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;
+
+static 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)
@@ -862,9 +881,17 @@ 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");
+
+    if (!cmdline("nomousegrab"))
+        SDL_WM_GrabInput(SDL_GRAB_ON);
+
     SDL_ShowCursor(0);
+
     if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
     {
         fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
@@ -872,7 +899,6 @@ Boolean SetUp (Game & game)
     }
 
 
-
 #elif (defined WIN32)
 	//------------------------------------------------------------------
 	// create window
@@ -1323,6 +1349,7 @@ static bool IsFocused()
 #if PLATFORM_LINUX
 #include <stdlib.h>
 #include <ctype.h>
+#include <unistd.h>
 static bool try_launch_browser(const char *browser, const char *url)
 {
     // make sure string isn't empty...
@@ -1401,8 +1428,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.
@@ -2070,6 +2193,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 +2210,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 +2222,7 @@ int main (void)
 
 		while (true)
 		{
-			if(whichres<=0 || whichres>7){
+			if(whichres<=0 || whichres>8){
 				whichres = 0;
 				width=640;
 				height=480;
@@ -2130,6 +2255,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 +2280,9 @@ int main (void)
 				detail = 0;
 				break;
 			}
-			else if (0 == whichres)
+			else
+
+            if (0 == whichres)
 			{
 				break;
 			}
@@ -2214,7 +2351,7 @@ int main (void)
 
 		g_appInstance=hInstance;
 
-		main();
+		main(0, NULL);
 
 		UnregisterClass( g_wndClassName, hInstance);