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

Script: Add Unicode support

Browse Source 
If the script file is UTF-8 encoded, all Lua strings are converted to/from as if they were UTF-8. Otherwise things continue to work as they have until now. Additionally, UTF-8 scripts cannot use deprecated features at all (PROPERTIES, GetStringValue).
This commit is contained in:
Birunthan Mohanathas
2013-08-06 20:43:57 +03:00
parent 5fcf4b785d
commit 6560518037
8 changed files with 121 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Library/lua/LuaManager.cpp
View File

@@ -24,6 +24,8 @@
int LuaManager::c_RefCount = 0;
lua_State* LuaManager::c_State = 0;
bool LuaManager::s_UnicodeState = false;
void LuaManager::Initialize()
{
if (c_State == nullptr)
@@ -57,8 +59,9 @@ void LuaManager::Finalize()
}
}
void LuaManager::ReportErrors(lua_State* L, const std::wstring& file)
void LuaManager::ReportErrors(const std::wstring& file)
{
lua_State* L = c_State;
const char* error = lua_tostring(L, -1);
lua_pop(L, 1);
@@ -70,25 +73,31 @@ void LuaManager::ReportErrors(lua_State* L, const std::wstring& file)
}
std::wstring str(file, file.find_last_of(L'\\') + 1);
str += StringUtil::Widen(error);
str += s_UnicodeState ? StringUtil::WidenUTF8(error) : StringUtil::Widen(error);
LogErrorF(L"Script: %s", str.c_str());
}
void LuaManager::PushWide(lua_State* L, const WCHAR* str)
void LuaManager::PushWide(const WCHAR* str)
{
const std::string narrowStr = StringUtil::Narrow(str);
lua_State* L = c_State;
const std::string narrowStr = s_UnicodeState ?
StringUtil::NarrowUTF8(str) : StringUtil::Narrow(str);
lua_pushlstring(L, narrowStr.c_str(), narrowStr.length());
}
void LuaManager::PushWide(lua_State* L, const std::wstring& str)
void LuaManager::PushWide(const std::wstring& str)
{
const std::string narrowStr = StringUtil::Narrow(str);
lua_State* L = c_State;
const std::string narrowStr = s_UnicodeState ?
StringUtil::NarrowUTF8(str) : StringUtil::Narrow(str);
lua_pushlstring(L, narrowStr.c_str(), narrowStr.length());
}
std::wstring LuaManager::ToWide(lua_State* L, int narg)
std::wstring LuaManager::ToWide(int narg)
{
lua_State* L = c_State;
size_t strLen = 0;
const char* str = lua_tolstring(L, narg, &strLen);
return StringUtil::Widen(str, (int)strLen);
return s_UnicodeState ?
StringUtil::WidenUTF8(str, (int)strLen) : StringUtil::Widen(str, (int)strLen);
}