Merge remote-tracking branch

'origin/GP-5618-dragonmacher-table-popup-fix--SQUASHED' (Closes #7902)

Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -166,6 +166,7 @@ public class DockableComponent extends JPanel implements ContainerListener {
 		if (e.isPopupTrigger() && withinBounds) {
 			PopupMenuContext popupContext = new PopupMenuContext(e);
 			actionMgr.showPopupMenu(placeholder, popupContext);
+			e.consume();
 		}
 	}
 
@@ -328,8 +329,27 @@ public class DockableComponent extends JPanel implements ContainerListener {
 		}
 
 		if (comp.isFocusable()) {
-			comp.removeMouseListener(popupListener);
+			installPopupListenerFirst(comp);
-			comp.addMouseListener(popupListener);
+		}
+	}
+
+	/**
+	 * Remove and re-add all mouse listeners so our popup listener can go first.  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();
+		for (MouseListener l : listeners) {
+			comp.removeMouseListener(l);
+		}
+
+		comp.addMouseListener(popupListener);
+		for (MouseListener l : listeners) {
+			comp.addMouseListener(l);
 		}
 	}
 

Ghidra/Framework/Docking/src/main/java/docking/widgets/JTreeMouseListenerDelegate.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java

@@ -104,7 +104,7 @@ public class GTable extends JTable {
 	private MouseListener selectRowListener = new MouseAdapter() {
 		@Override
 		public void mousePressed(MouseEvent e) {
-			if (e.getButton() == MouseEvent.BUTTON3) {
+			if (e.isPopupTrigger()) {
 				int row = rowAtPoint(e.getPoint());
 				if (row >= 0) {
 					if (!isRowSelected(row)) {

Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java

@@ -1734,6 +1734,14 @@ public class GTree extends JPanel implements BusyListener {
 			}
 		}
 
+		@Override
+		public synchronized MouseListener[] getMouseListeners() {
+			if (mouseListenerDelegate == null) {
+				return super.getMouseListeners();
+			}
+			return mouseListenerDelegate.getMouseListeners();
+		}
+
 		@Override
 		public void removeSelectionPath(TreePath path) {
 			// Called by the UI to add/remove selections--mark it as a user event.