X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FVideo.cc;h=ba375e10318195cc770bca37552288d64bb6d816;hp=e4579fbc700951215a32b0669a2602c5b7f62fbf;hb=4f62ce947db282f0bbf4d49b3aafb83d7cf51adc;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc
index e4579fb..ba375e1 100644
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -28,7 +28,7 @@
 
 #include "Dispatch.hh"
 #include "Engine.hh"
-#include "Exception.hh"
+#include "Error.hh"
 #include "Image.hh"
 #include "Log.hh"
 #include "Settings.hh"
@@ -64,9 +64,6 @@ Video::Video(const std::string& caption, const std::string& icon)
 
 void Video::init(const Attributes& attribs)
 {
-	// make sure the engine is initialized before setting up the video
-	Engine::getInstance();
-
 	mContext = 0;
 	mFlags = 0;
 	mAttribs = attribs;
@@ -140,7 +137,7 @@ void Video::setVideoMode(const long mode[3])
 			logInfo("video context recreated");
 #endif
 		}
-		else throw Exception(ErrorCode::SDL_VIDEOMODE);
+		else throw Error(Error::SDL_VIDEOMODE);
 	}
 }
 
@@ -358,6 +355,11 @@ Video::Attributes::Attributes()
 	}
 	settings.get("icon", icon);
 
+	settings.get("fullscreen", fullscreen);
+	settings.get("resizable", resizable);
+	settings.get("showcursor", cursorVisible);
+	settings.get("grab", cursorGrab);
+
 	std::vector<long> dimensions;
 	settings.get("videomode", dimensions);
 	if (dimensions.size() > 1)
@@ -365,12 +367,31 @@ Video::Attributes::Attributes()
 		mode[0] = dimensions[0];
 		mode[1] = dimensions[1];
 	}
-	if (dimensions.size() > 2) mode[2] = dimensions[2];
+	else if (fullscreen)
+	{
+		SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
 
-	settings.get("fullscreen", fullscreen);
-	settings.get("resizable", resizable);
-	settings.get("showcursor", cursorVisible);
-	settings.get("grab", cursorGrab);
+		if (modes == (SDL_Rect**)0)
+		{
+			Mf::logError("no native video mode");
+		}
+		else if (modes == (SDL_Rect**)-1)
+		{
+			Mf::logWarning("any resolution allowed; choosing default 800x600");
+			mode[0] = 800;
+			mode[1] = 600;
+		}
+		else
+		{
+			while (*(modes + 1)) ++modes; // skip to the last
+
+			mode[0] = (*modes)->w;
+			mode[1] = (*modes)->h;
+			Mf::logInfo << "choosing native resolution "
+						<< mode[0] << "x" << mode[1] << std::endl;
+		}
+	}
+	if (dimensions.size() > 2) mode[2] = dimensions[2];
 }