- Refactored Lua C++ bindings

- Removed tolua++

Library/lua/glue/LuaGlobal.cpp

@@ -20,7 +20,7 @@
 #include "../LuaManager.h"
 #include "../../Litestep.h"
 
-static int Global_Log(lua_State* L)
+static int Global_Print(lua_State* L)
 {
 	// Modified version of luaB_print()
 	std::string message;
@@ -57,14 +57,7 @@ static int Global_Log(lua_State* L)
 	return 0;
 }
 
-static const luaL_reg TO_funcs[] =
-{
-	{ "LuaLog", Global_Log },
-	{ NULL, NULL }
-};
-
 void LuaManager::RegisterGlobal(lua_State* L)
 {
-	lua_register(L, "print", Global_Log);
-	luaL_register(L, "TO", TO_funcs);	// For backwards compatibility
+	lua_register(L, "print", Global_Print);
 }

Library/lua/glue/LuaMeasure.cpp

@@ -21,18 +21,23 @@
 #include "../../Measure.h"
 #include "../../MeterWindow.h"
 
-static int Measure_GetName(lua_State* L)
+inline CMeasure* GetSelf(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	return *(CMeasure**)lua_touserdata(L, 1);
+}
+
+static int GetName(lua_State* L)
+{
+	CMeasure* self = GetSelf(L);
 	const WCHAR* val = (const WCHAR*)self->GetName();
 	LuaManager::PushWide(L, val);
 
 	return 1;
 }
 
-static int Measure_GetOption(lua_State* L)
+static int GetOption(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	CMeterWindow* meterWindow = self->GetMeterWindow();
 	CConfigParser& parser = meterWindow->GetParser();
 
@@ -43,9 +48,9 @@ static int Measure_GetOption(lua_State* L)
 	return 1;
 }
 
-static int Measure_ReadString(lua_State* L)
+static int ReadString(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	CMeterWindow* meterWindow = self->GetMeterWindow();
 	CConfigParser& parser = meterWindow->GetParser();
 	
@@ -56,87 +61,89 @@ static int Measure_ReadString(lua_State* L)
 	return 1;
 }
 
-static int Measure_ReadNumber(lua_State* L)
+static int ReadNumber(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	CMeterWindow* meterWindow = self->GetMeterWindow();
 	CConfigParser& parser = meterWindow->GetParser();
 
 	std::wstring strTmp = LuaManager::ToWide(L, 2);
-	double value = parser.ReadFormula(self->GetName(), strTmp.c_str(), tolua_tonumber(L, 3, 0));
+	double value = parser.ReadFormula(self->GetName(), strTmp.c_str(), lua_tonumber(L, 3));
 
 	lua_pushnumber(L, value);
 	return 1;
 }
 
-static int Measure_Disable(lua_State* L)
+static int Disable(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	self->Disable();
 
 	return 0;
 }
 
-static int Measure_Enable(lua_State* L)
+static int Enable(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	self->Enable();
 
 	return 0;
 }
 
-static int Measure_GetValue(lua_State* L)
+static int GetValue(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	double val = (double)self->GetValue();
 	lua_pushnumber(L, (lua_Number)val);
 
 	return 1;
 }
 
-static int Measure_GetRelativeValue(lua_State* L)
+static int GetRelativeValue(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	double val = (double)self->GetRelativeValue();
 	lua_pushnumber(L, (lua_Number)val);
 
 	return 1;
 }
 
-static int Measure_GetValueRange(lua_State* L)
+static int GetValueRange(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	double val = (double)self->GetValueRange();
 	lua_pushnumber(L, (lua_Number)val);
 
 	return 1;
 }
 
-static int Measure_GetMinValue(lua_State* L)
+static int GetMinValue(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	double val = (double)self->GetMinValue();
 	lua_pushnumber(L, (lua_Number)val);
 
 	return 1;
 }
 
-static int Measure_GetMaxValue(lua_State* L)
+static int GetMaxValue(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
+	CMeasure* self = GetSelf(L);
 	double val = (double)self->GetMaxValue();
 	lua_pushnumber(L, (lua_Number)val);
 
 	return 1;
 }
 
