From 6f4b1f730e347f625d5968068ff388c6d96d0440 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Mon, 12 May 2025 15:54:12 -0400
Subject: [PATCH] Fixed mouse listener ordering

---
 .../main/java/docking/DockableComponent.java  | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java b/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
index 36445f4051..5638d3790f 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
@@ -18,12 +18,15 @@ package docking;
 import java.awt.*;
 import java.awt.dnd.*;
 import java.awt.event.*;
+import java.util.List;
 
 import javax.swing.*;
 
 import docking.action.DockingActionIf;
-import ghidra.util.*;
+import ghidra.util.CascadedDropTarget;
+import ghidra.util.HelpLocation;
 import help.HelpService;
+import util.CollectionUtils;
 
 /**
  * Wrapper class for user components. Adds the title, local toolbar and provides the drag target
@@ -169,18 +172,9 @@ public class DockableComponent extends JPanel implements ContainerListener {
 			return;
 		}
 
-		//
-		// Consume the event so that Java UI listeners do not process it.  This fixes issues with
-		// UI classes (e.g., listeners change table selection).   We want to run this code later to
-		// allow trailing application mouse listeners to have a chance to update the context.  If
-		// the delayed nature causes any timing issues, then we will need a more robust way of 
-		// registering mouse listeners to work around this issue.
-		//
 		e.consume();
-		Swing.runLater(() -> {
-			PopupMenuContext popupContext = new PopupMenuContext(e);
-			actionMgr.showPopupMenu(placeholder, popupContext);
-		});
+		PopupMenuContext popupContext = new PopupMenuContext(e);
+		actionMgr.showPopupMenu(placeholder, popupContext);
 	}
 
 	@Override
@@ -342,30 +336,46 @@ public class DockableComponent extends JPanel implements ContainerListener {
 		}
 
 		if (comp.isFocusable()) {
-			installPopupListenerFirst(comp);
+			installPopupListener(comp);
 		}
 	}
 
 	/**
-	 * Remove and re-add all mouse listeners so our popup listener can go first.  This allows our
+	 * Remove, reorder and re-add all mouse listeners so Java listeners go last.  This allows our
 	 * popup listener to consume the event, preventing Java UI listeners from changing the table 
 	 * selection when the user is performing a Ctrl-Mouse click on the Mac.
 	 * 
 	 * @param comp the component
 	 */
-	private void installPopupListenerFirst(Component comp) {
-		comp.removeMouseListener(popupListener);
-		MouseListener[] listeners = comp.getMouseListeners();
+	private void installPopupListener(Component comp) {
+
+		// remove and add the listeners according to the sorted order so that will be installed as
+		// they are ordered in the list
+		List<MouseListener> listeners = createOrderedListeners(comp);
 		for (MouseListener l : listeners) {
 			comp.removeMouseListener(l);
-		}
-
-		comp.addMouseListener(popupListener);
-		for (MouseListener l : listeners) {
 			comp.addMouseListener(l);
 		}
 	}
 
+	private List<MouseListener> createOrderedListeners(Component comp) {
+
+		// Get the current listeners, add the popup mouse listener for this class, then move any 
+		// Java listeners to the back of the list by removing them and re-adding them.
+		MouseListener[] listeners = comp.getMouseListeners();
+		List<MouseListener> orderedListeners = CollectionUtils.asList(listeners);
+		orderedListeners.add(popupListener);
+		for (MouseListener l : listeners) {
+			String name = l.getClass().getName();
+			if (name.startsWith("javax.") || name.startsWith("sun.")) {
+				orderedListeners.remove(l);
+				orderedListeners.add(l);
+			}
+		}
+
+		return orderedListeners;
+	}
+
 	private void deinitializeComponents(Component comp) {
 		if (comp instanceof CellRendererPane) {
 			return;