client: block extra mouse keys

The key remapping plugin has no way to operate being on and also not
blocking chat input, due to the other features of the plugin all doing
key remaps and thus are required to know whether or not you are trying
to type, or using a remapped key.

This moves the blocking to the core, which we think won't affect many
users anyway, and those that it does can just remap their mouse keys.
This commit is contained in:
Adam
2020-03-22 17:59:41 -04:00
parent 5da84178e7
commit 046c20fb5b
5 changed files with 18 additions and 68 deletions

View File

@@ -28,7 +28,6 @@ import com.google.inject.Guice;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -38,7 +37,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.mockito.junit.MockitoJUnitRunner;
@@ -93,19 +91,4 @@ public class KeyRemappingListenerTest
keyRemappingListener.keyReleased(event);
verify(event).setKeyCode(KeyEvent.VK_RIGHT);
}
@Test
public void testMouseClicked()
{
when(keyRemappingConfig.consumeExtraMouseButtons()).thenReturn(true);
MouseEvent mouseEvent = mock(MouseEvent.class);
when(mouseEvent.getButton()).thenReturn(4);
keyRemappingListener.mousePressed(mouseEvent);
verify(mouseEvent).consume();
mouseEvent = mock(MouseEvent.class);
when(mouseEvent.getButton()).thenReturn(1);
keyRemappingListener.mousePressed(mouseEvent);
verify(mouseEvent, never()).consume();
}
}