diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index ca5de98c8..3f016326d 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -96,6 +96,7 @@ #include "../continent_manager.h" #include "../zone_util.h" #include "../motion/user_controls.h" +#include "../events_listener.h" #include "group_html_cs.h" #include "group_map.h" #include "bonus_malus.h" @@ -153,6 +154,7 @@ using namespace R2; extern NLMISC::CLog g_log; extern CContinentManager ContinentMngr; extern CClientChatManager ChatMngr; +extern CEventsListener EventsListener; // Inputs Manager // *************************************************************************** class CHandlerLUA : public IActionHandler @@ -443,6 +445,7 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls) ls.registerFunc("launchContextMenuInGame", launchContextMenuInGame); ls.registerFunc("parseInterfaceFromString", parseInterfaceFromString); ls.registerFunc("updateAllLocalisedElements", updateAllLocalisedElements); + ls.registerFunc("getTimestampHuman", getTimestampHuman); ls.registerFunc("formatUI", formatUI); ls.registerFunc("formatDB", formatDB); ls.registerFunc("dumpUI", dumpUI); @@ -469,6 +472,8 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls) ls.registerFunc("getMouseDown", getMouseDown), ls.registerFunc("getMouseMiddleDown", getMouseMiddleDown), ls.registerFunc("getMouseRightDown", getMouseRightDown), + ls.registerFunc("isShiftDown", isShiftDown), + ls.registerFunc("isCtrlDown", isCtrlDown), ls.registerFunc("getShapeIdAt", getShapeIdAt), ls.registerFunc("getPlayerFront", getPlayerFront); ls.registerFunc("getPlayerDirection", getPlayerDirection); @@ -1271,7 +1276,7 @@ int CLuaIHMRyzom::getMouseDown(CLuaState &ls) sint32 x, y; bool down; CTool::getMouseDown(down, x, y); - ls.push(down); + ls.push(EventsListener.isMouseButtonPushed(leftButton)); ls.push(x); ls.push(y); @@ -1283,8 +1288,7 @@ int CLuaIHMRyzom::getMouseMiddleDown(CLuaState &ls) sint32 x, y; bool down; CTool::getMouseMiddleDown(down, x, y); - - ls.push(down); + ls.push(EventsListener.isMouseButtonPushed(middleButton)); ls.push(x); ls.push(y); @@ -1297,13 +1301,30 @@ int CLuaIHMRyzom::getMouseRightDown(CLuaState &ls) bool down; CTool::getMouseRightDown(down, x, y); - ls.push(down); + ls.push(EventsListener.isMouseButtonPushed(rightButton)); ls.push(x); ls.push(y); return 3; } +int CLuaIHMRyzom::isShiftDown(CLuaState &ls) +{ + ls.push(Driver->AsyncListener.isKeyDown(KeySHIFT) || + Driver->AsyncListener.isKeyDown(KeyLSHIFT) || + Driver->AsyncListener.isKeyDown(KeyRSHIFT)); + return 1; +} + +int CLuaIHMRyzom::isCtrlDown(CLuaState &ls) +{ + ls.push(Driver->AsyncListener.isKeyDown(KeyCONTROL) || + Driver->AsyncListener.isKeyDown(KeyLCONTROL) || + Driver->AsyncListener.isKeyDown(KeyRCONTROL)); + return 1; +} + + int CLuaIHMRyzom::getShapeIdAt(CLuaState &ls) { @@ -2120,6 +2141,31 @@ int CLuaIHMRyzom::updateAllLocalisedElements(CLuaState &ls) return 0; } +// *************************************************************************** +int CLuaIHMRyzom::getTimestampHuman(CLuaState &ls) +{ + //H_AUTO(Lua_CLuaIHM_getIslandId) + const char *funcName = "getTimestampHuman"; + CLuaIHM::checkArgCount(ls, funcName, 1); + CLuaIHM::check(ls, ls.isString(1), "getTimestampHuman() requires a string in param 1"); + + static char cstime[25]; + time_t date; + time (&date); + struct tm *tms = localtime(&date); + string param = ls.toString(1); + if (tms) + strftime(cstime, 25, param.c_str(), tms); + else + strcpy(cstime, ""); + ls.push(string(cstime)); + return 1; +} + + + + + // *************************************************************************** int CLuaIHMRyzom::getCompleteIslands(CLuaState &ls) { @@ -3867,7 +3913,9 @@ void CLuaIHMRyzom::updateTooltipCoords() CWidgetManager::getInstance()->updateTooltipCoords(); } + // *************************************************************************** +// WARNING PROBABLY DON'T WORKS bool CLuaIHMRyzom::isCtrlKeyDown() { //H_AUTO(Lua_CLuaIHM_isCtrlKeyDown) @@ -3880,6 +3928,7 @@ bool CLuaIHMRyzom::isCtrlKeyDown() return ctrlDown; } + // *************************************************************************** std::string CLuaIHMRyzom::encodeURLUnicodeParam(const ucstring &text) { diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h index 9e8c808a3..cbd458e04 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h @@ -48,6 +48,9 @@ private: static int launchContextMenuInGame(CLuaState &ls); // params : menu name static int parseInterfaceFromString(CLuaState &ls); // params : intreface script static int updateAllLocalisedElements(CLuaState &ls); + static int isShiftDown(CLuaState &ls); + static int isCtrlDown(CLuaState &ls); + static int getTimestampHuman(CLuaState &ls); static int breakPoint(CLuaState &ls); static int i18n(CLuaState &ls); // retrieve an unicode string from CI18N static int setTextFormatTaged(CLuaState &ls); // set a text that may contains Tag Format infos