From b2c9990aadeda5bb18acd5a814d92ed37a4d11f4 Mon Sep 17 00:00:00 2001
From: zeruth <Zeruth09@gmail.com>
Date: Wed, 13 May 2020 02:56:37 -0400
Subject: [PATCH] hooks: track software mirror mouse

---
 .../net/runelite/client/callback/Hooks.java     |  14 +++++++++++++-
 .../net/runelite/client/callback/cursor.png     | Bin 0 -> 15630 bytes
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 runelite-client/src/main/resources/net/runelite/client/callback/cursor.png

diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
index 6bc2a60f0b..e69e8a445a 100644
--- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
+++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
@@ -66,6 +66,7 @@ import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.events.DrawFinished;
 import net.runelite.client.input.KeyManager;
+import net.runelite.client.input.MouseListener;
 import net.runelite.client.input.MouseManager;
 import net.runelite.client.task.Scheduler;
 import net.runelite.client.ui.ClientUI;
@@ -75,6 +76,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.ui.overlay.OverlayRenderer;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.client.util.DeferredEventBus;
+import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.RSTimeUnit;
 
 /**
@@ -97,6 +99,11 @@ public class Hooks implements Callbacks
 	private static final BeforeRender BEFORE_RENDER = BeforeRender.INSTANCE;
 	private static final DrawFinished drawFinishedEvent = new DrawFinished();
 
+	private int mouseX = 0;
+	private int mouseY = 0;
+	private final Image cursor = ImageUtil.getResourceStreamFromClass(Hooks.class, "cursor.png");
+
+
 	@Inject
 	private EventBus eventBus;
 
@@ -287,12 +294,16 @@ public class Hooks implements Callbacks
 	@Override
 	public MouseEvent mouseDragged(MouseEvent mouseEvent)
 	{
+		mouseX = mouseEvent.getX();
+		mouseY = mouseEvent.getY();
 		return mouseManager.processMouseDragged(mouseEvent);
 	}
 
 	@Override
 	public MouseEvent mouseMoved(MouseEvent mouseEvent)
 	{
+		mouseX = mouseEvent.getX();
+		mouseY = mouseEvent.getY();
 		return mouseManager.processMouseMoved(mouseEvent);
 	}
 
@@ -397,7 +408,8 @@ public class Hooks implements Callbacks
 
 		if (client.isMirrored())
 		{
-			drawFinishedEvent.image = finalImage;
+			drawFinishedEvent.image = copy(finalImage);
+			drawFinishedEvent.image.getGraphics().drawImage(cursor, mouseX, mouseY, null);
 			eventBus.post(DrawFinished.class, drawFinishedEvent);
 		}
 
diff --git a/runelite-client/src/main/resources/net/runelite/client/callback/cursor.png b/runelite-client/src/main/resources/net/runelite/client/callback/cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..7415625a2f28cbeb4c1faf0f958aede3ba3236e2
GIT binary patch
literal 15630
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

literal 0
HcmV?d00001