--- a/src/modules/window/sdl/Window.cpp	Wed Jul 04 13:54:15 2012 +0200
+++ b/src/modules/window/sdl/Window.cpp	Wed Jul 04 14:40:24 2012 +0200
@@ -1,309 +1,309 @@
-/**
- * Copyright (c) 2006-2012 LOVE Development Team
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- **/
-
-// STL
-#include <iostream>
-
-// SDL
-#include <SDL.h>
-
-// OpenGL
-#include <SDL/SDL_opengl.h>
-
-// LOVE
-#include "common/config.h"
-#include "Window.h"
-
-namespace love
-{
-namespace window
-{
-namespace sdl
-{
-
-Window::Window()
-	: windowTitle("")
-	, created(false)
-	, mouseVisible(true)
-{
-	// Window should be centered.
-	SDL_putenv(const_cast<char *>("SDL_VIDEO_CENTERED=center"));
-
-	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-		throw Exception(SDL_GetError());
-}
-
-Window::~Window()
-{
-	SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-Window::_currentMode::_currentMode()
-	: width(800), height(600), fullscreen(false), vsync(true), fsaa(0)
-{
-}
-
-bool Window::setWindow(int width, int height, bool fullscreen, bool vsync, int fsaa)
-{
-	bool mouseVisible = getMouseVisible();
-
-	// We need to restart the subsystem for two reasons:
-	// 1) Special case for fullscreen -> windowed. Windows XP did not
-	//    work well with "normal" display mode change in this case.
-	//    The application window does leave fullscreen, but the desktop
-	//    resolution does not revert to the correct one. Restarting the
-	//    SDL video subsystem does the trick, though.
-	// 2) Restart the event system (for whatever reason the event system
-	//    started and stopped with SDL_INIT_VIDEO, see:
-	//    http://sdl.beuc.net/sdl.wiki/Introduction_to_Events)
-	//    because the mouse position will not be able to exceed
-	//    the previous' video mode window size (i.e. alway
-	//    love.mouse.getX() < 800 when switching from 800x600 to a
-	//    higher resolution)
-	SDL_QuitSubSystem(SDL_INIT_VIDEO);
-	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-	{
-		std::cout << "Could not init SDL_VIDEO: " << SDL_GetError() << std::endl;
-		return false;
-	}
-
-	// Set caption.
-	setWindowTitle(windowTitle);
-	setMouseVisible(mouseVisible);
-
-	// Set GL attributes
-	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, (vsync ? 1 : 0));
-	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
-
-	// FSAA
-	if (fsaa > 0)
-	{
-		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
-		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
-	}
-
-	// Fullscreen?
-	Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL;
-
-	// Have SDL set the video mode.
-	if (SDL_SetVideoMode(width, height, 32, sdlflags) == 0)
-	{
-		bool failed = true;
-		if (fsaa > 0)
-		{
-			// FSAA might have failed, disable it and try again
-			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
-			failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
-			if (failed)
-			{
-				// There might be no FSAA at all
-				SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
-				failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
-			}
-		}
-		if (failed)
-		{
-			std::cerr << "Could not set video mode: "  << SDL_GetError() << std::endl;
-			return false;
-		}
-	}
-
-	created = true;
-
-	if (width == 0 || height == 0)
-	{
-		const SDL_VideoInfo *videoinfo = SDL_GetVideoInfo();
-		width = videoinfo->current_w;
-		height = videoinfo->current_h;
-	}
-
-	if (fsaa > 0)
-		glEnable(GL_MULTISAMPLE);
-
-	GLint buffers;
-	GLint samples;
-
-	glGetIntegerv(GL_SAMPLE_BUFFERS_ARB, &buffers);
-	glGetIntegerv(GL_SAMPLES_ARB, &samples);
-
-	// Don't fail because of this, but issue a warning.
-	if ((!buffers && fsaa) || (samples != fsaa))
-	{
-		std::cerr << "Warning, quality setting failed! (Result: buffers: " << buffers << ", samples: " << samples << ")" << std::endl;
-		fsaa = !buffers ? 0 : samples;
-	}
-
-	// Get the actual vsync status
-	int real_vsync;
-	SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL, &real_vsync);
-
-	// Set the new display mode as the current display mode.
-	currentMode.width = width;
-	currentMode.height = height;
-	currentMode.fsaa = fsaa;
-	currentMode.fullscreen = fullscreen;
-	currentMode.vsync = (real_vsync != 0);
-
-	return true;
-}
-
-void Window::getWindow(int &width, int &height, bool &fullscreen, bool &vsync, int &fsaa)
-{
-	width = currentMode.width;
-	height = currentMode.height;
-	fullscreen = currentMode.fullscreen;
-	vsync = currentMode.vsync;
-	fsaa = currentMode.fsaa;
-}
-
-bool Window::checkWindowSize(int width, int height, bool fullscreen)
-{
-	Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL;
-
-	// Check if mode is supported
-	int bpp = SDL_VideoModeOK(width, height, 32, sdlflags);
-
-	return (bpp >= 16);
-}
-
-typedef Window::WindowSize WindowSize;
-
-WindowSize **Window::getFullscreenSizes(int &n)
-{
-	SDL_Rect **modes = SDL_ListModes(0, SDL_OPENGL | SDL_FULLSCREEN);
-
-	if (modes == (SDL_Rect **)0 || modes == (SDL_Rect **)-1)
-	{
-		n = 0;
-		return NULL;
-	}
-
-	n = 0;
-	for (int i = 0; modes[i]; i++)
-		n++;
-
-	WindowSize **sizes = new WindowSize*[n];
-
-	for (int i = 0; i < n; i++)
-	{
-		sizes[i] = new WindowSize;
-		sizes[i]->width = modes[i]->w;
-		sizes[i]->height = modes[i]->h;
-	}
-	return sizes;
-}
-
-int Window::getWidth()
-{
-	return currentMode.width;
-}
-
-int Window::getHeight()
-{
-	return currentMode.height;
-}
-
-bool Window::isCreated()
-{
-	return created;
-}
-
-void Window::setWindowTitle(std::string &title)
-{
-	windowTitle = title;
-	SDL_WM_SetCaption(windowTitle.c_str(), 0);
-}
-
-std::string Window::getWindowTitle()
-{
-	// not a reference
-	// because we want this untouched
-	// const std::string& might be an option
-	return windowTitle;
-}
-
-bool Window::setIcon(love::image::ImageData *imgd)
-{
-	Uint32 rmask, gmask, bmask, amask;
-#ifdef LOVE_BIG_ENDIAN
-	rmask = 0xFF000000;
-	gmask = 0x00FF0000;
-	bmask = 0x0000FF00;
-	amask = 0x000000FF;
-#else
-	rmask = 0x000000FF;
-	gmask = 0x0000FF00;
-	bmask = 0x00FF0000;
-	amask = 0xFF000000;
-#endif
-
-	int w = static_cast<int>(imgd->getWidth());
-	int h = static_cast<int>(imgd->getHeight());
-	int pitch = static_cast<int>(imgd->getWidth() * 4);
-
-	SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, 32, pitch, rmask, gmask, bmask, amask);
-	SDL_WM_SetIcon(icon, NULL);
-	SDL_FreeSurface(icon);
-	return true;
-}
-
-void Window::swapBuffers()
-{
-	SDL_GL_SwapBuffers();
-}
-
-bool Window::hasFocus()
-{
-	return (SDL_GetAppState() & SDL_APPINPUTFOCUS) != 0;
-}
-
-void Window::setMouseVisible(bool visible)
-{
-	SDL_ShowCursor(visible ? SDL_ENABLE : SDL_DISABLE);
-}
-
-bool Window::getMouseVisible()
-{
-	return (SDL_ShowCursor(SDL_QUERY) == SDL_ENABLE) ? true : false;
-}
-
-love::window::Window *Window::getSingleton()
-{
-	if (!singleton)
-		singleton = new Window();
-	else
-		singleton->retain();
-
-	return singleton;
-}
-
-const char *Window::getName() const
-{
-	return "love.window.sdl";
-}
-
-} // sdl
-} // window
-} // love
+/**
+ * Copyright (c) 2006-2012 LOVE Development Team
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+
+// STL
+#include <iostream>
+
+// SDL
+#include <SDL.h>
+
+// OpenGL
+#include <SDL/SDL_opengl.h>
+
+// LOVE
+#include "common/config.h"
+#include "Window.h"
+
+namespace love
+{
+namespace window
+{
+namespace sdl
+{
+
+Window::Window()
+	: windowTitle("")
+	, created(false)
+	, mouseVisible(true)
+{
+	// Window should be centered.
+	SDL_putenv(const_cast<char *>("SDL_VIDEO_CENTERED=center"));
+
+	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+		throw Exception(SDL_GetError());
+}
+
+Window::~Window()
+{
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+}
+
+Window::_currentMode::_currentMode()
+	: width(800), height(600), fullscreen(false), vsync(true), fsaa(0)
+{
+}
+
+bool Window::setWindow(int width, int height, bool fullscreen, bool vsync, int fsaa)
+{
+	bool mouseVisible = getMouseVisible();
+
+	// We need to restart the subsystem for two reasons:
+	// 1) Special case for fullscreen -> windowed. Windows XP did not
+	//    work well with "normal" display mode change in this case.
+	//    The application window does leave fullscreen, but the desktop
+	//    resolution does not revert to the correct one. Restarting the
+	//    SDL video subsystem does the trick, though.
+	// 2) Restart the event system (for whatever reason the event system
+	//    started and stopped with SDL_INIT_VIDEO, see:
+	//    http://sdl.beuc.net/sdl.wiki/Introduction_to_Events)
+	//    because the mouse position will not be able to exceed
+	//    the previous' video mode window size (i.e. alway
+	//    love.mouse.getX() < 800 when switching from 800x600 to a
+	//    higher resolution)
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+	{
+		std::cout << "Could not init SDL_VIDEO: " << SDL_GetError() << std::endl;
+		return false;
+	}
+
+	// Set caption.
+	setWindowTitle(windowTitle);
+	setMouseVisible(mouseVisible);
+
+	// Set GL attributes
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, (vsync ? 1 : 0));
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
+
+	// FSAA
+	if (fsaa > 0)
+	{
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
+	}
+
+	// Fullscreen?
+	Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL;
+
+	// Have SDL set the video mode.
+	if (SDL_SetVideoMode(width, height, 32, sdlflags) == 0)
+	{
+		bool failed = true;
+		if (fsaa > 0)
+		{
+			// FSAA might have failed, disable it and try again
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
+			failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
+			if (failed)
+			{
+				// There might be no FSAA at all
+				SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
+				failed = SDL_SetVideoMode(width, height, 32, sdlflags) == 0;
+			}
+		}
+		if (failed)
+		{
+			std::cerr << "Could not set video mode: "  << SDL_GetError() << std::endl;
+			return false;
+		}
+	}
+
+	created = true;
+
+	if (width == 0 || height == 0)
+	{
+		const SDL_VideoInfo *videoinfo = SDL_GetVideoInfo();
+		width = videoinfo->current_w;
+		height = videoinfo->current_h;
+	}
+
+	if (fsaa > 0)
+		glEnable(GL_MULTISAMPLE);
+
+	GLint buffers;
+	GLint samples;
+
+	glGetIntegerv(GL_SAMPLE_BUFFERS_ARB, &buffers);
+	glGetIntegerv(GL_SAMPLES_ARB, &samples);
+
+	// Don't fail because of this, but issue a warning.
+	if ((!buffers && fsaa) || (samples != fsaa))
+	{
+		std::cerr << "Warning, quality setting failed! (Result: buffers: " << buffers << ", samples: " << samples << ")" << std::endl;
+		fsaa = !buffers ? 0 : samples;
+	}
+
+	// Get the actual vsync status
+	int real_vsync;
+	SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL, &real_vsync);
+
+	// Set the new display mode as the current display mode.
+	currentMode.width = width;
+	currentMode.height = height;
+	currentMode.fsaa = fsaa;
+	currentMode.fullscreen = fullscreen;
+	currentMode.vsync = (real_vsync != 0);
+
+	return true;
+}
+
+void Window::getWindow(int &width, int &height, bool &fullscreen, bool &vsync, int &fsaa)
+{
+	width = currentMode.width;
+	height = currentMode.height;
+	fullscreen = currentMode.fullscreen;
+	vsync = currentMode.vsync;
+	fsaa = currentMode.fsaa;
+}
+
+bool Window::checkWindowSize(int width, int height, bool fullscreen)
+{
+	Uint32 sdlflags = fullscreen ? (SDL_OPENGL | SDL_FULLSCREEN) : SDL_OPENGL;
+
+	// Check if mode is supported
+	int bpp = SDL_VideoModeOK(width, height, 32, sdlflags);
+
+	return (bpp >= 16);
+}
+
+typedef Window::WindowSize WindowSize;
+
+WindowSize **Window::getFullscreenSizes(int &n)
+{
+	SDL_Rect **modes = SDL_ListModes(0, SDL_OPENGL | SDL_FULLSCREEN);
+
+	if (modes == (SDL_Rect **)0 || modes == (SDL_Rect **)-1)
+	{
+		n = 0;
+		return NULL;
+	}
+
+	n = 0;
+	for (int i = 0; modes[i]; i++)
+		n++;
+
+	WindowSize **sizes = new WindowSize*[n];
+
+	for (int i = 0; i < n; i++)
+	{
+		sizes[i] = new WindowSize;
+		sizes[i]->width = modes[i]->w;
+		sizes[i]->height = modes[i]->h;
+	}
+	return sizes;
+}
+
+int Window::getWidth()
+{
+	return currentMode.width;
+}
+
+int Window::getHeight()
+{
+	return currentMode.height;
+}
+
+bool Window::isCreated()
+{
+	return created;
+}
+
+void Window::setWindowTitle(std::string &title)
+{
+	windowTitle = title;
+	SDL_WM_SetCaption(windowTitle.c_str(), 0);
+}
+
+std::string Window::getWindowTitle()
+{
+	// not a reference
+	// because we want this untouched
+	// const std::string& might be an option
+	return windowTitle;
+}
+
+bool Window::setIcon(love::image::ImageData *imgd)
+{
+	Uint32 rmask, gmask, bmask, amask;
+#ifdef LOVE_BIG_ENDIAN
+	rmask = 0xFF000000;
+	gmask = 0x00FF0000;
+	bmask = 0x0000FF00;
+	amask = 0x000000FF;
+#else
+	rmask = 0x000000FF;
+	gmask = 0x0000FF00;
+	bmask = 0x00FF0000;
+	amask = 0xFF000000;
+#endif
+
+	int w = static_cast<int>(imgd->getWidth());
+	int h = static_cast<int>(imgd->getHeight());
+	int pitch = static_cast<int>(imgd->getWidth() * 4);
+
+	SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, 32, pitch, rmask, gmask, bmask, amask);
+	SDL_WM_SetIcon(icon, NULL);
+	SDL_FreeSurface(icon);
+	return true;
+}
+
+void Window::swapBuffers()
+{
+	SDL_GL_SwapBuffers();
+}
+
+bool Window::hasFocus()
+{
+	return (SDL_GetAppState() & SDL_APPINPUTFOCUS) != 0;
+}
+
+void Window::setMouseVisible(bool visible)
+{
+	SDL_ShowCursor(visible ? SDL_ENABLE : SDL_DISABLE);
+}
+
+bool Window::getMouseVisible()
+{
+	return (SDL_ShowCursor(SDL_QUERY) == SDL_ENABLE) ? true : false;
+}
+
+love::window::Window *Window::getSingleton()
+{
+	if (!singleton)
+		singleton = new Window();
+	else
+		singleton->retain();
+
+	return singleton;
+}
+
+const char *Window::getName() const
+{
+	return "love.window.sdl";
+}
+
+} // sdl
+} // window
+} // love