chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Lua:

Browse Source 
- Removed GetValue() (which has never worked) and deprecated GetStringValue(). The measure value should be returned on Update() now.
- Some related tweaks and cosmetic changes
This commit is contained in:
Birunthan Mohanathas
2011-07-06 10:21:18 +00:00
parent 4389edb8c1
commit fa67b07a62
7 changed files with 363 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Library/lua/LuaManager.cpp
View File

@@ -19,35 +19,33 @@
#include "../Rainmeter.h"
int LuaManager::c_RefCount = 0;
lua_State* LuaManager::c_pState = 0;
lua_State* LuaManager::c_State = 0;
void LuaManager::Init()
{
if (c_pState == NULL)
if (c_State == NULL)
{
// Initialize Lua
c_pState = lua_open();
c_State = lua_open();
// Load Lua base libraries
luaL_openlibs(c_pState);
luaL_openlibs(c_State);
// Initialize tolua
tolua_open(c_pState);
tolua_open(c_State);
// Register custom types and functions
RegisterTypes(c_pState);
tolua_module(c_pState, NULL, 0);
tolua_beginmodule(c_pState, NULL);
RegisterGlobal(c_pState);
RegisterMeasure(c_pState);
RegisterGroup(c_pState);
RegisterMeasure(c_pState);
RegisterMeter(c_pState);
RegisterMeterWindow(c_pState);
RegisterRainmeter(c_pState);
RegisterMeterString(c_pState);
tolua_endmodule(c_pState);
tolua_module(c_State, NULL, 0);
tolua_beginmodule(c_State, NULL);
RegisterGlobal(c_State);
RegisterMeasure(c_State);
RegisterGroup(c_State);
RegisterMeasure(c_State);
RegisterMeter(c_State);
RegisterMeterWindow(c_State);
RegisterRainmeter(c_State);
RegisterMeterString(c_State);
tolua_endmodule(c_State);
}
++c_RefCount;
@@ -60,17 +58,13 @@ void LuaManager::CleanUp()
--c_RefCount;
}
if (c_RefCount == 0 && c_pState != NULL)
if (c_RefCount == 0 && c_State != NULL)
{
lua_close(c_pState);
c_pState = NULL;
lua_close(c_State);
c_State = NULL;
}
}
void LuaManager::RegisterTypes(lua_State* L)
{
}
void LuaManager::ReportErrors(lua_State* L)
{
LuaLog(LOG_ERROR, "Script: %s", lua_tostring(L, -1));