X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FVideo.cc;h=62addb406dc804b7a31644ef586b3a43b3dd1dce;hp=eeec47e7eb7d4dcc00b4a6b17fd732f8e61fc93a;hb=4f9eb9259092994de9690cf12f11437c35a6791e;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc
index eeec47e..62addb4 100644
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -26,11 +26,9 @@
 
 *******************************************************************************/
 
-#include <SDL/SDL_image.h>
-
 #include "Dispatch.hh"
-#include "Engine.hh"
-#include "Exception.hh"
+#include "Error.hh"
+#include "Image.hh"
 #include "Log.hh"
 #include "Settings.hh"
 #include "Video.hh"
@@ -65,9 +63,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;
@@ -80,6 +75,8 @@ void Video::init(const Attributes& attribs)
 	setCursorVisible(attribs.cursorVisible);
 	setCursorGrab(attribs.cursorGrab);
 	setVideoMode(attribs.mode);
+
+	video = this;
 }
 
 void Video::recreateContext()
@@ -114,6 +111,8 @@ void Video::setOpenGLAttributes()
 Video::~Video()
 {
 	SDL_FreeSurface(mContext);
+
+	if (video == this) video = 0;
 }
 
 
@@ -132,16 +131,12 @@ void Video::setVideoMode(const long mode[3])
 			mAttribs.mode[1] = mode[1];
 			mAttribs.mode[2] = mode[2];
 
-#if defined(_WIN32) || defined(__WIN32__)
-			// on win32, creating a new context via SDL_SetVideoMode will wipe
-			// out the GL state, so we gotta notify everyone to reload their
-			// state after the change
-			Engine::getInstance().dispatch("video.newcontext");
-
+#if !defined(linux) && !defined(__linux) && !defined(__linux__)
 			logInfo("video context recreated");
+			core.dispatch("video.newcontext");
 #endif
 		}
-		else throw Exception(ErrorCode::SDL_VIDEOMODE);
+		else Error(Error::SDL_VIDEOMODE).raise();
 	}
 }
 
@@ -173,12 +168,8 @@ void Video::setIcon()
 {
 	if (mAttribs.icon != "")
 	{
-		SDL_Surface* icon = IMG_Load(mAttribs.icon.c_str());
-		if (icon)
-		{
-			SDL_WM_SetIcon(icon, 0);
-			SDL_FreeSurface(icon);
-		}
+		Image icon(mAttribs.icon);
+		icon.setAsIcon();
 	}
 }
 
@@ -304,7 +295,7 @@ int Video::getHeight() const
 
 Video::Attributes::Attributes()
 {
-	// Set some sane GL and window defaults (see SDL_video.c:217)
+	// set some sane GL and window defaults (see SDL_video.c:217)
 	colorBuffer[0] = 3;
 	colorBuffer[1] = 3;
 	colorBuffer[2] = 2;
@@ -330,8 +321,6 @@ Video::Attributes::Attributes()
 	cursorVisible = true;
 	cursorGrab = false;
 
-	Settings& settings = Settings::getInstance();
-
 	std::vector<long> colors;
 	settings.get("colorbuffers", colors);
 	if (colors.size() > 0) colorBuffer[0] = colors[0];
@@ -363,6 +352,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)
@@ -370,15 +364,35 @@ 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
+		{
+			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];
 }
 
 
+Video* video = 0;
+
+
 } // namespace Mf
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/