Added love.window (issue #6.) All window-related functions have been moved from love.graphics to love.window.

love.graphics.setCaption has been renamed to love.window.setTitle.

src/modules/window/Window.h

@@ -26,7 +26,8 @@
 
 // LOVE
 #include "common/Module.h"
-#include <image/ImageData.h>
+#include "image/ImageData.h"
+#include "graphics/Graphics.h"
 
 namespace love
 {
@@ -55,7 +56,7 @@ public:
 
 	virtual ~Window();
 
-	virtual bool setWindow(int width = 800, int height = 600, WindowFlags *flags = 0) = 0;
+	virtual bool setWindow(int width = 800, int height = 600, graphics::Graphics *graphics = 0, WindowFlags *flags = 0) = 0;
 	virtual void getWindow(int &width, int &height, WindowFlags &flags) const = 0;
 
 	virtual bool checkWindowSize(int width, int height, bool fullscreen) const = 0;

src/modules/window/sdl/Window.cpp

@@ -55,8 +55,12 @@ Window::_currentMode::_currentMode()
 {
 }
 
-bool Window::setWindow(int width, int height, WindowFlags *flags)
+bool Window::setWindow(int width, int height, graphics::Graphics *graphics, WindowFlags *flags)
 {
+
+	if (graphics)
+		graphics->unSetMode();
+
 	bool fullscreen = false;
 	bool vsync = true;
 	int fsaa = 0;
@@ -186,6 +190,9 @@ bool Window::setWindow(int width, int height, WindowFlags *flags)
 	currentMode.flags.borderless = ((surface->flags & SDL_NOFRAME) != 0);
 	currentMode.flags.centered = centered;
 
+	if (graphics)
+		graphics->setMode(width, height);
+
 	return true;
 }
 

src/modules/window/sdl/Window.h

@@ -38,7 +38,7 @@ public:
 	Window();
 	~Window();
 
-	bool setWindow(int width = 800, int height = 600, WindowFlags *flags = 0);
+	bool setWindow(int width = 800, int height = 600, graphics::Graphics *graphics = 0, WindowFlags *flags = 0);
 	void getWindow(int &width, int &height, WindowFlags &flags) const;
 
 	bool checkWindowSize(int width, int height, bool fullscreen) const;

src/modules/window/wrap_Window.cpp

@@ -0,0 +1,251 @@
+/**
+ * Copyright (c) 2006-2013 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.
+ **/
+
+#include "wrap_Window.h"
+#include "sdl/Window.h"
+
+namespace love
+{
+namespace window
+{
+
+static Window *instance = 0;
+
+int w_checkMode(lua_State *L)
+{
+	int w = luaL_checkint(L, 1);
+	int h = luaL_checkint(L, 2);
+	bool fs = luax_toboolean(L, 3);
+	luax_pushboolean(L, instance->checkWindowSize(w, h, fs));
+	return 1;
+}
+
+int w_setMode(lua_State *L)
+{
+	int w = luaL_checkint(L, 1);
+	int h = luaL_checkint(L, 2);
+
+	graphics::Graphics *g = luax_optmodule<graphics::Graphics>(L, "graphics", MODULE_GRAPHICS_T);
+
+	if (lua_isnoneornil(L, 3))
+	{
+		luax_pushboolean(L, instance->setWindow(w, h, g, 0));
+		return 1;
+	}
+
+	luaL_checktype(L, 3, LUA_TTABLE);
+
+	WindowFlags flags;
+
+	flags.fullscreen = luax_boolflag(L, 3, "fullscreen", false);
+	flags.vsync = luax_boolflag(L, 3, "vsync", true);
+	flags.fsaa = luax_intflag(L, 3, "fsaa", 0);
+	flags.resizable = luax_boolflag(L, 3, "resizable", false);
+	flags.borderless = luax_boolflag(L, 3, "borderless", false);
+	flags.centered = luax_boolflag(L, 3, "centered", true);
+
+	try
+	{
+		luax_pushboolean(L, instance->setWindow(w, h, g, &flags));
+	}
+	catch (love::Exception &e)
+	{
+		return luaL_error(L, "%s", e.what());
+	}
+
+	return 1;
+}
+
+int w_getMode(lua_State *L)
+{
+	int w, h;
+	WindowFlags flags;
+	instance->getWindow(w, h, flags);
+	lua_pushnumber(L, w);
+	lua_pushnumber(L, h);
+
+	lua_newtable(L);
+
+	luax_pushboolean(L, flags.fullscreen);
+	lua_setfield(L, -2, "fullscreen");
+
+	luax_pushboolean(L, flags.vsync);
+	lua_setfield(L, -2, "vsync");
+
+	lua_pushnumber(L, flags.fsaa);
+	lua_setfield(L, -2, "fsaa");
+
+	luax_pushboolean(L, flags.resizable);
+	lua_setfield(L, -2, "resizable");
+
+	luax_pushboolean(L, flags.borderless);
+	lua_setfield(L, -2, "borderless");
+
+	luax_pushboolean(L, flags.centered);
+	lua_setfield(L, -2, "centered");
+	
+	return 3;
+}
+
+int w_getModes(lua_State *L)
+{
+	int n;
+	Window::WindowSize *modes = instance->getFullscreenSizes(n);
+
+	if (modes == 0)
+		return 0;
+
+	lua_createtable(L, n, 0);
+
+	for (int i = 0; i < n ; i++)
+	{
+		lua_pushinteger(L, i+1);
+		lua_createtable(L, 0, 2);
+
+		// Inner table attribs.
+
+		lua_pushinteger(L, modes[i].width);
+		lua_setfield(L, -2, "width");
+
+		lua_pushinteger(L, modes[i].height);
+		lua_setfield(L, -2, "height");
+
+		// Inner table attribs end.
+
+		lua_settable(L, -3);
+	}
+
+	delete[] modes;
+	return 1;
+}
+
+int w_toggleFullscreen(lua_State *L)
+{
+	graphics::Graphics *g = luax_optmodule<graphics::Graphics>(L, "graphics", MODULE_GRAPHICS_T);
+
+	int width, height;
+	WindowFlags flags;
+	instance->getWindow(width, height, flags);
+	flags.fullscreen = !flags.fullscreen;
+
+	try
+	{
+		luax_pushboolean(L, instance->setWindow(width, height, g, &flags));
+	}
+	catch (love::Exception &e)
+	{
+		return luaL_error(L, "%s", e.what());
+	}
+
+	return 1;
+}
+
+int w_isCreated(lua_State *L)
+{
+	luax_pushboolean(L, instance->isCreated());
+	return 1;
+}
+
+int w_getWidth(lua_State *L)
+{
+	lua_pushinteger(L, instance->getWidth());
+	return 1;
+}
+
+int w_getHeight(lua_State *L)
+{
+	lua_pushinteger(L, instance->getHeight());
+	return 1;
+}
+
+int w_getDimensions(lua_State *L)
+{
+	lua_pushinteger(L, instance->getWidth());
+	lua_pushinteger(L, instance->getHeight());
+	return 2;
+}
+
+int w_setIcon(lua_State *L)
+{
+	image::ImageData *i = luax_checktype<image::ImageData>(L, 1, "ImageData", IMAGE_IMAGE_DATA_T);
+	instance->setIcon(i);
+	return 0;
+}
+
+int w_setTitle(lua_State *L)
+{
+	std::string title = luax_checkstring(L, 1);
+	instance->setWindowTitle(title);
+	return 0;
+}
+
+int w_getTitle(lua_State *L)
+{
+	luax_pushstring(L, instance->getWindowTitle());
+	return 1;
+}
+
+int w_hasFocus(lua_State *L)
+{
+	luax_pushboolean(L, instance->hasFocus());
+	return 1;
+}
+
+static const luaL_Reg functions[] =
+{
+	{ "checkMode", w_checkMode },
+	{ "setMode", w_setMode },
+	{ "getMode", w_getMode },
+	{ "getModes", w_getModes },
+	{ "toggleFullscreen", w_toggleFullscreen },
+	{ "isCreated", w_isCreated },
+	{ "getWidth", w_getWidth },
+	{ "getHeight", w_getHeight },
+	{ "getDimensions", w_getDimensions },
+	{ "setIcon", w_setIcon },
+	{ "setTitle", w_setTitle },
+	{ "getTitle", w_getTitle },
+	{ "hasFocus", w_hasFocus },
+	{ 0, 0 }
+};
+
+extern "C" int luaopen_love_window(lua_State *L)
+{
+	try
+	{
+		instance = sdl::Window::getSingleton();
+	}
+	catch (love::Exception &e)
+	{
+		return luaL_error(L, "%s", e.what());
+	}
+
+	WrappedModule w;
+	w.module = instance;
+	w.name = "window";
+	w.flags = MODULE_T;
+	w.functions = functions;
+	w.types = 0;
+
+	return luax_register_module(L, w);
+}
+
+} // window
+} // love

src/modules/window/wrap_Window.h

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2006-2013 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.
+ **/
+
+#ifndef LOVE_WINDOW_WRAP_WINDOW_H
+#define LOVE_WINDOW_WRAP_WINDOW_H
+
+#include "common/config.h"
+#include "common/runtime.h"
+
+namespace love
+{
+namespace window
+{
+
+int w_checkMode(lua_State *L);
+int w_setMode(lua_State *L);
+int w_getMode(lua_State *L);
+int w_getModes(lua_State *L);
+int w_toggleFullscreen(lua_State *L);
+int w_isCreated(lua_State *L);
+int w_getWidth(lua_State *L);
+int w_getHeight(lua_State *L);
+int w_getDimensions(lua_State *L);
+int w_setIcon(lua_State *L);
+int w_setTitle(lua_State *L);
+int w_getTitle(lua_State *L);
+int w_hasFocus(lua_State *L);
+extern "C" LOVE_EXPORT int luaopen_love_window(lua_State *L);
+
+} // window
+} // love
+
+#endif // LOVE_WINDOW_WRAP_WINDOW_H