mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

lua: update menue callback api to include an id parameter

Browse Source 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
This commit is contained in:
martii
2013-05-10 15:25:57 +02:00
committed by M. Liebmann
parent 82be6f8e66
commit d2e5a703c3
2 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/gui/luainstance.cpp
View File

@@ -631,9 +631,9 @@ local m = menue.new{name="mytitle", icon="myicon", hide_parent=true}
m:addItem{type="back"} m:addItem{type="back"}
m:addItem{type="separator"} m:addItem{type="separator"}
function talk(a) function talk(a, b)
print(">talk") print(">talk")
print(a) print(a .. " => " b)
print("<talk") print("<talk")
return MENU_RETURN["RETURN_REPAINT"] return MENU_RETURN["RETURN_REPAINT"]
end end
@@ -652,11 +652,11 @@ end
m:addItem{type="chooser", name="testchooser", action="talk", options={ "on", "off", "auto" }, icon= m:addItem{type="chooser", name="testchooser", action="talk", options={ "on", "off", "auto" }, icon=
m:addItem{type="forwarder", name="testforwarder", action="anotherMenue", icon="network"} m:addItem{type="forwarder", name="testforwarder", action="anotherMenue", icon="network"}
m:addItem{type="separator"} m:addItem{type="separator"}
m:addItem{type="numeric", name="testnumeric", action="talk"} m:addItem{type="numeric", name="testnumeric", id="a", action="talk"}
m:addItem{type="separator"} m:addItem{type="separator"}
m:addItem{type="filebrowser", name="fbrowser", action="talk"} m:addItem{type="filebrowser", name="fbrowser", id="b", action="talk"}
m:addItem{type="separator"} m:addItem{type="separator"}
m:addItem{type="stringinput", name="stringinput", action="talk"} m:addItem{type="stringinput", name="stringinput", id="c", action="talk"}
m:exec() m:exec()
#endif #endif
@@ -684,16 +684,17 @@ bool CLuaInstance::tableLookup(lua_State *L, const char *what, int &value)
return res; return res;
} }
bool CLuaMenueChangeObserver::changeNotify(lua_State *L, const std::string &luaAction, void *Data) bool CLuaMenueChangeObserver::changeNotify(lua_State *L, const std::string &luaAction, const std::string &luaId, void *Data)
{ {
const char *optionValue = (const char *) Data; const char *optionValue = (const char *) Data;
lua_pushglobaltable(L); lua_pushglobaltable(L);
lua_getfield(L, -1, luaAction.c_str()); lua_getfield(L, -1, luaAction.c_str());
lua_remove(L, -2); lua_remove(L, -2);
lua_pushstring(L, luaId.c_str());
lua_pushstring(L, optionValue); lua_pushstring(L, optionValue);
lua_pcall(L, 1 /* one arg */, 1 /* one result */, 0); lua_pcall(L, 2 /* two args */, 1 /* one result */, 0);
double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0; double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0;
lua_pop(L, 1); lua_pop(L, 2);
return res == menu_return::RETURN_REPAINT || res == menu_return::RETURN_EXIT_REPAINT; return res == menu_return::RETURN_REPAINT || res == menu_return::RETURN_EXIT_REPAINT;
} }
@@ -732,10 +733,11 @@ CLuaMenue::~CLuaMenue()
delete observ; delete observ;
} }
CLuaMenueForwarder::CLuaMenueForwarder(lua_State *_L, std::string _luaAction) CLuaMenueForwarder::CLuaMenueForwarder(lua_State *_L, std::string _luaAction, std::string _luaId)
{ {
L = _L; L = _L;
luaAction = _luaAction; luaAction = _luaAction;
luaId = _luaId;
} }
CLuaMenueForwarder::~CLuaMenueForwarder() CLuaMenueForwarder::~CLuaMenueForwarder()
@@ -759,7 +761,7 @@ int CLuaMenueForwarder::exec(CMenuTarget* /*parent*/, const std::string & /*acti
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
CLuaMenueFilebrowser::CLuaMenueFilebrowser(lua_State *_L, std::string _luaAction, char *_value, bool _dirMode) : CLuaMenueForwarder(_L, _luaAction) CLuaMenueFilebrowser::CLuaMenueFilebrowser(lua_State *_L, std::string _luaAction, std::string _luaId, char *_value, bool _dirMode) : CLuaMenueForwarder(_L, _luaAction, _luaId)
{ {
value = _value; value = _value;
dirMode = _dirMode; dirMode = _dirMode;
@@ -791,7 +793,7 @@ int CLuaMenueFilebrowser::exec(CMenuTarget* /*parent*/, const std::string& /*act
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
CLuaMenueStringinput::CLuaMenueStringinput(lua_State *_L, std::string _luaAction, const char *_name, char *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms) : CLuaMenueForwarder(_L, _luaAction) CLuaMenueStringinput::CLuaMenueStringinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, char *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms) : CLuaMenueForwarder(_L, _luaAction, _luaId)
{ {
name = _name; name = _name;
value = _value; value = _value;
@@ -811,18 +813,17 @@ int CLuaMenueStringinput::exec(CMenuTarget* /*parent*/, const std::string & /*ac
else else
i = new CStringInput((char *)name, value, size, i = new CStringInput((char *)name, value, size,
NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, valid_chars.c_str(), observ, icon); NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, valid_chars.c_str(), observ, icon);
i->luaAction = luaAction;
i->luaState = L;
i->exec(NULL, ""); i->exec(NULL, "");
delete i; delete i;
if (!luaAction.empty()){ if (!luaAction.empty()){
lua_pushglobaltable(L); lua_pushglobaltable(L);
lua_getfield(L, -1, luaAction.c_str()); lua_getfield(L, -1, luaAction.c_str());
lua_remove(L, -2); lua_remove(L, -2);
lua_pushstring(L, luaId.c_str());
lua_pushstring(L, value); lua_pushstring(L, value);
lua_pcall(L, 1 /* one arg */, 1 /* one result */, 0); lua_pcall(L, 2 /* two args */, 1 /* one result */, 0);
//double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0; //double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0;
lua_pop(L, 1); lua_pop(L, 2);
} }
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
@@ -896,6 +897,7 @@ int CLuaInstance::MenueAddItem(lua_State *L)
std::string right_icon; tableLookup(L, "right_icon", right_icon); std::string right_icon; tableLookup(L, "right_icon", right_icon);
std::string action; tableLookup(L, "action", action); std::string action; tableLookup(L, "action", action);
std::string value; tableLookup(L, "value", value); std::string value; tableLookup(L, "value", value);
std::string id; tableLookup(L, "id", id);
std::string tmp; std::string tmp;
int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey); int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
int pulldown = false; tableLookup(L, "pulldown", pulldown); int pulldown = false; tableLookup(L, "pulldown", pulldown);
@@ -908,11 +910,10 @@ int CLuaInstance::MenueAddItem(lua_State *L)
if (type == "forwarder") { if (type == "forwarder") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
CLuaMenueForwarder *forwarder = new CLuaMenueForwarder(L, action); CLuaMenueForwarder *forwarder = new CLuaMenueForwarder(L, action, id);
CMenuItem *mi = new CMenuForwarderNonLocalized( CMenuItem *mi = new CMenuForwarderNonLocalized(
b->name.c_str(), enabled, b->s, forwarder, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str()); b->name.c_str(), enabled, b->s, forwarder, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
m->targets.push_back(forwarder); m->targets.push_back(forwarder);
} else if (type == "chooser") { } else if (type == "chooser") {
@@ -947,41 +948,36 @@ int CLuaInstance::MenueAddItem(lua_State *L)
} }
lua_pop(L, 1); lua_pop(L, 1);
CMenuItem *mi = new CMenuOptionChooser(b->name.c_str(), &b->i, kext, options_count, enabled, m->observ, directkey, icon.c_str(), pulldown); CMenuItem *mi = new CMenuOptionChooser(b->name.c_str(), &b->i, kext, options_count, enabled, m->observ, directkey, icon.c_str(), pulldown);
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
} else if (type == "numeric") { } else if (type == "numeric") {
b->i = range_from; b->i = range_from;
sscanf(value.c_str(), "%d", &b->i); sscanf(value.c_str(), "%d", &b->i);
CMenuItem *mi = new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, &b->i, enabled, range_from, range_to, m->observ, CMenuItem *mi = new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, &b->i, enabled, range_from, range_to, m->observ,
0, 0, NONEXISTANT_LOCALE, b->name.c_str(), pulldown); 0, 0, NONEXISTANT_LOCALE, b->name.c_str(), pulldown);
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
} else if (type == "string") { } else if (type == "string") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
CMenuItem *mi = new CMenuOptionStringChooser(b->name.c_str(), b->s, enabled, m->observ, directkey, icon.c_str(), pulldown); CMenuItem *mi = new CMenuOptionStringChooser(b->name.c_str(), b->s, enabled, m->observ, directkey, icon.c_str(), pulldown);
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
} else if (type == "stringinput") { } else if (type == "stringinput") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-. "; std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-. ";
tableLookup(L, "valid_chars", valid_chars); tableLookup(L, "valid_chars", valid_chars);
int sms = 0; tableLookup(L, "sms", sms); int sms = 0; tableLookup(L, "sms", sms);
int size = 30; tableLookup(L, "size", size); int size = 30; tableLookup(L, "size", size);
CLuaMenueStringinput *stringinput = new CLuaMenueStringinput(L, action, b->name.c_str(), b->s, size, valid_chars, m->observ, icon.c_str(), sms); CLuaMenueStringinput *stringinput = new CLuaMenueStringinput(L, action, id, b->name.c_str(), b->s, size, valid_chars, m->observ, icon.c_str(), sms);
CMenuItem *mi = new CMenuForwarderNonLocalized( CMenuItem *mi = new CMenuForwarderNonLocalized(
b->name.c_str(), enabled, b->s, stringinput, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str()); b->name.c_str(), enabled, b->s, stringinput, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
m->targets.push_back(stringinput); m->targets.push_back(stringinput);
} else if (type == "filebrowser") { } else if (type == "filebrowser") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
int dirMode = 0; tableLookup(L, "dir_mode", dirMode); int dirMode = 0; tableLookup(L, "dir_mode", dirMode);
CLuaMenueFilebrowser *filebrowser = new CLuaMenueFilebrowser(L, action, b->s, dirMode); CLuaMenueFilebrowser *filebrowser = new CLuaMenueFilebrowser(L, action, id, b->s, dirMode);
lua_pushstring(L, "filter"); lua_pushstring(L, "filter");
lua_gettable(L, -2); lua_gettable(L, -2);
if (lua_istable(L, -1)) if (lua_istable(L, -1))
@@ -994,8 +990,7 @@ int CLuaInstance::MenueAddItem(lua_State *L)
CMenuItem *mi = new CMenuForwarderNonLocalized( CMenuItem *mi = new CMenuForwarderNonLocalized(
b->name.c_str(), enabled, b->s, filebrowser, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str()); b->name.c_str(), enabled, b->s, filebrowser, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->luaAction = action; mi->setLua(L, action, id);
mi->luaState = L;
m->m->addItem(mi); m->m->addItem(mi);
m->targets.push_back(filebrowser); m->targets.push_back(filebrowser);
} }

