From dc8040ee04ef2819c99d55dc74e9fe56d4ba4d1e Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 6 Jul 2015 08:03:40 +0000 Subject: MirLua: !api break - scripts will be load after ME_SYSTEM_MODULESLOADED event - removed event functions OnModulesLoaded, OnPreShutdown from m_core - removed OnMsgToolBarLoaded from m_msg_buttonsbar - removed OnTopToolBarLoaded from m_toptoolbar - fixed examples git-svn-id: http://svn.miranda-ng.org/main/trunk@14495 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/src/m_core.cpp | 42 --------------------------------- plugins/MirLua/src/m_msg_buttonsbar.cpp | 23 +----------------- plugins/MirLua/src/m_toptoolbar.cpp | 21 ----------------- plugins/MirLua/src/main.cpp | 10 ++++---- plugins/MirLua/src/version.h | 4 ++-- 5 files changed, 8 insertions(+), 92 deletions(-) (limited to 'plugins/MirLua/src') diff --git a/plugins/MirLua/src/m_core.cpp b/plugins/MirLua/src/m_core.cpp index a61ed05431..af33825e13 100644 --- a/plugins/MirLua/src/m_core.cpp +++ b/plugins/MirLua/src/m_core.cpp @@ -127,46 +127,6 @@ static int lua_UnhookEvent(lua_State *L) return 1; } -static int lua_OnModulesLoaded(lua_State *L) -{ - if (!lua_isfunction(L, 1)) - { - lua_pushlightuserdata(L, NULL); - return 1; - } - - lua_pushvalue(L, 1); - int ref = luaL_ref(L, LUA_REGISTRYINDEX); - - HANDLE res = ::HookEventObjParam(ME_SYSTEM_MODULESLOADED, CMLua::HookEventObjParam, L, ref); - lua_pushlightuserdata(L, res); - - Hooks.insert(res); - HookRefs.insert(new HandleRefParam(L, res, ref)); - - return 1; -} - -static int lua_OnPreShutdown(lua_State *L) -{ - if (!lua_isfunction(L, 1)) - { - lua_pushlightuserdata(L, NULL); - return 1; - } - - lua_pushvalue(L, 1); - int ref = luaL_ref(L, LUA_REGISTRYINDEX); - - HANDLE res = ::HookEventObjParam(ME_SYSTEM_PRESHUTDOWN, CMLua::HookEventObjParam, L, ref); - lua_pushlightuserdata(L, res); - - Hooks.insert(res); - HookRefs.insert(new HandleRefParam(L, res, ref)); - - return 1; -} - static INT_PTR ServiceFunctionObjParam(void *obj, WPARAM wParam, LPARAM lParam, LPARAM param) { lua_State *L = (lua_State*)obj; @@ -278,8 +238,6 @@ luaL_Reg coreApi[] = { "HookEvent", lua_HookEvent }, { "UnhookEvent", lua_UnhookEvent }, - { "OnModulesLoaded", lua_OnModulesLoaded }, - { "OnPreShutdown", lua_OnPreShutdown }, { "CreateServiceFunction", lua_CreateServiceFunction }, { "DestroyServiceFunction", lua_DestroyServiceFunction }, diff --git a/plugins/MirLua/src/m_msg_buttonsbar.cpp b/plugins/MirLua/src/m_msg_buttonsbar.cpp index a570fdd620..1789c5bca1 100644 --- a/plugins/MirLua/src/m_msg_buttonsbar.cpp +++ b/plugins/MirLua/src/m_msg_buttonsbar.cpp @@ -84,26 +84,6 @@ static int lua_RemoveButton(lua_State *L) return 1; } -static int lua_OnMsgToolBarLoaded(lua_State *L) -{ - if (!lua_isfunction(L, 1)) - { - lua_pushlightuserdata(L, NULL); - return 1; - } - - lua_pushvalue(L, 1); - int ref = luaL_ref(L, LUA_REGISTRYINDEX); - - HANDLE res = ::HookEventObjParam(ME_MSG_TOOLBARLOADED, CMLua::HookEventObjParam, L, ref); - lua_pushlightuserdata(L, res); - - Hooks.insert(res); - HookRefs.insert(new HandleRefParam(L, res, ref)); - - return 1; -} - int ButtonPressedHookEventObjParam(void *obj, WPARAM wParam, LPARAM lParam, LPARAM param) { lua_State *L = (lua_State*)obj; @@ -162,8 +142,7 @@ static luaL_Reg msgbuttinsbarApi[] = { "AddButton", lua_AddButton }, { "ModifyButton", lua_ModifyButton }, { "RemoveButton", lua_RemoveButton }, - - { "OnMsgToolBarLoaded", lua_OnMsgToolBarLoaded }, + { "OnMsgToolBarButtonPressed", lua_OnMsgToolBarButtonPressed }, { NULL, NULL } diff --git a/plugins/MirLua/src/m_toptoolbar.cpp b/plugins/MirLua/src/m_toptoolbar.cpp index 3e26f962dc..14eb67ae76 100644 --- a/plugins/MirLua/src/m_toptoolbar.cpp +++ b/plugins/MirLua/src/m_toptoolbar.cpp @@ -90,31 +90,10 @@ static int lua_RemoveButton(lua_State *L) return 1; } -static int lua_OnTopToolBarLoaded(lua_State *L) -{ - if (!lua_isfunction(L, 1)) - { - lua_pushlightuserdata(L, NULL); - return 1; - } - - lua_pushvalue(L, 1); - int ref = luaL_ref(L, LUA_REGISTRYINDEX); - - HANDLE res = ::HookEventObjParam(ME_TTB_MODULELOADED, CMLua::HookEventObjParam, L, ref); - lua_pushlightuserdata(L, res); - - Hooks.insert(res); - HookRefs.insert(new HandleRefParam(L, res, ref)); - - return 1; -} - static luaL_Reg toptoolbarApi[] = { { "AddButton", lua_AddButton }, { "RemoveButton", lua_RemoveButton }, - { "OnTopToolBarLoaded", lua_OnTopToolBarLoaded }, { NULL, NULL } }; diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index e9bf5fff64..9ac95a6579 100644 --- a/plugins/MirLua/src/main.cpp +++ b/plugins/MirLua/src/main.cpp @@ -42,6 +42,11 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) int OnModulesLoaded(WPARAM, LPARAM) { + g_hCommonFolderPath = FoldersRegisterCustomPathT("MirLua", Translate("Common scripts folder"), COMMON_SCRIPTS_PATHT); + g_hCustomFolderPath = FoldersRegisterCustomPathT("MirLua", Translate("Custom scripts folder"), CUSTOM_SCRIPTS_PATHT); + + g_mLua = new CMLua(); + HookEvent(ME_OPT_INITIALISE, CLuaOptions::OnOptionsInit); return 0; @@ -53,9 +58,6 @@ extern "C" int __declspec(dllexport) Load(void) HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); - g_hCommonFolderPath = FoldersRegisterCustomPathT("MirLua", Translate("Common scripts folder"), COMMON_SCRIPTS_PATHT); - g_hCustomFolderPath = FoldersRegisterCustomPathT("MirLua", Translate("Custom scripts folder"), CUSTOM_SCRIPTS_PATHT); - NETLIBUSER nlu = { 0 }; nlu.cbSize = sizeof(nlu); nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; @@ -63,8 +65,6 @@ extern "C" int __declspec(dllexport) Load(void) nlu.szSettingsModule = MODULE; hNetlib = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); - g_mLua = new CMLua(); - return 0; } diff --git a/plugins/MirLua/src/version.h b/plugins/MirLua/src/version.h index e16ba2651e..4a26c2ba41 100644 --- a/plugins/MirLua/src/version.h +++ b/plugins/MirLua/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 11 -#define __RELEASE_NUM 2 -#define __BUILD_NUM 1 +#define __RELEASE_NUM 3 +#define __BUILD_NUM 0 #include -- cgit v1.2.3