Work on Mouse::operator=

dirkwhoffmann · Jun 4, 2024 · cc5eafa · cc5eafa
1 parent cf86b4c
commit cc5eafa
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 6 deletions.
diff --git a/Emulator/Peripherals/Mouse/Mouse.h b/Emulator/Peripherals/Mouse/Mouse.h
@@ -115,6 +115,11 @@ class Mouse final : public SubComponent {
 
     Mouse& operator= (const Mouse& other) {
 
+        CLONE(targetX)
+        CLONE(targetY)
+        CLONE(scaleX)
+        CLONE(scaleY)
+
         CLONE(mouse1350)
         CLONE(mouse1351)
         CLONE(mouseNeos)

diff --git a/Emulator/Peripherals/Mouse/Mouse1350.h b/Emulator/Peripherals/Mouse/Mouse1350.h
@@ -54,13 +54,41 @@ class Mouse1350 final : public SubComponent {
 public:
 
     Mouse1350(C64 &ref) : SubComponent(ref) { }
-    const Descriptions &getDescriptions() const override { return descriptions; }
 
-    Mouse1350& operator= (const Mouse1350& other) { return *this; }
+    Mouse1350& operator= (const Mouse1350& other) {
+
+        CLONE(mouseX)
+        CLONE(mouseY)
+        CLONE(leftButton)
+        CLONE(rightButton)
+        CLONE(dividerX)
+        CLONE(dividerY)
+        CLONE_ARRAY(latchedX)
+        CLONE_ARRAY(latchedY)
+        CLONE(controlPort)
+
+        return *this;
+    }
+
+    //
+    // Methods from Serializable
+    //
+
+public:
+
     template <class T> void serialize(T& worker) { } SERIALIZERS(serialize);
     void _reset(bool hard) override;
 
 
+    //
+    // Methods from CoreComponent
+    //
+
+public:
+
+    const Descriptions &getDescriptions() const override { return descriptions; }
+
+
     //
     // Accessing
     //

diff --git a/Emulator/Peripherals/Mouse/Mouse1351.h b/Emulator/Peripherals/Mouse/Mouse1351.h
@@ -48,13 +48,41 @@ class Mouse1351 final : public SubComponent {
 public:
 
     Mouse1351(C64 &ref) : SubComponent(ref) { }
-    const Descriptions &getDescriptions() const override { return descriptions; }
 
-    Mouse1351& operator= (const Mouse1351& other) { return *this; }
+    Mouse1351& operator= (const Mouse1351& other) {
+
+        CLONE(mouseX)
+        CLONE(mouseY)
+        CLONE(leftButton)
+        CLONE(rightButton)
+        CLONE(dividerX)
+        CLONE(dividerY)
+        CLONE(shiftX)
+        CLONE(shiftY)
+
+        return *this;
+    }
+
+
+    //
+    // Methods from Serializable
+    //
+
+public:
+
     template <class T> void serialize(T& worker) { } SERIALIZERS(serialize);
     void _reset(bool hard) override;
 
 
+    //
+    // Methods from CoreComponent
+    //
+
+public:
+
+    const Descriptions &getDescriptions() const override { return descriptions; }
+
+
     //
     // Accessing
     //

diff --git a/Emulator/Peripherals/Mouse/NeosMouse.h b/Emulator/Peripherals/Mouse/NeosMouse.h
@@ -66,13 +66,47 @@ class NeosMouse final : public SubComponent {
 public:
 
     NeosMouse(C64 &ref) : SubComponent(ref) { }
-    const Descriptions &getDescriptions() const override { return descriptions; }
 
-    NeosMouse& operator= (const NeosMouse& other) { return *this; }
+    NeosMouse& operator= (const NeosMouse& other) {
+
+        CLONE(mouseX)
+        CLONE(mouseY)
+        CLONE(leftButton)
+        CLONE(rightButton)
+        CLONE(dividerX)
+        CLONE(dividerY)
+        CLONE(shiftX)
+        CLONE(shiftY)
+        CLONE(state)
+        CLONE(triggerCycle)
+        CLONE(latchedX)
+        CLONE(latchedY)
+        CLONE(deltaX)
+        CLONE(deltaY)
+
+        return *this;
+    }
+
+
+    //
+    // Methods from Serializable
+    //
+
+public:
+
     template <class T> void serialize(T& worker) { } SERIALIZERS(serialize);
     void _reset(bool hard) override;
 
 
+    //
+    // Methods from CoreComponent
+    //
+
+public:
+
+    const Descriptions &getDescriptions() const override { return descriptions; }
+
+
     //
     // Accessing
     //