From 16ed1f9e7fd5900744115b01b71fbd008f7d9054 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sat, 25 Jan 2014 17:02:27 +0200
Subject: [PATCH] Lua: Cleanup gui-rqueue.cpp

---
 src/lua/gui-rqueue.cpp | 69 ++++++++++++------------------------------
 src/lua/sysrc.lua      | 39 ++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/lua/gui-rqueue.cpp b/src/lua/gui-rqueue.cpp
index 78a43e40..aa9839bc 100644
--- a/src/lua/gui-rqueue.cpp
+++ b/src/lua/gui-rqueue.cpp
@@ -19,6 +19,8 @@ namespace
 			size_t s = rqueue.get_object_count();
 			return (stringfmt() << s << " " << ((s != 1) ? "objects" : "object")).str();
 		}
+		static int create(lua::state& L, lua::parameters& P);
+		static int setnull(lua::state& L, lua::parameters& P);
 		int run(lua::state& L, const std::string& fname)
 		{
 			if(!lua_render_ctx)
@@ -107,60 +109,29 @@ namespace
 		lctx.height = height;
 	}
 
-	lua::fnptr gui_rq_run(lua_func_misc, "gui.renderq_run", [](lua::state& L, const std::string& fname)
-		-> int {
-		if(!lua_render_ctx)
-			return 0;
-		if(lua::_class<lua_renderqueue>::is(L, 1)) {
-			return lua::_class<lua_renderqueue>::get(L, 1, fname.c_str())->run(L, fname);
-		} else
-			throw std::runtime_error("Expected RENDERCTX as argument 1 for gui.renderq_run.");
-		return 0;
-	});
-
-	lua::fnptr gui_srepaint(lua_func_misc, "gui.synchronous_repaint", [](lua::state& L,
-		const std::string& fname) -> int {
-		if(lua::_class<lua_renderqueue>::is(L, 1)) {
-			return lua::_class<lua_renderqueue>::get(L, 1, fname.c_str())->synchronous_repaint(L, fname);
-		} else
-			throw std::runtime_error("Expected RENDERCTX as argument 1 for gui.renderq_run.");
-		return 0;
-	});
-
-	lua::fnptr gui_rq_clear(lua_func_misc, "gui.renderq_clear", [](lua::state& L,
-		const std::string& fname) -> int {
-		if(lua::_class<lua_renderqueue>::is(L, 1)) {
-			return lua::_class<lua_renderqueue>::get(L, 1, fname.c_str())->clear(L, fname);
-		} else
-			throw std::runtime_error("Expected RENDERCTX as argument 1 for gui.renderq_clear.");
-		return 0;
-	});
-
-	lua::fnptr gui_rq_new(lua_func_misc, "gui.renderq_new", [](lua::state& L, const std::string& fname)
-		-> int {
-		int32_t x = L.get_numeric_argument<int32_t>(1, fname.c_str());
-		int32_t y = L.get_numeric_argument<int32_t>(2, fname.c_str());
+	int lua_renderqueue::create(lua::state& L, lua::parameters& P)
+	{
+		auto x = P.arg<int32_t>();
+		auto y = P.arg<int32_t>();
 		lua::_class<lua_renderqueue>::create(L, x, y);
 		return 1;
-	});
+	}
 
-	lua::fnptr gui_rq_set(lua_func_misc, "gui.renderq_set", [](lua::state& L, const std::string& fname)
-		-> int {
-		if(lua::_class<lua_renderqueue>::is(L, 1)) {
-			return lua::_class<lua_renderqueue>::get(L, 1, fname.c_str())->set(L, fname);
-		} else if(L.type(1) == LUA_TNIL || L.type(1) == LUA_TNONE) {
-			if(redirect && last == lua_render_ctx)
-				//If there is valid redirect, undo it.
-				lua_render_ctx = saved;
-			redirect = false;
-			last = NULL;
-			saved = NULL;
-		} else
-			throw std::runtime_error("Expected RENDERCTX or nil as argument 1 for " + fname);
+	int lua_renderqueue::setnull(lua::state& L, lua::parameters& P)
+	{
+		if(redirect && last == lua_render_ctx)
+			//If there is valid redirect, undo it.
+			lua_render_ctx = saved;
+		redirect = false;
+		last = NULL;
+		saved = NULL;
 		return 0;
-	});
+	}
 
-	lua::_class<lua_renderqueue> class_lua_renderqueue(lua_class_gui, "RENDERCTX", {}, {
+	lua::_class<lua_renderqueue> class_lua_renderqueue(lua_class_gui, "RENDERCTX", {
+		{"new", lua_renderqueue::create},
+		{"setnull", lua_renderqueue::setnull},
+	}, {
 		{"run", &lua_renderqueue::run},
 		{"synchronous_repaint", &lua_renderqueue::synchronous_repaint},
 		{"clear", &lua_renderqueue::clear},
diff --git a/src/lua/sysrc.lua b/src/lua/sysrc.lua
index 80f186b0..e928d726 100644
--- a/src/lua/sysrc.lua
+++ b/src/lua/sysrc.lua
@@ -38,3 +38,42 @@ callback=_lookup_class("CALLBACKS_LIST").new();
 memory.map_structure=_lookup_class("MMAP_STRUCT").new;
 zip.create=_lookup_class("ZIPWRITER").new;
 gui.tilemap=_lookup_class("TILEMAP").new;
+gui.renderq_new=_lookup_class("RENDERCTX").new;
+
+local do_arg_err = function(what, n, name)
+	error("Expected "..what.." as argument #"..n.." of "..name);
+end
+
+gui.renderq_set=function(o, ...)
+	if type(o) == "nil" then
+		_lookup_class("RENDERCTX").setnull();
+	elseif identify_class(o) == "RENDERCTX" then
+		o:set(...);
+	else
+		do_arg_err("RENDERCTX or nil", 1, "gui.renderq_set");
+	end
+end
+
+gui.renderq_run=function(o, ...)
+	if identify_class(o) == "RENDERCTX" then
+		o:run(...);
+	else
+		do_arg_err("RENDERCTX", 1, "gui.renderq_run");
+	end
+end
+
+gui.synchronous_repaint=function(o, ...)
+	if identify_class(o) == "RENDERCTX" then
+		o:synchronous_repaint(...);
+	else
+		do_arg_err("RENDERCTX", 1, "gui.synchronous_repaint");
+	end
+end
+
+gui.renderq_clear=function(o, ...)
+	if identify_class(o) == "RENDERCTX" then
+		o:clear(...);
+	else
+		do_arg_err("RENDERCTX", 1, "gui.renderq_clear");
+	end
+end