Add support for local list monitors used by clones

Author: adazem009

src/blocks/listblocks.cpp

@@ -5,6 +5,7 @@
 #include <scratchcpp/field.h>
 #include <scratchcpp/block.h>
 #include <scratchcpp/list.h>
+#include <scratchcpp/sprite.h>
 #include <scratchcpp/stage.h>
 #include <scratchcpp/monitor.h>
 
@@ -162,8 +163,14 @@ unsigned int ListBlocks::showGlobalList(VirtualMachine *vm)
 unsigned int ListBlocks::showList(VirtualMachine *vm)
 {
     if (Target *target = vm->target()) {
-        int index = target->findListById(vm->getInput(0, 1)->toString());
-        setListVisible(target->listAt(index), true);
+        if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
+            Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root list
+            int index = sprite->findListById(vm->getInput(0, 1)->toString());
+            setListVisible(sprite->listAt(index), true);
+        } else {
+            int index = target->findListById(vm->getInput(0, 1)->toString());
+            setListVisible(target->listAt(index), true);
+        }
     }
 
     return 1;
@@ -182,8 +189,14 @@ unsigned int ListBlocks::hideGlobalList(VirtualMachine *vm)
 unsigned int ListBlocks::hideList(VirtualMachine *vm)
 {
     if (Target *target = vm->target()) {
-        int index = target->findListById(vm->getInput(0, 1)->toString());
-        setListVisible(target->listAt(index), false);
+        if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
+            Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root list
+            int index = sprite->findListById(vm->getInput(0, 1)->toString());
+            setListVisible(sprite->listAt(index), false);
+        } else {
+            int index = target->findListById(vm->getInput(0, 1)->toString());
+            setListVisible(target->listAt(index), false);
+        }
     }
 
     return 1;

test/blocks/list_blocks_test.cpp

@@ -3,6 +3,7 @@
 #include <scratchcpp/input.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/list.h>
+#include <scratchcpp/sprite.h>
 #include <scratchcpp/stage.h>
 #include <scratchcpp/monitor.h>
 #include <enginemock.h>
@@ -498,8 +499,12 @@ TEST_F(ListBlocksTest, ShowListImpl)
     Stage stage;
     stage.addList(list1);
 
-    Target target;
-    target.addList(list2);
+    Sprite sprite;
+    sprite.addList(list2);
+
+    Engine fakeEngine;
+    sprite.setEngine(&fakeEngine);
+    auto clone = sprite.clone();
 
     // Global
     VirtualMachine vm1(&stage, &m_engineMock, nullptr);
@@ -526,7 +531,7 @@ TEST_F(ListBlocksTest, ShowListImpl)
     monitor1.setVisible(false);
 
     // Local
-    VirtualMachine vm2(&target, &m_engineMock, nullptr);
+    VirtualMachine vm2(&sprite, &m_engineMock, nullptr);
     vm2.setBytecode(bytecode3);
     vm2.setFunctions(functions);
     vm2.setConstValues(constValues);
@@ -543,6 +548,26 @@ TEST_F(ListBlocksTest, ShowListImpl)
     ASSERT_EQ(vm2.registerCount(), 0);
     ASSERT_FALSE(monitor1.visible());
     ASSERT_TRUE(monitor2.visible());
+
+    // Local - clone
+    monitor2.setVisible(false);
+    VirtualMachine vm3(clone.get(), &m_engineMock, nullptr);
+    vm3.setBytecode(bytecode3);
+    vm3.setFunctions(functions);
+    vm3.setConstValues(constValues);
+    vm3.run();
+
+    ASSERT_EQ(vm3.registerCount(), 0);
+    ASSERT_FALSE(monitor1.visible());
+    ASSERT_FALSE(monitor2.visible());
+
+    vm3.reset();
+    vm3.setBytecode(bytecode4);
+    vm3.run();
+
+    ASSERT_EQ(vm3.registerCount(), 0);
+    ASSERT_FALSE(monitor1.visible());
+    ASSERT_TRUE(monitor2.visible());
 }
 
 TEST_F(ListBlocksTest, HideList)
@@ -601,8 +626,12 @@ TEST_F(ListBlocksTest, HideListImpl)
     Stage stage;
     stage.addList(list1);
 
-    Target target;
-    target.addList(list2);
+    Sprite sprite;
+    sprite.addList(list2);
+
+    Engine fakeEngine;
+    sprite.setEngine(&fakeEngine);
+    auto clone = sprite.clone();
 
     // Global
     VirtualMachine vm1(&stage, &m_engineMock, nullptr);
@@ -629,7 +658,7 @@ TEST_F(ListBlocksTest, HideListImpl)
     monitor1.setVisible(true);
 
     // Local
-    VirtualMachine vm2(&target, &m_engineMock, nullptr);
+    VirtualMachine vm2(&sprite, &m_engineMock, nullptr);
     vm2.setBytecode(bytecode3);
     vm2.setFunctions(functions);
     vm2.setConstValues(constValues);
@@ -646,4 +675,24 @@ TEST_F(ListBlocksTest, HideListImpl)
     ASSERT_EQ(vm2.registerCount(), 0);
     ASSERT_TRUE(monitor1.visible());
     ASSERT_FALSE(monitor2.visible());
+
+    // Local - clone
+    monitor2.setVisible(true);
+    VirtualMachine vm3(clone.get(), &m_engineMock, nullptr);
+    vm3.setBytecode(bytecode3);
+    vm3.setFunctions(functions);
+    vm3.setConstValues(constValues);
+    vm3.run();
+
+    ASSERT_EQ(vm3.registerCount(), 0);
+    ASSERT_TRUE(monitor1.visible());
+    ASSERT_TRUE(monitor2.visible());
+
+    vm3.reset();
+    vm3.setBytecode(bytecode4);
+    vm3.run();
+
+    ASSERT_EQ(vm3.registerCount(), 0);
+    ASSERT_TRUE(monitor1.visible());
+    ASSERT_FALSE(monitor2.visible());
 }