yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5978-dragonmacher-alt-graph-fix'

Browse source 
(Closes #8205)
This commit is contained in:
Ryan Kurtz 2025-09-10 14:09:33 -04:00
commit 59bcbba8cf
1 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ghidra/Framework/Docking/src/main/java/docking/action/KeyBindingsManager.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -15,7 +15,6 @@
*/ */
package docking.action; package docking.action;
import java.awt.event.InputEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.util.*; import java.util.*;
@ -103,9 +102,6 @@ public class KeyBindingsManager implements PropertyChangeListener {
// map standard keystroke to action // map standard keystroke to action
doAddKeyBinding(provider, action, keyStroke); doAddKeyBinding(provider, action, keyStroke);
// map workaround keystroke to action
fixupAltGraphKeyStrokeMapping(provider, action, keyStroke);
} }
public String validateActionKeyBinding(DockingActionIf dockingAction, KeyStroke ks) { public String validateActionKeyBinding(DockingActionIf dockingAction, KeyStroke ks) {
@ -145,24 +141,6 @@ public class KeyBindingsManager implements PropertyChangeListener {
return null; return null;
} }
private void fixupAltGraphKeyStrokeMapping(ComponentProvider provider, DockingActionIf action,
KeyStroke keyStroke) {
// special case
int modifiers = keyStroke.getModifiers();
if ((modifiers & InputEvent.ALT_DOWN_MASK) == InputEvent.ALT_DOWN_MASK) {
//
// Also register the 'Alt' binding with the 'Alt Graph' mask. This fixes the but
// on Windows (https://bugs.openjdk.java.net/browse/JDK-8194873)
// that have different key codes for the left and right Alt keys.
//
modifiers |= InputEvent.ALT_GRAPH_DOWN_MASK;
KeyStroke updateKeyStroke =
KeyStroke.getKeyStroke(keyStroke.getKeyCode(), modifiers, false);
doAddKeyBinding(provider, action, updateKeyStroke, keyStroke);
}
}
private void doAddKeyBinding(ComponentProvider provider, DockingActionIf action, private void doAddKeyBinding(ComponentProvider provider, DockingActionIf action,
KeyStroke keyStroke) { KeyStroke keyStroke) {
doAddKeyBinding(provider, action, keyStroke, keyStroke); doAddKeyBinding(provider, action, keyStroke, keyStroke);