-static int Measure_GetStringValue(lua_State* L)
+static int GetStringValue(lua_State* L)
 {
-	CMeasure* self = (CMeasure*)tolua_tousertype(L, 1, 0);
-	AUTOSCALE autoScale = ((AUTOSCALE)(int)tolua_tonumber(L, 2, AUTOSCALE_OFF));
-	double scale = (double)tolua_tonumber(L, 3, 1.0);
-	int decimals = (int)tolua_tonumber(L, 4, 0);
-	bool percentual = (bool)tolua_toboolean(L, 5, false);
+	CMeasure* self = GetSelf(L);
+
+	int top = lua_gettop(L);
+	AUTOSCALE autoScale = (top > 1) ? (AUTOSCALE)(int)lua_tonumber(L, 2) : AUTOSCALE_OFF;
+	double scale = (top > 2) ? lua_tonumber(L, 3) : 1.0;
+	int decimals = (int)lua_tonumber(L, 4);
+	bool percentual = lua_toboolean(L, 5);
 
 	const WCHAR* val = self->GetStringValue(autoScale, scale, decimals, percentual);
 	LuaManager::PushWide(L, val);
@@ -146,21 +153,24 @@ static int Measure_GetStringValue(lua_State* L)
 
 void LuaManager::RegisterMeasure(lua_State* L)
 {
-	tolua_usertype(L, "CMeasure");
-	tolua_cclass(L, "CMeasure", "CMeasure", "", NULL);
+	const luaL_reg functions[] =
+	{
+		{ "GetName", GetName },
+		{ "GetOption", GetOption },
+		{ "ReadString", ReadString },
+		{ "ReadNumber", ReadNumber },
+		{ "Disable", Disable },
+		{ "Enable", Enable },
+		{ "GetValue", GetValue },
+		{ "GetRelativeValue", GetRelativeValue },
+		{ "GetValueRange", GetValueRange },
+		{ "GetMinValue", GetMinValue },
+		{ "GetMaxValue", GetMaxValue },
+		{ "GetStringValue", GetStringValue },
+		{ NULL, NULL }
+	};
 
-	tolua_beginmodule(L, "CMeasure");
-	tolua_function(L, "GetName", Measure_GetName);
-	tolua_function(L, "GetOption", Measure_GetOption);
-	tolua_function(L, "ReadString", Measure_ReadString);
-	tolua_function(L, "ReadNumber", Measure_ReadNumber);
-	tolua_function(L, "Disable", Measure_Disable);
-	tolua_function(L, "Enable", Measure_Enable);
-	tolua_function(L, "GetValue", Measure_GetValue);
-	tolua_function(L, "GetRelativeValue", Measure_GetRelativeValue);
-	tolua_function(L, "GetValueRange", Measure_GetValueRange);
-	tolua_function(L, "GetMinValue", Measure_GetMinValue);
-	tolua_function(L, "GetMaxValue", Measure_GetMaxValue);
-	tolua_function(L, "GetStringValue", Measure_GetStringValue);
-	tolua_endmodule(L);
+	luaL_register(L, "CMeasure", functions);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
 }

Library/lua/glue/LuaMeter.cpp

@@ -21,18 +21,23 @@
 #include "../../Meter.h"
 #include "../../MeterString.h"
 
-static int Meter_GetName(lua_State* L)
+inline CMeter* GetSelf(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
+	return *(CMeter**)lua_touserdata(L, 1);
+}
+
+static int GetName(lua_State* L)
+{
+	CMeter* self = GetSelf(L);
 	const WCHAR* val = (const WCHAR*)self->GetName();
 	LuaManager::PushWide(L, val);
 
 	return 1;
 }
 
-static int Meter_GetOption(lua_State* L)
+static int GetOption(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
+	CMeter* self = GetSelf(L);
 	CMeterWindow* meterWindow = self->GetMeterWindow();
 	CConfigParser& parser = meterWindow->GetParser();
 
@@ -43,100 +48,96 @@ static int Meter_GetOption(lua_State* L)
 	return 1;
 }
 
-static int Meter_GetW(lua_State* L)
+static int GetW(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetW();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeter* self = GetSelf(L);
+	lua_pushnumber(L, self->GetW());
 
 	return 1;
 }
 
-static int Meter_GetH(lua_State* L)
+static int GetH(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetH();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeter* self = GetSelf(L);
+	lua_pushnumber(L, self->GetH());
 
 	return 1;
 
 }
 
-static int Meter_GetX(lua_State* L)
+static int GetX(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	bool abs = ((bool)tolua_toboolean(L, 2, false));
-	int val = (int)self->GetX(abs);
-	lua_pushnumber(L, (lua_Number)val);
+	CMeter* self = GetSelf(L);
+	bool abs = (bool)lua_toboolean(L, 2);
+	lua_pushnumber(L, self->GetX(abs));
 
 	return 1;
 }
 
-static int Meter_GetY(lua_State* L)
+static int GetY(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	bool abs = ((bool)tolua_toboolean(L, 2, false));
-	int val = (int)self->GetY(abs);
-	lua_pushnumber(L, (lua_Number)val);
+	CMeter* self = GetSelf(L);
+	bool abs = (bool)lua_toboolean(L, 2);
+	lua_pushnumber(L, self->GetY(abs));
 
 	return 1;
 }
 
-static int Meter_SetW(lua_State* L)
+static int SetW(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int w = (int)tolua_tonumber(L, 2, 0);
+	CMeter* self = GetSelf(L);
+	int w = (int)lua_tonumber(L, 2);
 	self->SetW(w);
 
 	return 0;
 }
 
-static int Meter_SetH(lua_State* L)
+static int SetH(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int h = (int)tolua_tonumber(L, 2, 0);
+	CMeter* self = GetSelf(L);
+	int h = (int)lua_tonumber(L, 2);
 	self->SetH(h);
 
 	return 0;
 }
 
-static int Meter_SetX(lua_State* L)
+static int SetX(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int x = (int)tolua_tonumber(L, 2, 0);
+	CMeter* self = GetSelf(L);
+	int x = (int)lua_tonumber(L, 2);
 	self->SetX(x);
 
 	return 0;
 }
 
-static int Meter_SetY(lua_State* L)
+static int SetY(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
-	int y = (int)tolua_tonumber(L, 2, 0);
+	CMeter* self = GetSelf(L);
+	int y = (int)lua_tonumber(L, 2);
 	self->SetY(y);
 
 	return 0;
 }
 
-static int Meter_Hide(lua_State* L)
+static int Hide(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
+	CMeter* self = GetSelf(L);
 	self->Hide();
 
 	return 0;
 }
 
-static int Meter_Show(lua_State* L)
+static int Show(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
+	CMeter* self = GetSelf(L);
 	self->Show();
 
 	return 0;
 }
 
-static int Meter_SetText(lua_State* L)
+static int SetText(lua_State* L)
 {
-	CMeter* self = (CMeter*)tolua_tousertype(L, 1, 0);
+	CMeter* self = GetSelf(L);
 	
 	if (CMeterString* stringMeter = dynamic_cast<CMeterString*>(self))
 	{
@@ -149,22 +150,25 @@ static int Meter_SetText(lua_State* L)
 
 void LuaManager::RegisterMeter(lua_State* L)
 {
-	tolua_usertype(L, "CMeter");
-	tolua_cclass(L, "CMeter", "CMeter", "", NULL);
+	const luaL_reg functions[] =
+	{
+		{ "GetName", GetName },
+		{ "GetOption", GetOption },
+		{ "GetW", GetW },
+		{ "GetH", GetH },
+		{ "GetX", GetX },
+		{ "GetY", GetY },
+		{ "SetW", SetW },
+		{ "SetH", SetH },
+		{ "SetX", SetX },
+		{ "SetY", SetY },
+		{ "Hide", Hide },
+		{ "Show", Show },
+		{ "SetText", SetText },
+		{ NULL, NULL }
+	};
 
-	tolua_beginmodule(L, "CMeter");
-	tolua_function(L, "GetName", Meter_GetName);
-	tolua_function(L, "GetOption", Meter_GetOption);
-	tolua_function(L, "GetW", Meter_GetW);
-	tolua_function(L, "GetH", Meter_GetH);
-	tolua_function(L, "GetX", Meter_GetX);
-	tolua_function(L, "GetY", Meter_GetY);
-	tolua_function(L, "SetW", Meter_SetW);
-	tolua_function(L, "SetH", Meter_SetH);
-	tolua_function(L, "SetX", Meter_SetX);
-	tolua_function(L, "SetY", Meter_SetY);
-	tolua_function(L, "Hide", Meter_Hide);
-	tolua_function(L, "Show", Meter_Show);
-	tolua_function(L, "SetText", Meter_SetText);
-	tolua_endmodule(L);
+	luaL_register(L, "CMeter", functions);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
 }

Library/lua/glue/LuaMeterWindow.cpp

@@ -22,51 +22,62 @@
 #include "../../MeterWindow.h"
 #include "../../MeterString.h"
 
-static int MeterWindow_Bang(lua_State* L)
+extern CRainmeter* Rainmeter;
+
+inline CMeterWindow* GetSelf(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	return *(CMeterWindow**)lua_touserdata(L, 1);
+}
+
+static int Bang(lua_State* L)
+{
+	CMeterWindow* self = GetSelf(L);
 	std::wstring strTmp = LuaManager::ToWide(L, 2);
 
 	CConfigParser& parser = self->GetParser();
 	parser.ReplaceVariables(strTmp);
-	self->GetMainObject()->ExecuteCommand(strTmp.c_str(), self);
+	Rainmeter->ExecuteCommand(strTmp.c_str(), self);
 
 	return 0;
 }
 
-static int MeterWindow_GetMeter(lua_State* L)
+static int GetMeter(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = GetSelf(L);
 	const std::wstring meterName = LuaManager::ToWide(L, 2);
 
 	CMeter* meter = self->GetMeter(meterName);
-	if (!meter)
+	if (meter)
 	{
-		std::wstring error = L"Script: No such meter as ";
-		error += meterName;
-		Log(LOG_ERROR, error.c_str());
-		return 0;
+		*(CMeter**)lua_newuserdata(L, sizeof(CMeter*)) = meter;
+		lua_getglobal(L, "CMeter");
+		lua_setmetatable(L, -2);
+		return 1;
 	}
 
-	tolua_pushusertype(L, meter, "CMeter");
-
-	return 1;
+	return 0;
 }
 
-static int MeterWindow_GetMeasure(lua_State* L)
+static int GetMeasure(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = GetSelf(L);
 	const std::wstring measureName = LuaManager::ToWide(L, 2);
 
-	CMeasure* val = self->GetMeasure(measureName);
-	tolua_pushusertype(L, (void*)val, "CMeasure");
+	CMeasure* measure = self->GetMeasure(measureName);
+	if (measure)
+	{
+		*(CMeasure**)lua_newuserdata(L, sizeof(CMeasure*)) = measure;
+		lua_getglobal(L, "CMeasure");
+		lua_setmetatable(L, -2);
+		return 1;
+	}
 
-	return 1;
+	return 0;
 }
 
-static int MeterWindow_GetVariable(lua_State* L)
+static int GetVariable(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = GetSelf(L);
 	std::wstring strTmp = LuaManager::ToWide(L, 2);
 
 	if (self->GetParser().GetVariable(strTmp, strTmp))
@@ -74,15 +85,13 @@ static int MeterWindow_GetVariable(lua_State* L)
 		LuaManager::PushWide(L, strTmp.c_str());
 		return 1;
 	}
-	else
-	{
-		return 0;
-	}
+
+	return 0;
 }
 
-static int MeterWindow_ReplaceVariables(lua_State* L)
+static int ReplaceVariables(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = GetSelf(L);
 	std::wstring strTmp = LuaManager::ToWide(L, 2);
 
 	self->GetParser().ReplaceVariables(strTmp);
@@ -91,9 +100,9 @@ static int MeterWindow_ReplaceVariables(lua_State* L)
 	return 1;
 }
 
-static int MeterWindow_ParseFormula(lua_State* L)
+static int ParseFormula(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = GetSelf(L);
 	std::wstring strTmp = LuaManager::ToWide(L, 2);
 
 	double result;
@@ -106,68 +115,62 @@ static int MeterWindow_ParseFormula(lua_State* L)
 	return 0;
 }
 
-static int MeterWindow_MoveWindow(lua_State* L)
+static int MoveWindow(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int x = (int)tolua_tonumber(L, 2, 0);
-	int y = (int)tolua_tonumber(L, 3, 0);
-
+	CMeterWindow* self = GetSelf(L);
+	int x = (int)lua_tonumber(L, 2);
+	int y = (int)lua_tonumber(L, 3);
 	self->MoveWindow(x, y);
 
 	return 0;
 }
 
-static int MeterWindow_FadeWindow(lua_State* L)
+static int FadeWindow(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int from = (int)tolua_tonumber(L, 2, 0);
-	int to = (int)tolua_tonumber(L, 3, 0);
+	CMeterWindow* self = GetSelf(L);
+	int from = (int)lua_tonumber(L, 2);
+	int to = (int)lua_tonumber(L, 3);
 	self->FadeWindow(from, to);
 
 	return 0;
 }
 
-static int MeterWindow_GetW(lua_State* L)
+static int GetW(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetW();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeterWindow* self = GetSelf(L);
+	lua_pushnumber(L, self->GetW());
 
 	return 1;
 }
 
-static int MeterWindow_GetH(lua_State* L)
+static int GetH(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetH();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeterWindow* self = GetSelf(L);
+	lua_pushnumber(L, self->GetH());
 
 	return 1;
 }
 
-static int MeterWindow_GetX(lua_State* L)
+static int GetX(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetX();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeterWindow* self = GetSelf(L);
+	lua_pushnumber(L, self->GetX());
 
 	return 1;
 }
 
-static int MeterWindow_GetY(lua_State* L)
+static int GetY(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
-	int val = (int)self->GetY();
-	lua_pushnumber(L, (lua_Number)val);
+	CMeterWindow* self = GetSelf(L);
+	lua_pushnumber(L, self->GetY());
 
 	return 1;
 }
 
-static int MeterWindow_MakePathAbsolute(lua_State* L)
+static int MakePathAbsolute(lua_State* L)
 {
-	CMeterWindow* self = (CMeterWindow*)tolua_tousertype(L, 1, 0);
+	CMeterWindow* self = *(CMeterWindow**)lua_touserdata(L, 1);
 	std::wstring path = LuaManager::ToWide(L, 2);
-
 	self->MakePathAbsolute(path);
 	LuaManager::PushWide(L, path.c_str());
 
@@ -176,22 +179,25 @@ static int MeterWindow_MakePathAbsolute(lua_State* L)
 
 void LuaManager::RegisterMeterWindow(lua_State* L)
 {
-	tolua_usertype(L, "CMeterWindow");
-	tolua_cclass(L, "CMeterWindow", "CMeterWindow", "", NULL);
+	const luaL_reg functions[] =
+	{
+		{ "Bang", Bang },
+		{ "GetMeter", GetMeter },
+		{ "GetMeasure", GetMeasure },
+		{ "GetVariable", GetVariable },
+		{ "ReplaceVariables", ReplaceVariables },
+		{ "ParseFormula", ParseFormula },
+		{ "MoveWindow", MoveWindow },
+		{ "FadeWindow", FadeWindow },
+		{ "GetW", GetW },
+		{ "GetH", GetH },
+		{ "GetX", GetX },
+		{ "GetY", GetY },
+		{ "MakePathAbsolute", MakePathAbsolute },
+		{ NULL, NULL }
+	};
 
-	tolua_beginmodule(L, "CMeterWindow");
-	tolua_function(L, "Bang", MeterWindow_Bang);
-	tolua_function(L, "GetMeter", MeterWindow_GetMeter);
-	tolua_function(L, "GetMeasure", MeterWindow_GetMeasure);
-	tolua_function(L, "GetVariable", MeterWindow_GetVariable);
-	tolua_function(L, "ReplaceVariables", MeterWindow_ReplaceVariables);
-	tolua_function(L, "ParseFormula", MeterWindow_ParseFormula);
-	tolua_function(L, "MoveWindow", MeterWindow_MoveWindow);
-	tolua_function(L, "FadeWindow", MeterWindow_FadeWindow);
-	tolua_function(L, "GetW", MeterWindow_GetW);
-	tolua_function(L, "GetH", MeterWindow_GetH);
-	tolua_function(L, "GetX", MeterWindow_GetX);
-	tolua_function(L, "GetY", MeterWindow_GetY);
-	tolua_function(L, "MakePathAbsolute", MeterWindow_MakePathAbsolute);
-	tolua_endmodule(L);
+	luaL_register(L, "CMeterWindow", functions);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
 }