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

Update key event processing to not fire Java actions, but to instead let

Browse source 
Java handle them.
This commit is contained in:
dragonmacher 2025-04-23 14:13:17 -04:00
parent ac4b4bb5d2
commit 10366c08e4
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java
View file

@ -108,6 +108,7 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
*/ */
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
if (blockKeyInput(event)) { if (blockKeyInput(event)) {
return true; // let NO events through! return true; // let NO events through!
} }
@ -143,10 +144,19 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
// actions registered on the focused component are allowed to process the event before our // actions registered on the focused component are allowed to process the event before our
// action system. This allows clients to perform custom event processing without the action // action system. This allows clients to perform custom event processing without the action
// system interfering. // system interfering.
if (processComponentKeyListeners(event) || processInputAndActionMaps(event)) { if (processComponentKeyListeners(event)) {
return true; return true;
} }
// If there is a registered Java action, let the normal Java event flow process the event.
// (This will only work as expected if the Java action is registered for key pressed events.
// If it is registered for released events, and we have a valid and enabled docking action,
// then the docking action will take precedence, since docking actions are always registered
// for key pressed events.)
if (hasJavaAction(event)) {
return false;
}
if (!executableAction.isValid()) { if (!executableAction.isValid()) {
// The action is not currently valid for the given focus owner. Let all key strokes go // The action is not currently valid for the given focus owner. Let all key strokes go
// to Java when we have no valid context. This allows keys like Escape to work on Java // to Java when we have no valid context. This allows keys like Escape to work on Java
@ -380,7 +390,7 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
// //
// returns true if there is a focused component that has an action for the given event // returns true if there is a focused component that has an action for the given event
// and it processes that action. // and it processes that action.
private boolean processInputAndActionMaps(KeyEvent event) { private boolean hasJavaAction(KeyEvent event) {
KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(event); KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(event);
Component focusOwner = focusProvider.getFocusOwner(); Component focusOwner = focusProvider.getFocusOwner();
@ -390,12 +400,7 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
JComponent jComponent = (JComponent) focusOwner; JComponent jComponent = (JComponent) focusOwner;
Action action = getJavaActionForComponent(jComponent, keyStroke); Action action = getJavaActionForComponent(jComponent, keyStroke);
if (action != null) { return action != null && action.isEnabled();
Object source = event.getSource();
int modifiers = event.getModifiersEx();
return SwingUtilities.notifyAction(action, keyStroke, event, source, modifiers);
}
return false;
} }
private Action getJavaActionForComponent(JComponent jComponent, KeyStroke keyStroke) { private Action getJavaActionForComponent(JComponent jComponent, KeyStroke keyStroke) {