summaryrefslogtreecommitdiffstats
path: root/src/Bindings/LuaWindow.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-03-21 10:40:38 +0100
committerMattes D <github@xoft.cz>2016-03-21 10:40:38 +0100
commitfa53e98419152a83b2a74c5ea45a60449abc59c2 (patch)
tree766f4703a8c30a01bfc5148fe54c6d6b4a3e3cc7 /src/Bindings/LuaWindow.cpp
parentMerge pull request #3084 from cuberite/seadragon91-patch-1 (diff)
parentRevert "Lua callback" (diff)
downloadcuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar.gz
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar.bz2
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar.lz
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar.xz
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.tar.zst
cuberite-fa53e98419152a83b2a74c5ea45a60449abc59c2.zip
Diffstat (limited to 'src/Bindings/LuaWindow.cpp')
-rw-r--r--src/Bindings/LuaWindow.cpp95
1 files changed, 56 insertions, 39 deletions
diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
index bf3f7cfde..706397a27 100644
--- a/src/Bindings/LuaWindow.cpp
+++ b/src/Bindings/LuaWindow.cpp
@@ -15,13 +15,14 @@
////////////////////////////////////////////////////////////////////////////////
// cLuaWindow:
-cLuaWindow::cLuaWindow(cLuaState & a_LuaState, cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title) :
- Super(a_WindowType, a_Title),
+cLuaWindow::cLuaWindow(cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title) :
+ super(a_WindowType, a_Title),
m_Contents(a_SlotsX, a_SlotsY),
- m_LuaState(a_LuaState.QueryCanonLuaState())
+ m_Plugin(nullptr),
+ m_LuaRef(LUA_REFNIL),
+ m_OnClosingFnRef(LUA_REFNIL),
+ m_OnSlotChangedFnRef(LUA_REFNIL)
{
- ASSERT(m_LuaState != nullptr); // We must have a valid Lua state; this assert fails only if there was no Canon Lua state
-
m_Contents.AddListener(*this);
m_SlotAreas.push_back(new cSlotAreaItemGrid(m_Contents, *this));
@@ -66,42 +67,62 @@ cLuaWindow::~cLuaWindow()
-void cLuaWindow::SetOnClosing(cLuaState::cCallbackPtr a_OnClosing)
+void cLuaWindow::SetLuaRef(cPluginLua * a_Plugin, int a_LuaRef)
{
- // Only one Lua state can be a cLuaWindow object callback:
- ASSERT(a_OnClosing->IsSameLuaState(*m_LuaState));
+ // Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
+ ASSERT((m_Plugin == nullptr) || (m_Plugin == a_Plugin));
+ ASSERT(m_LuaRef == LUA_REFNIL);
+ m_Plugin = a_Plugin;
+ m_LuaRef = a_LuaRef;
+}
+
+
+
- // Store the new reference, releasing the old one if appropriate:
- m_OnClosing = a_OnClosing;
+
+bool cLuaWindow::IsLuaReferenced(void) const
+{
+ return ((m_Plugin != nullptr) && (m_LuaRef != LUA_REFNIL));
}
-void cLuaWindow::SetOnSlotChanged(cLuaState::cCallbackPtr a_OnSlotChanged)
+void cLuaWindow::SetOnClosing(cPluginLua * a_Plugin, int a_FnRef)
{
- // Only one Lua state can be a cLuaWindow object callback:
- ASSERT(a_OnSlotChanged->IsSameLuaState(*m_LuaState));
+ // Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
+ ASSERT((m_Plugin == nullptr) || (m_Plugin == a_Plugin));
- // Store the new reference, releasing the old one if appropriate:
- m_OnSlotChanged = a_OnSlotChanged;
+ // If there already was a function, unreference it first
+ if (m_OnClosingFnRef != LUA_REFNIL)
+ {
+ m_Plugin->Unreference(m_OnClosingFnRef);
+ }
+
+ // Store the new reference
+ m_Plugin = a_Plugin;
+ m_OnClosingFnRef = a_FnRef;
}
-void cLuaWindow::OpenedByPlayer(cPlayer & a_Player)
+void cLuaWindow::SetOnSlotChanged(cPluginLua * a_Plugin, int a_FnRef)
{
- // If the first player is opening the window, create a Lua Reference to the window object so that Lua will not GC it until the last player closes the window:
- if (m_PlayerCount == 0)
+ // Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
+ ASSERT((m_Plugin == nullptr) || (m_Plugin == a_Plugin));
+
+ // If there already was a function, unreference it first
+ if (m_OnSlotChangedFnRef != LUA_REFNIL)
{
- m_LuaRef.CreateFromObject(*m_LuaState, this);
+ m_Plugin->Unreference(m_OnSlotChangedFnRef);
}
- ++m_PlayerCount;
- Super::OpenedByPlayer(a_Player);
+ // Store the new reference
+ m_Plugin = a_Plugin;
+ m_OnSlotChangedFnRef = a_FnRef;
}
@@ -111,27 +132,17 @@ void cLuaWindow::OpenedByPlayer(cPlayer & a_Player)
bool cLuaWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
{
// First notify the plugin through the registered callback:
- if (m_OnClosing != nullptr)
+ if (m_OnClosingFnRef != LUA_REFNIL)
{
- bool res;
- if (
- m_OnClosing->Call(this, &a_Player, a_CanRefuse, cLuaState::Return, res) && // The callback succeeded
- res // The callback says not to close the window
- )
+ ASSERT(m_Plugin != nullptr);
+ if (m_Plugin->CallbackWindowClosing(m_OnClosingFnRef, *this, a_Player, a_CanRefuse))
{
// The callback disagrees (the higher levels check the CanRefuse flag compliance)
return false;
}
}
- // If the last player has closed the window, release the Lua reference, so that Lua may GC the object:
- --m_PlayerCount;
- if (m_PlayerCount == 0)
- {
- m_LuaRef.UnRef();
- }
-
- return Super::ClosedByPlayer(a_Player, a_CanRefuse);
+ return super::ClosedByPlayer(a_Player, a_CanRefuse);
}
@@ -140,7 +151,13 @@ bool cLuaWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
void cLuaWindow::Destroy(void)
{
- Super::Destroy();
+ super::Destroy();
+
+ if ((m_LuaRef != LUA_REFNIL) && (m_Plugin != nullptr))
+ {
+ // The object is referenced by Lua, un-reference it
+ m_Plugin->Unreference(m_LuaRef);
+ }
// Lua will take care of this object, it will garbage-collect it, so we must not delete it!
m_IsDestroyed = false;
@@ -161,7 +178,7 @@ void cLuaWindow::DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Pl
}
}
- Super::DistributeStackToAreas(a_ItemStack, a_Player, Areas, a_ShouldApply, false);
+ super::DistributeStackToAreas(a_ItemStack, a_Player, Areas, a_ShouldApply, false);
}
@@ -177,9 +194,9 @@ void cLuaWindow::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
}
// If an OnSlotChanged callback has been registered, call it:
- if (m_OnSlotChanged != nullptr)
+ if (m_OnSlotChangedFnRef != LUA_REFNIL)
{
- m_OnSlotChanged->Call(this, a_SlotNum);
+ m_Plugin->CallbackWindowSlotChanged(m_OnSlotChangedFnRef, *this, a_SlotNum);
}
}