only try vsync, when set in config

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7308098..38180b5 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,12 +25,11 @@
 
 #include <stdexcept>
 #include <sstream>
-#include <time.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 #include <physfs.h>
 #include <SDL.h>
 #include <SDL_image.h>
@@ -204,8 +203,10 @@ static void init_physfs(const char* argv0)
   PHYSFS_permitSymbolicLinks(1);
 
   //show search Path
-  for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
+  char** searchpath = PHYSFS_getSearchPath();
+  for(char** i = searchpath; *i != NULL; i++)
     log_info << "[" << *i << "] is in the search path" << std::endl;
+  PHYSFS_freeList(searchpath);
 }
 
 static void print_usage(const char* argv0)
@@ -277,10 +278,17 @@ static bool parse_commandline(int argc, char** argv)
         print_usage(argv[0]);
         throw std::runtime_error("Need to specify a parameter for aspect switch");
       }
-      if(sscanf(argv[++i], "%d:%d", &config->aspectwidth, &config->aspectheight)
-         != 2) {
-        print_usage(argv[0]);
-        throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+      if(strcasecmp(argv[i+1], "auto") == 0) {
+        i++;
+        config->aspect_ratio = -1;
+      } else {
+        int aspect_width, aspect_height;
+        if(sscanf(argv[++i], "%d:%d", &aspect_width, &aspect_height) != 2) {
+          print_usage(argv[0]);
+          throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+        }
+        config->aspect_ratio = static_cast<double>(aspect_width) /
+                               static_cast<double>(aspect_height);
       }
     } else if(arg == "--show-fps") {
       config->show_fps = true;
@@ -341,18 +349,35 @@ static void init_sdl()
 
 static void init_rand()
 {
-  const char *how = config->random_seed? ", user fixed.": ", from time().";
-
   config->random_seed = systemRandom.srand(config->random_seed);
 
-  log_info << "Using random seed " << config->random_seed << how << std::endl;
+  //const char *how = config->random_seed? ", user fixed.": ", from time().";
+  //log_info << "Using random seed " << config->random_seed << how << std::endl;
 }
 
 void init_video()
 {
+  static int desktop_width = 0;
+  static int desktop_height = 0;
+
   if(texture_manager != NULL)
     texture_manager->save_textures();
 
+/* unfortunately only newer SDLs have these infos */
+#if SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 10)
+  /* find which resolution the user normally uses */
+  if(desktop_width == 0) {
+    const SDL_VideoInfo *info = SDL_GetVideoInfo();
+    desktop_width  = info->current_w;
+    desktop_height = info->current_h;
+  }
+
+  if(config->try_vsync) {
+    /* we want vsync for smooth scrolling */
+       SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+  }
+#endif
+
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
   SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
@@ -388,14 +413,26 @@ void init_video()
   }
 #endif
 
-  // use aspect ratio to calculate logical resolution
-  if (config->aspectwidth > config->aspectheight) {
-       SCREEN_HEIGHT=600;
-       SCREEN_WIDTH=600*config->aspectwidth/config->aspectheight;
+  SDL_ShowCursor(0);
+
+  double aspect_ratio = config->aspect_ratio;
+
+  // try to guess aspect ratio of monitor if needed
+  if (aspect_ratio <= 0) {
+    if(config->use_fullscreen && desktop_width > 0) {
+      aspect_ratio = static_cast<double>(desktop_width) / static_cast<double>(desktop_height);
+    } else {
+      aspect_ratio = 4.0 / 3.0;
+    }
   }
-  else {
-       SCREEN_WIDTH=600;
-       SCREEN_HEIGHT=600*config->aspectheight/config->aspectwidth;
+
+  // use aspect ratio to calculate logical resolution
+  if (aspect_ratio > 1) {
+       SCREEN_WIDTH  = static_cast<int> (600 * aspect_ratio);
+       SCREEN_HEIGHT = 600;
+  } else {
+       SCREEN_WIDTH  = 600;
+       SCREEN_HEIGHT = static_cast<int> (600 * 1/aspect_ratio);
   }
 
   // setup opengl state and transform
@@ -503,7 +540,9 @@ int main(int argc, char** argv)
 {
   int result = 0;
 
+#ifndef NO_CATCH
   try {
+#endif
 
     if(pre_parse_commandline(argc, argv))
       return 0;
@@ -567,6 +606,7 @@ int main(int argc, char** argv)
 
     //init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
     main_loop->run();
+#ifndef NO_CATCH
   } catch(std::exception& e) {
     log_fatal << "Unexpected exception: " << e.what() << std::endl;
     result = 1;
@@ -574,6 +614,7 @@ int main(int argc, char** argv)
     log_fatal << "Unexpected exception" << std::endl;
     result = 1;
   }
+#endif
 
   delete main_loop;
   main_loop = NULL;