From a3c453c403c72e6c98c3a9e0a3eba849d4cedd38 Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Wed, 16 Jul 2014 23:34:09 +0200
Subject: [PATCH] CLuaInstance: Add function checkMagicMask() for use the color
 constants

- Use checkMagicMask() for colors in CComponents-Lua functions
---
 src/gui/luainstance.cpp | 28 +++++++++++++++++++++++-----
 src/gui/luainstance.h   |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp
index 5410c8b10..70b549038 100644
--- a/src/gui/luainstance.cpp
+++ b/src/gui/luainstance.cpp
@@ -347,6 +347,14 @@ void CLuaInstance::functionDeprecated(lua_State *L, const char* oldFunc, const c
 					ar.short_src, ar.currentline);
 }
 
+lua_Unsigned CLuaInstance::checkMagicMask(lua_Unsigned &col)
+{
+	if ((col & MAGIC_MASK) == MAGIC_COLOR)
+		/* use the color constants */
+		col = CFrameBuffer::getInstance()->realcolor[col & 0x000000ff];
+	return col;
+}
+
 #define SET_VAR1(NAME) \
 	lua_pushinteger(lua, NAME); \
 	lua_setglobal(lua, #NAME);
@@ -550,9 +558,7 @@ int CLuaInstance::PaintBox(lua_State *L)
 		w = W->fbwin->dx - x;
 	if (h < 0 || y + h > W->fbwin->dy)
 		h = W->fbwin->dy - y;
-	/* use the color constants */
-	if ((c & MAGIC_MASK) == MAGIC_COLOR)
-		c = CFrameBuffer::getInstance()->realcolor[c & 0x000000ff];
+	checkMagicMask(c);
 	W->fbwin->paintBoxRel(x, y, w, h, c, radius, corner);
 	return 0;
 }
@@ -666,8 +672,7 @@ int CLuaInstance::RenderString(lua_State *L)
 		if (rwidth < w)
 			x += (w - rwidth) / 2;
 	}
-	if ((c & MAGIC_MASK) == MAGIC_COLOR)
-		c = CFrameBuffer::getInstance()->realcolor[c & 0x000000ff];
+	checkMagicMask(c);
 	if (boxh > -1) /* if boxh < 0, don't paint string */
 		W->fbwin->RenderString(g_Font[f], x, y, w, text, c, boxh);
 	lua_pushinteger(L, rwidth); /* return renderwidth */
@@ -1500,6 +1505,10 @@ int CLuaInstance::CWindowNew(lua_State *L)
 	tableLookup(L, "btnYellow", btnYellow);
 	tableLookup(L, "btnBlue", btnBlue);
 
+	checkMagicMask(color_frame);
+	checkMagicMask(color_body);
+	checkMagicMask(color_shadow);
+
 	tmp1 = "true";
 	tableLookup(L, "show_header"  , tmp1);
 	bool show_header = (tmp1 == "true" || tmp1 == "show" || tmp1 == "yes");
@@ -1793,6 +1802,11 @@ int CLuaInstance::ComponentsTextNew(lua_State *L)
 	tableLookup(L, "color_body"  , color_body);
 	tableLookup(L, "color_shadow", color_shadow);
 
+	checkMagicMask(color_text);
+	checkMagicMask(color_frame);
+	checkMagicMask(color_body);
+	checkMagicMask(color_shadow);
+
 	if (!tmpMode.empty()) {
 		table_key txt_align[] = {
 			{ "ALIGN_AUTO_WIDTH",		CTextBox::AUTO_WIDTH },
@@ -1974,6 +1988,10 @@ int CLuaInstance::CPictureNew(lua_State *L)
 	tableLookup(L, "color_shadow"     , color_shadow);
 	tableLookup(L, "transparency"     , transparency);
 
+	checkMagicMask(color_frame);
+	checkMagicMask(color_background);
+	checkMagicMask(color_shadow);
+
 	CComponentsForm* pw = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
 
 	CLuaPicture **udata = (CLuaPicture **) lua_newuserdata(L, sizeof(CLuaPicture *));
diff --git a/src/gui/luainstance.h b/src/gui/luainstance.h
index 822735e49..d15541e25 100644
--- a/src/gui/luainstance.h
+++ b/src/gui/luainstance.h
@@ -178,6 +178,7 @@ private:
 	void registerFunctions();
 
 	static void functionDeprecated(lua_State *L, const char* oldFunc, const char* newFunc);
+	static lua_Unsigned checkMagicMask(lua_Unsigned &col);
 
 	static int NewWindow(lua_State *L);
 	static int PaintBox(lua_State *L);