diff options
Diffstat (limited to 'plugins/MirLua/src/m_clist.cpp')
| -rw-r--r-- | plugins/MirLua/src/m_clist.cpp | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/plugins/MirLua/src/m_clist.cpp b/plugins/MirLua/src/m_clist.cpp index abb54357a6..1d451250f7 100644 --- a/plugins/MirLua/src/m_clist.cpp +++ b/plugins/MirLua/src/m_clist.cpp @@ -1,47 +1,47 @@ #include "stdafx.h"
+static int clist_AddMainMenuRoot(lua_State *L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ int position = lua_tointeger(L, 2);
+ HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);
+
+ HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrT(Utf8DecodeT(name)), position, hIcon);
+ lua_pushlightuserdata(L, res);
+
+ return 1;
+}
+
static int clist_AddMainMenuItem(lua_State *L)
{
- HGENMENU res = NULL;
-
- if (lua_isstring(L, 1))
- {
- const char *name = luaL_checkstring(L, 1);
- int position = lua_tointeger(L, 2);
- HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);
- res = Menu_CreateRoot(MO_MAIN, ptrT(Utf8DecodeT(name)), position, hIcon);
- }
- else if (lua_istable(L, 1))
- {
- CMenuItem mi;
- MakeMenuItem(L, mi);
- res = Menu_AddMainMenuItem(&mi);
- }
+ CMenuItem mi;
+ MakeMenuItem(L, mi);
+ HGENMENU res = Menu_AddMainMenuItem(&mi);
lua_pushlightuserdata(L, res);
return 1;
}
-static int clist_AddContactMenuItem(lua_State *L)
+static int clist_AddContactMenuRoot(lua_State *L)
{
- HGENMENU res = NULL;
+ const char *name = luaL_checkstring(L, 1);
+ int position = lua_tointeger(L, 2);
+ HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);
- if (lua_isstring(L, 1))
- {
- const char *name = luaL_checkstring(L, 1);
- int position = lua_tointeger(L, 2);
- HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);
- res = Menu_CreateRoot(MO_MAIN, ptrT(Utf8DecodeT(name)), position, hIcon);
- }
- else if (lua_istable(L, 1))
- {
- CMenuItem mi;
- MakeMenuItem(L, mi);
- ptrA szProto(mir_utf8decode((char*)lua_tostring(L, 2), NULL));
- res = Menu_AddContactMenuItem(&mi, szProto);
- }
+ HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrT(Utf8DecodeT(name)), position, hIcon);
+ lua_pushlightuserdata(L, res);
+
+ return 1;
+}
+static int clist_AddContactMenuItem(lua_State *L)
+{
+ CMenuItem mi;
+ MakeMenuItem(L, mi);
+
+ ptrA szProto(mir_utf8decode((char*)lua_tostring(L, 2), NULL));
+ HGENMENU res = Menu_AddContactMenuItem(&mi, szProto);
lua_pushlightuserdata(L, res);
return 1;
@@ -49,7 +49,7 @@ static int clist_AddContactMenuItem(lua_State *L) static int clist_AddTrayMenuItem(lua_State *L)
{
- if (lua_istable(L, 1) != LUA_TTABLE)
+ if (!lua_istable(L, 1))
{
lua_pushlightuserdata(L, 0);
return 1;
@@ -66,8 +66,12 @@ static int clist_AddTrayMenuItem(lua_State *L) static luaL_Reg clistApi[] =
{
+ { "AddMainMenuRoot", clist_AddMainMenuRoot },
{ "AddMainMenuItem", clist_AddMainMenuItem },
+
+ { "AddContactMenuRoot", clist_AddContactMenuRoot },
{ "AddContactMenuItem", clist_AddContactMenuItem },
+
{ "AddTrayMenuItem", clist_AddTrayMenuItem },
{ NULL, NULL }
|