X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Finit.cpp;h=dfadffe16f0c1591dc76810a47c7dfbeae3c6463;hb=HEAD;hp=18816a424bdb3a972341311d72a9cda19fa19ac6;hpb=7c2a8b8285278b8a3077b311d82f05ea0463a96e;p=blank.git

diff --git a/src/app/init.cpp b/src/app/init.cpp
index 18816a4..dfadffe 100644
--- a/src/app/init.cpp
+++ b/src/app/init.cpp
@@ -4,65 +4,35 @@
 #include <alut.h>
 #include <SDL.h>
 #include <SDL_image.h>
+#include <SDL_net.h>
 #include <SDL_ttf.h>
+#include <string>
 #include <GL/glew.h>
 
 
-namespace {
-
-std::string sdl_error_append(std::string msg) {
-	const char *error = SDL_GetError();
-	if (*error != '\0') {
-		msg += ": ";
-		msg += error;
-		SDL_ClearError();
-	}
-	return msg;
-}
-
-std::string alut_error_append(ALenum num, std::string msg) {
-	const char *error = alutGetErrorString(num);
-	if (*error != '\0') {
-		msg += ": ";
-		msg += error;
-	}
-	return msg;
-}
-
-}
-
 namespace blank {
 
-AlutError::AlutError(ALenum num)
-: std::runtime_error(alutGetErrorString(num)) {
-
-}
-
-AlutError::AlutError(ALenum num, const std::string &msg)
-: std::runtime_error(alut_error_append(num, msg)) {
-
-}
-
-
-SDLError::SDLError()
-: std::runtime_error(SDL_GetError()) {
-
+InitSDL::InitSDL() {
+	if (SDL_Init(SDL_INIT_EVENTS) != 0) {
+		throw SDLError("SDL_Init(SDL_INIT_EVENTS)");
+	}
 }
 
-SDLError::SDLError(const std::string &msg)
-: std::runtime_error(sdl_error_append(msg)) {
-
+InitSDL::~InitSDL() {
+	SDL_Quit();
 }
 
 
-InitSDL::InitSDL() {
-	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-		throw SDLError("SDL_Init(SDL_INIT_VIDEO)");
+InitVideo::InitVideo() {
+	if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+		throw SDLError("SDL_InitSubSystem(SDL_INIT_VIDEO)");
 	}
+	// SDL seems to start out in text input state
+	SDL_StopTextInput();
 }
 
-InitSDL::~InitSDL() {
-	SDL_Quit();
+InitVideo::~InitVideo() {
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
 
@@ -77,6 +47,17 @@ InitIMG::~InitIMG() {
 }
 
 
+InitNet::InitNet() {
+	if (SDLNet_Init() != 0) {
+		throw SDLError("SDLNet_Init()");
+	}
+}
+
+InitNet::~InitNet() {
+	SDLNet_Quit();
+}
+
+
 InitTTF::InitTTF() {
 	if (TTF_Init() != 0) {
 		throw SDLError("TTF_Init()");
@@ -94,7 +75,7 @@ InitAL::InitAL() {
 	}
 }
 
-InitAL::~InitAL() {
+InitAL::~InitAL() throw(AlutError) {
 	if (!alutExit()) {
 		throw AlutError(alutGetError(), "alutExit");
 	}
@@ -112,9 +93,9 @@ InitGL::InitGL(bool double_buffer, int sample_size) {
 		throw SDLError("SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE)");
 	}
 
-	if (double_buffer) {
-		if (SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1) != 0) {
-			throw SDLError("SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1)");
+	if (!double_buffer) {
+		if (SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0) != 0) {
+			throw SDLError("SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0)");
 		}
 	}
 
@@ -198,8 +179,14 @@ InitGLEW::InitGLEW() {
 }
 
 
-Init::Init(bool double_buffer, int sample_size)
+InitHeadless::InitHeadless()
 : init_sdl()
+, init_net() {
+
+}
+
+Init::Init(bool double_buffer, int sample_size)
+: init_video()
 , init_img()
 , init_ttf()
 , init_gl(double_buffer, sample_size)