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

Merge pull request #4350 from Abextm/hotkey-consumer

Browse Source 
runelite-client: Consume hotkeys in HotkeyListener
This commit is contained in:
Abex
2018-07-22 14:36:24 -06:00
committed by GitHub
parent 14707ba202 b83fcd4fc2
commit 1d31796fc5
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/config/Keybind.java
View File

@@ -28,6 +28,7 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableBiMap;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import javax.annotation.Nullable;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
@@ -39,7 +40,7 @@ import lombok.Getter;
@EqualsAndHashCode @EqualsAndHashCode
public class Keybind public class Keybind
{ {
private static final BiMap<Integer, Integer> modifierToKeyCode = new ImmutableBiMap.Builder<Integer, Integer>() private static final BiMap<Integer, Integer> MODIFIER_TO_KEY_CODE = new ImmutableBiMap.Builder<Integer, Integer>()
.put(InputEvent.CTRL_DOWN_MASK, KeyEvent.VK_CONTROL) .put(InputEvent.CTRL_DOWN_MASK, KeyEvent.VK_CONTROL)
.put(InputEvent.ALT_DOWN_MASK, KeyEvent.VK_ALT) .put(InputEvent.ALT_DOWN_MASK, KeyEvent.VK_ALT)
.put(InputEvent.SHIFT_DOWN_MASK, KeyEvent.VK_SHIFT) .put(InputEvent.SHIFT_DOWN_MASK, KeyEvent.VK_SHIFT)
@@ -47,7 +48,7 @@ public class Keybind
.build(); .build();
// Bitmask of all supported modifers // Bitmask of all supported modifers
private static final int KEYBOARD_MODIFIER_MASK = modifierToKeyCode.keySet().stream() private static final int KEYBOARD_MODIFIER_MASK = MODIFIER_TO_KEY_CODE.keySet().stream()
.reduce((a, b) -> a | b).get(); .reduce((a, b) -> a | b).get();
public static final Keybind NOT_SET = new Keybind(KeyEvent.VK_UNDEFINED, 0); public static final Keybind NOT_SET = new Keybind(KeyEvent.VK_UNDEFINED, 0);
@@ -65,7 +66,7 @@ public class Keybind
// If the keybind is just modifiers we don't want the keyCode to contain the modifier too, // If the keybind is just modifiers we don't want the keyCode to contain the modifier too,
// becasue this breaks if you do the keycode backwards // becasue this breaks if you do the keycode backwards
Integer mf = modifierToKeyCode.inverse().get(keyCode); Integer mf = getModifierForKeyCode(keyCode);
if (mf != null) if (mf != null)
{ {
assert (modifiers & mf) != 0; assert (modifiers & mf) != 0;
@@ -102,13 +103,18 @@ public class Keybind
int keyCode = e.getExtendedKeyCode(); int keyCode = e.getExtendedKeyCode();
int modifiers = e.getModifiersEx() & KEYBOARD_MODIFIER_MASK; int modifiers = e.getModifiersEx() & KEYBOARD_MODIFIER_MASK;
Integer mf = modifierToKeyCode.inverse().get(keyCode); Integer mf = getModifierForKeyCode(keyCode);
if (mf != null) if (mf != null)
{ {
modifiers |= mf; modifiers |= mf;
keyCode = KeyEvent.VK_UNDEFINED; keyCode = KeyEvent.VK_UNDEFINED;
} }
if (e.getID() == KeyEvent.KEY_RELEASED && keyCode != KeyEvent.VK_UNDEFINED)
{
return this.keyCode == keyCode;
}
return this.keyCode == keyCode && this.modifiers == modifiers; return this.keyCode == keyCode && this.modifiers == modifiers;
} }
@@ -177,4 +183,10 @@ public class Keybind
} }
return buf.toString(); return buf.toString();
} }
@Nullable
public static Integer getModifierForKeyCode(int keyCode)
{
return MODIFIER_TO_KEY_CODE.inverse().get(keyCode);
}
} }

24
runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java
View File

@@ -39,9 +39,15 @@ public abstract class HotkeyListener implements KeyListener
@Getter @Getter
private boolean isPressed = false; private boolean isPressed = false;
private boolean isConsumingTyped = false;
@Override @Override
public void keyTyped(KeyEvent e) public void keyTyped(KeyEvent e)
{ {
if (isConsumingTyped)
{
e.consume();
}
} }
@Override @Override
@@ -49,8 +55,18 @@ public abstract class HotkeyListener implements KeyListener
{ {
if (keybind.get().matches(e)) if (keybind.get().matches(e))
{ {
boolean wasPressed = isPressed;
isPressed = true; isPressed = true;
hotkeyPressed(); if (!wasPressed)
{
hotkeyPressed();
}
if (Keybind.getModifierForKeyCode(e.getKeyCode()) == null)
{
isConsumingTyped = true;
// Only consume non modifier keys
e.consume();
}
} }
} }
@@ -60,7 +76,13 @@ public abstract class HotkeyListener implements KeyListener
if (keybind.get().matches(e)) if (keybind.get().matches(e))
{ {
isPressed = false; isPressed = false;
isConsumingTyped = false;
hotkeyReleased(); hotkeyReleased();
if (Keybind.getModifierForKeyCode(e.getKeyCode()) == null)
{
// Only consume non modifier keys
e.consume();
}
} }
} }