Changed capitalization of the small window caption.

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index cb74c6ceaca7a92741a39c1e78606cd5d274d0cc..2aec38d94c0fe2ef4d82225e57c592d7b810325d 100644 (file)
--- 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;
@@ -469,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;
                 }
                        }
@@ -488,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;
                 }
                        }
@@ -873,23 +858,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");
+    SDL_WM_SetCaption("Lugaru", "Lugaru");
 
     SDL_ShowCursor(0);
 
@@ -899,6 +880,12 @@ Boolean SetUp (Game & game)
         return false;
     }
 
+    if (!lookup_all_glsyms())
+    {
+        SDL_Quit();
+        return false;
+    }
+
     if (!cmdline("nomousegrab"))
         SDL_WM_GrabInput(SDL_GRAB_ON);
 
@@ -1349,85 +1336,18 @@ 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...
-    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;
-    }
-
-    try_launch_browser(envr, url);
+    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
 }
 
@@ -1642,7 +1562,11 @@ int main(int argc, char **argv)
 //             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.)
@@ -2648,10 +2572,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;