ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: add config option for blocking extra mouse buttons

Browse Source
This commit is contained in:
Adam
2020-03-27 18:02:12 -04:00
parent ec11040150
commit 22235925be
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
View File

@@ -288,4 +288,15 @@ public interface RuneLiteConfig extends Config
{ {
return 35; return 35;
} }
@ConfigItem(
keyName = "blockExtraMouseButtons",
name = "Block Extra Mouse Buttons",
description = "Blocks extra mouse buttons (4 and above)",
position = 43
)
default boolean blockExtraMouseButtons()
{
return true;
}
} }

9
runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
View File

@@ -28,7 +28,9 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelEvent;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.client.config.RuneLiteConfig;
@Singleton @Singleton
public class MouseManager public class MouseManager
@@ -39,6 +41,9 @@ public class MouseManager
private final List<MouseListener> mouseListeners = new CopyOnWriteArrayList<>(); private final List<MouseListener> mouseListeners = new CopyOnWriteArrayList<>();
private final List<MouseWheelListener> mouseWheelListeners = new CopyOnWriteArrayList<>(); private final List<MouseWheelListener> mouseWheelListeners = new CopyOnWriteArrayList<>();
@Inject
private RuneLiteConfig runeLiteConfig;
public void registerMouseListener(MouseListener mouseListener) public void registerMouseListener(MouseListener mouseListener)
{ {
if (!mouseListeners.contains(mouseListener)) if (!mouseListeners.contains(mouseListener))
@@ -107,10 +112,10 @@ public class MouseManager
private void checkExtraMouseButtons(MouseEvent mouseEvent) private void checkExtraMouseButtons(MouseEvent mouseEvent)
{ {
// Prevent extra mouse buttins from being passed into the client, // Prevent extra mouse buttons from being passed into the client,
// as it treats them all as left click // as it treats them all as left click
int button = mouseEvent.getButton(); int button = mouseEvent.getButton();
if (button >= MOUSE_BUTTON_4) if (button >= MOUSE_BUTTON_4 && runeLiteConfig.blockExtraMouseButtons())
{ {
mouseEvent.consume(); mouseEvent.consume();
} }