base/config: add graphics.fullscreen option

4 files changed, 96 insertions, 6 deletions

diff --git a/src/base/config.cpp b/src/base/config.cpp
index 0bcac232..630ac3b6 100644
--- a/src/base/config.cpp
+++ b/src/base/config.cpp
@@ -31,12 +31,13 @@ namespace usdx
 		log4cpp::Category::getInstance("usdx.base.config");
 
 	Config::Config()
-		: graphics_resolution(800,600)
+		: graphics_fullscreen(false), graphics_resolution(800,600)
 	{
 		try {
 			// TODO: handling different paths
 			read_ini("config.ini", this->pt);
 
+			graphics_fullscreen = pt.get("graphics.fullscreen", graphics_fullscreen);
 			graphics_resolution = pt.get("graphics.resolution", graphics_resolution);
 		}
 		catch(...) {
@@ -60,6 +61,17 @@ namespace usdx
 		}
 	}
 
+	void Config::set_graphics_fullscreen(bool value)
+	{
+		graphics_fullscreen = value;
+		pt.put("graphics.fullscreen", value);
+	}
+
+	bool Config::get_graphics_fullscreen(void) const
+	{
+		return graphics_fullscreen;
+	}
+
 	void Config::set_graphics_resolution(Dimension<int> value)
 	{
 		graphics_resolution = value;
diff --git a/src/base/config.hpp b/src/base/config.hpp
index a71e26c7..83028400 100644
--- a/src/base/config.hpp
+++ b/src/base/config.hpp
@@ -29,6 +29,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include "utils/dimension.hpp"
 #include "utils/dimension_translator.hpp"
+#include "utils/bool_translator.hpp"
 
 namespace usdx
 {
@@ -47,6 +48,7 @@ namespace usdx
 		 * only accessible via getter/setter and setting a new value sould
 		 * update the apropriate entry in the property tree instance.
 		 */
+		bool graphics_fullscreen;
 		Dimension<int> graphics_resolution;
 
 	public:
@@ -56,6 +58,9 @@ namespace usdx
 		/* Save the current status of the configuration items. */
 		void save(void) const;
 
+		void set_graphics_fullscreen(bool value);
+		bool get_graphics_fullscreen(void) const;
+
 		void set_graphics_resolution(Dimension<int> value);
 		Dimension<int> get_graphics_resolution(void) const;
 	};
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index d0cb9926..1e82b6e2 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -145,12 +145,14 @@ namespace usdx
 			char env[] = "SDL_VIDEO_CENTERED=center";
 			SDL_putenv(env);
 
-			// create screen
-			display = SDL_SetVideoMode(get_width(),
-									   get_height(),
-									   24,
-									   SDL_OPENGL);
+			// fullscreen if requested from config
+			Uint32 flags = SDL_OPENGL;
+			if (config->get_graphics_fullscreen()) {
+				flags |= SDL_FULLSCREEN;
+			}
 
+			// create screen
+			display = SDL_SetVideoMode(get_width(), get_height(), 24, flags);
 			glViewport(0, 0, get_width(), get_height());
 
 			glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
diff --git a/src/utils/bool_translator.hpp b/src/utils/bool_translator.hpp
new file mode 100644
index 00000000..dad43f12
--- /dev/null
+++ b/src/utils/bool_translator.hpp
@@ -0,0 +1,71 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef BOOL_TRANSLATOR_HPP
+#define BOOL_TRANSLATOR_HPP
+
+#include <boost/algorithm/string/predicate.hpp>
+
+namespace usdx
+{
+	struct BoolTranslator
+	{
+		typedef std::string internal_type;
+		typedef bool external_type;
+
+		boost::optional<external_type> get_value(const internal_type& str)
+		{
+			if (!str.empty())
+			{
+				if (boost::algorithm::iequals(str, "true")
+					|| boost::algorithm::iequals(str, "yes")
+					|| str == "1")
+					return boost::optional<external_type>(true);
+				else
+					return boost::optional<external_type>(false);
+			}
+			else
+				return boost::optional<external_type>(boost::none);
+		}
+
+		boost::optional<internal_type> put_value(const external_type& b)
+		{
+			return boost::optional<internal_type>(b ? "true" : "false");
+		}
+	};
+};
+
+namespace boost {
+	namespace property_tree {
+
+		template<typename Ch, typename Traits, typename Alloc>
+		struct translator_between<std::basic_string< Ch, Traits, Alloc >, bool>
+		{
+			typedef usdx::BoolTranslator type;
+		};
+
+	};
+};
+
+#endif