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

Merge pull request #2717 from Owain94/upstream-2706

Browse Source 
project: Merge upstream
This commit is contained in:
Owain van Brakel
2020-06-27 16:44:26 +02:00
committed by GitHub
parent 956fc953ea e904057193
commit 0585b5267b
5 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -2042,4 +2042,12 @@ public interface Client extends GameShell
* Gets whether the flames on the login screen should be rendered
*/
boolean shouldRenderLoginScreenFire();
/**
* Test if a key is pressed
* @param keycode the keycode
* @return
* @see KeyCode
*/
boolean isKeyPressed(int keycode);
}

33
runelite-api/src/main/java/net/runelite/api/KeyCode.java Normal file
View File

@@ -0,0 +1,33 @@
/*
* Copyright (c) 2020, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.api;
/**
* Jagex key codes
*/
public final class KeyCode
{
public static final int KC_SHIFT = 81;
}

5
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -230,7 +230,6 @@ public class ClientUI
currentButton.setSelected(false);
currentNavButton.setSelected(false);
currentButton = null;
currentNavButton = null;
}
else
{
@@ -403,7 +402,6 @@ public class ClientUI
toggleSidebar();
}
};
sidebarListener.setEnabledOnLogin(true);
keyManager.registerKeyListener(sidebarListener);
@@ -415,7 +413,7 @@ public class ClientUI
togglePluginPanel();
}
};
pluginPanelListener.setEnabledOnLogin(true);
keyManager.registerKeyListener(pluginPanelListener);
// Add mouse listener
@@ -433,7 +431,6 @@ public class ClientUI
return mouseEvent;
}
};
mouseManager.registerMouseListener(mouseListener);
// Decorate window with custom chrome and titlebar if needed

10
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -135,8 +135,12 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
{
if (!event.isFocused())
{
inOverlayManagingMode = false;
resetOverlayManagementMode();
if (inOverlayManagingMode)
{
inOverlayManagingMode = false;
resetOverlayManagementMode();
}
inMenuEntryMode = false;
menuEntries = null;
}
@@ -616,7 +620,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
@Override
public void keyReleased(KeyEvent e)
{
if (!e.isAltDown())
if (!e.isAltDown() && inOverlayManagingMode)
{
inOverlayManagingMode = false;
resetOverlayManagementMode();

44
runelite-mixins/src/main/java/net/runelite/mixins/KeyHandlerMixin.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright (c) 2020, Owain van Brakel <https://github.com/Owain94>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.mixins;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
@Mixin(RSClient.class)
public abstract class KeyHandlerMixin implements RSClient
{
@Shadow("client")
private static RSClient client;
@Inject
public boolean isKeyPressed(int keycode)
{
boolean[] pressedKeys = client.getPressedKeys();
return pressedKeys[keycode];
}
}