9
src/gui/luainstance.h
View File

@@ -52,7 +52,7 @@ struct CLuaMenueItem
class CLuaMenueChangeObserver : public CChangeObserver class CLuaMenueChangeObserver : public CChangeObserver
{ {
public: public:
bool changeNotify(lua_State *, const std::string &, void *); bool changeNotify(lua_State *, const std::string &, const std::string &, void *);
}; };
class CLuaMenue class CLuaMenue
@@ -72,7 +72,8 @@ class CLuaMenueForwarder : public CMenuTarget
public: public:
lua_State *L; lua_State *L;
std::string luaAction; std::string luaAction;
CLuaMenueForwarder(lua_State *L, std::string _luaAction); std::string luaId;
CLuaMenueForwarder(lua_State *L, std::string _luaAction, std::string _luaId);
~CLuaMenueForwarder(); ~CLuaMenueForwarder();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
}; };
@@ -84,7 +85,7 @@ class CLuaMenueFilebrowser : public CLuaMenueForwarder
bool dirMode; bool dirMode;
std::vector<std::string> filter; std::vector<std::string> filter;
public: public:
CLuaMenueFilebrowser(lua_State *_L, std::string _luaAction, char *_value, bool _dirMode); CLuaMenueFilebrowser(lua_State *_L, std::string _luaAction, std::string _luaId, char *_value, bool _dirMode);
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
void addFilter(std::string s) { filter.push_back(s); }; void addFilter(std::string s) { filter.push_back(s); };
}; };
@@ -100,7 +101,7 @@ class CLuaMenueStringinput : public CLuaMenueForwarder
int size; int size;
CChangeObserver *observ; CChangeObserver *observ;
public: public:
CLuaMenueStringinput(lua_State *_L, std::string _luaAction, const char *_name, char *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms); CLuaMenueStringinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, char *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms);
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
}; };