diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-06-11 09:39:17 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-06-11 09:39:17 +0000 |
| commit | ba33f8bbdd9a2d8c6f45454e2174770f444ffa2f (patch) | |
| tree | 55580ef62afcfe1e3706ebec09a232da783bd82f /plugins/MirLua/src/m_genmenu.cpp | |
| parent | 8f5721964ac7ee042e04776c722e459490061204 (diff) | |
MirLua: reworked module m_genmenu
git-svn-id: http://svn.miranda-ng.org/main/trunk@14113 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirLua/src/m_genmenu.cpp')
| -rw-r--r-- | plugins/MirLua/src/m_genmenu.cpp | 76 |
1 files changed, 58 insertions, 18 deletions
diff --git a/plugins/MirLua/src/m_genmenu.cpp b/plugins/MirLua/src/m_genmenu.cpp index 064758da2e..43e1b2a36f 100644 --- a/plugins/MirLua/src/m_genmenu.cpp +++ b/plugins/MirLua/src/m_genmenu.cpp @@ -1,16 +1,52 @@ #include "stdafx.h"
+static CLISTMENUITEM* MakeMenuItem(lua_State *L)
+{
+ CLISTMENUITEM *pmi = (CLISTMENUITEM*)mir_calloc(sizeof(CLISTMENUITEM));
+ pmi->cbSize = sizeof(CLISTMENUITEM);
+
+ lua_getfield(L, 1, "Name");
+ pmi->pszName = LPGEN((char*)luaL_checkstring(L, -1));
+ lua_pop(L, 1);
+
+ lua_getfield(L, 1, "Flags");
+ pmi->flags = lua_tointeger(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, 1, "Position");
+ pmi->position = lua_tointeger(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, 1, "Icon");
+ pmi->icolibItem = (HANDLE)lua_touserdata(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, 1, "Service");
+ pmi->pszService = (char*)lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, 1, "Parent");
+ pmi->hParentMenu = (HGENMENU)lua_touserdata(L, -1);
+ lua_pop(L, 1);
+
+ return pmi;
+}
+
static int lua_AddMainMenuItem(lua_State *L)
{
- CLISTMENUITEM mi = { sizeof(mi) };
- mi.pszName = LPGEN((char*)luaL_checkstring(L, 1));
- mi.flags = lua_tointeger(L, 2);
- mi.position = lua_tointeger(L, 3);
- mi.icolibItem = (HANDLE)lua_touserdata(L, 4);
- mi.pszService = (char*)lua_tostring(L, 5);
- mi.hParentMenu = (HGENMENU)lua_touserdata(L, 6);
-
- HGENMENU res = ::Menu_AddMainMenuItem(&mi);
+ if (lua_type(L, 1) != LUA_TTABLE)
+ {
+ lua_pushlightuserdata(L, 0);
+ return 1;
+ }
+
+ lua_settop(L, 1);
+
+ mir_ptr<CLISTMENUITEM> pmi(MakeMenuItem(L));
+
+ lua_pop(L, 1);
+
+ HGENMENU res = ::Menu_AddMainMenuItem(pmi);
lua_pushlightuserdata(L, res);
return 1;
@@ -18,15 +54,19 @@ static int lua_AddMainMenuItem(lua_State *L) static int lua_AddContactMenuItem(lua_State *L)
{
- CLISTMENUITEM mi = { sizeof(mi) };
- mi.pszName = LPGEN((char*)luaL_checkstring(L, 1));
- mi.flags = lua_tointeger(L, 2);
- mi.position = lua_tointeger(L, 3);
- mi.icolibItem = (HANDLE)lua_touserdata(L, 4);
- mi.pszService = (char*)lua_tostring(L, 5);
- mi.hParentMenu = (HGENMENU)lua_touserdata(L, 6);
-
- HGENMENU res = ::Menu_AddContactMenuItem(&mi);
+ if (lua_type(L, 1) != LUA_TTABLE)
+ {
+ lua_pushlightuserdata(L, 0);
+ return 1;
+ }
+
+ lua_settop(L, 1);
+
+ mir_ptr<CLISTMENUITEM> pmi(MakeMenuItem(L));
+
+ lua_pop(L, 1);
+
+ HGENMENU res = ::Menu_AddContactMenuItem(pmi);
lua_pushlightuserdata(L, res);
return 1;
|