Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7384 - Mouse binding fix for mac

dragonmacher6bb3b2bb4559
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/KeyBindingsManager.java b/Ghidra/Framework/Docking/src/main/java/docking/action/KeyBindingsManager.java
index 52b0bb1424..668b38911f 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/action/KeyBindingsManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/action/KeyBindingsManager.java
@@ -286,6 +286,11 @@ public class KeyBindingsManager implements PropertyChangeListener {
if (ks != null) {
removeKeyBinding(ks, action);
}
+
+ MouseBinding mouseBinding = keyData.getMouseBinding();
+ if (mouseBinding != null) {
+ dockingMouseMap.remove(mouseBinding);
+ }
}
KeyBindingData newKeyData = (KeyBindingData) evt.getNewValue();
@@ -294,6 +299,11 @@ public class KeyBindingsManager implements PropertyChangeListener {
if (ks != null) {
addKeyBinding(actionToProviderMap.get(action), action, ks);
}
+
+ MouseBinding mouseBinding = newKeyData.getMouseBinding();
+ if (mouseBinding != null) {
+ doAddMouseBinding(action, mouseBinding);
+ }
}
}
diff --git a/Ghidra/Framework/Gui/src/main/java/gui/event/MouseBinding.java b/Ghidra/Framework/Gui/src/main/java/gui/event/MouseBinding.java
index 916d50961e..fdf6393ba9 100644
--- a/Ghidra/Framework/Gui/src/main/java/gui/event/MouseBinding.java
+++ b/Ghidra/Framework/Gui/src/main/java/gui/event/MouseBinding.java
@@ -15,7 +15,8 @@
*/
package gui.event;
-import java.awt.Toolkit;
+import static java.awt.event.InputEvent.*;
+
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.util.*;
@@ -23,7 +24,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Strings;
import ghidra.util.Msg;
@@ -39,10 +39,22 @@ public class MouseBinding {
private static final Pattern BUTTON_PATTERN =
Pattern.compile("button(\\d+)", Pattern.CASE_INSENSITIVE);
- private static final String SHIFT = "Shift";
- private static final String CTRL = "Ctrl";
- private static final String ALT = "Alt";
- private static final String META = "Meta";
+ private static final Map<String, Integer> MODIFIERS_BY_TEXT = createModifiersMap();
+
+ private static Map<String, Integer> createModifiersMap() {
+
+ Map<String, Integer> map = new HashMap<>();
+ map.put(getModifiersExText(ALT_GRAPH_DOWN_MASK), ALT_DOWN_MASK);
+
+ // have this go second to prefer 'alt' when the OS does not distinguish between the two
+ map.put(getModifiersExText(ALT_DOWN_MASK), ALT_DOWN_MASK);
+
+ map.put(getModifiersExText(CTRL_DOWN_MASK), CTRL_DOWN_MASK);
+ map.put(getModifiersExText(META_DOWN_MASK), META_DOWN_MASK);
+ map.put(getModifiersExText(SHIFT_DOWN_MASK), SHIFT_DOWN_MASK);
+
+ return Collections.unmodifiableMap(map);
+ }
private int modifiers = -1;
private int button = -1;
@@ -125,8 +137,7 @@ public class MouseBinding {
return null;
}
- // be flexible on the tokens for splitting, even though '+' seems to be the standard
- StringTokenizer tokenizer = new StringTokenizer(mouseString, "- +");
+ StringTokenizer tokenizer = new StringTokenizer(mouseString, "+");
List<String> pieces = new ArrayList<>();
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
@@ -136,24 +147,12 @@ public class MouseBinding {
}
int modifiers = 0;
- for (Iterator<String> iterator = pieces.iterator(); iterator.hasNext();) {
- String piece = iterator.next();
- if (Strings.CI.indexOf(piece, SHIFT) != -1) {
- modifiers |= InputEvent.SHIFT_DOWN_MASK;
- iterator.remove();
- }
- else if (Strings.CI.indexOf(piece, CTRL) != -1) {
- // This is the cross platform way to get the control key
- modifiers |= Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
- iterator.remove();
- }
- else if (Strings.CI.indexOf(piece, ALT) != -1) {
- modifiers |= InputEvent.ALT_DOWN_MASK;
- iterator.remove();
- }
- else if (Strings.CI.indexOf(piece, META) != -1) {
- modifiers |= InputEvent.META_DOWN_MASK;
- iterator.remove();
+ for (Iterator<String> it = pieces.iterator(); it.hasNext();) {
+ String piece = it.next();
+
+ Integer modifier = MODIFIERS_BY_TEXT.get(piece);
+ if (modifier != null) {
+ modifiers |= modifier;
}
}