fixes missing JPopupMenu.isPopupTrigger(), event.isPopupTrigger()

hansonr · hansonr · commit 1437a63fb3b6 · 2019-01-21T12:55:53.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190121000416 
+20190121071846 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190121000416 
+20190121071846 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java b/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java
@@ -337,22 +337,13 @@ private int updateClickCount(int id, long time, int x, int y) {
 	private void mouseAction(int id, long time, int x, int y, int xcount,
 			int modifiers, int dy) {
 
-		// Oddly, Windows returns InputEvent.META_DOWN_MASK on release, though
-		// BUTTON3_DOWN_MASK for pressed. So here we just accept both when not a
-		// mac.
-		// A bit of a kludge.
-
-		int extended = modifiers & EXTENDED_MASK;
-		boolean popupTrigger = (
-				extended == InputEvent.BUTTON3_DOWN_MASK	|| 
-				extended == InputEvent.META_DOWN_MASK ||
-				JSToolkit.isMac && extended == (InputEvent.CTRL_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK));
 		int button = getButton(modifiers);
 		int count = (xcount > 1 && id == MouseEvent.MOUSE_CLICKED ? xcount : updateClickCount(id, time, x, y));
+		boolean popupTrigger = isPopupTrigger(id, modifiers, JSToolkit.isWin);
 
 		Component source = viewer.getTopComponent(); // may be a JFrame
 		MouseEvent e;
-		if (id == MouseEvent.MOUSE_WHEEL) {
+		if (id == MouseEvent.MOUSE_WHEEL) { 
 			e = new MouseWheelEvent(source, id, time, modifiers, x, y, x, y, count, 
 							popupTrigger, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, dy);
 		} else {
@@ -387,9 +378,34 @@ private void mouseAction(int id, long time, int x, int y, int xcount,
 		  ((Container) e.getSource()).dispatchEvent(e);
 		}
 	}
+	
+	private static boolean isPopupTrigger(int id, int mods, boolean isWin) {
+		boolean rt = ((mods & InputEvent.BUTTON3_MASK) != 0);
+		if (isWin) {
+			if (id != MouseEvent.MOUSE_RELEASED)
+				return false;
+//
+//			// Oddly, Windows returns InputEvent.META_DOWN_MASK on release, though
+//			// BUTTON3_DOWN_MASK for pressed. So here we just accept both.
+//
+// actually, we can use XXX_MASK, not XXX_DOWN_MASK and avoid this issue, because
+// J2S adds the appropriate extended (0xFFFFC000) and simple (0x3F) modifiers. 
+//			final boolean isMetaDown = ((jmodifiers & InputEvent.META_DOWN_MASK) != 0);
+//
+			return rt;// || isMetaDown;
+		} else {
+			// mac, linux, unix
+			if (id != MouseEvent.MOUSE_PRESSED)
+				return false;
+			boolean lt = ((mods & InputEvent.BUTTON1_MASK) != 0);
+			boolean ctrl = ((mods & InputEvent.CTRL_MASK) != 0);
+			return rt || (ctrl && lt);
+		}
+	}
 
 	private boolean keyAction(int id, int modifiers, Object jqevent2, long time) {
 		return JSKeyEvent.dispatchKeyEvent(id, modifiers, jqevent, time);
 	}
 
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -73,13 +73,16 @@ public class JSToolkit extends SunToolkit implements KeyboardFocusManagerPeerPro
 	/**
 	 * for JSMouse only
 	 */
-	public static boolean isMac;
+	public static boolean isMac, isLinux, isUnix, isWin;
 		
 	static {
 		/**
 		 * @j2sNative
 		 * 
-		 * swingjs.JSToolkit.isMac = (J2S.featureDetection.os == "mac");
+		 * C$.isMac = (J2S.featureDetection.os == "mac");
+		 * C$.isLinux = (J2S.featureDetection.os == "linux");
+		 * C$.isUnix = (J2S.featureDetection.os == "unix");
+		 * C$.isWin = (J2S.featureDetection.os == "win");
 		 * 
 		 */
 		{
@@ -93,7 +96,7 @@ public class JSToolkit extends SunToolkit implements KeyboardFocusManagerPeerPro
 	 */
 
 	public JSToolkit() {
-		super();		
+		super();
 		System.out.println("JSToolkit initialized");
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -34,6 +34,8 @@
 import java.awt.event.ContainerListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.peer.PopupMenuPeer;
 import java.beans.PropertyChangeEvent;
 
 import javax.swing.InputMap;
@@ -176,11 +178,6 @@ protected void uninstallListeners() {
         }
     }
 
-	public Object getPopup() {
-		// TODO: this causes an uncaught error. 
-		return null;		
-	}
-
 	@Override
 	public void setVisible(boolean b) {
 		// TODO: We are not setting vis false when closing
@@ -1178,5 +1175,8 @@ public static void processJ2SMenuCmd(Object[] data) {
 		}
 	}
 
+    public boolean isPopupTrigger(MouseEvent e) {
+        return e.isPopupTrigger();
+    }
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -71,7 +71,7 @@ public void processKeyEvent(KeyEvent e, MenuElement[] path, MenuSelectionManager
 
 	
 	
-int nAction = 0;
+	int nAction = 0;
 
 	ActionListener listener = new ActionListener() {
 
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Event.java b/sources/net.sf.j2s.java.core/src/test/Test_Event.java

Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,16 @@ public class JSToolkit extends SunToolkit implements KeyboardFocusManagerPeerPro`
`73`	`73`	`/**`
`74`	`74`	`* for JSMouse only`
`75`	`75`	`*/`
`76`		`- public static boolean isMac;`
	`76`	`+ public static boolean isMac, isLinux, isUnix, isWin;`
`77`	`77`
`78`	`78`	`static {`
`79`	`79`	`/**`
`80`	`80`	`* @j2sNative`
`81`	`81`	`*`
`82`		`- * swingjs.JSToolkit.isMac = (J2S.featureDetection.os == "mac");`
	`82`	`+ * C$.isMac = (J2S.featureDetection.os == "mac");`
	`83`	`+ * C$.isLinux = (J2S.featureDetection.os == "linux");`
	`84`	`+ * C$.isUnix = (J2S.featureDetection.os == "unix");`
	`85`	`+ * C$.isWin = (J2S.featureDetection.os == "win");`
`83`	`86`	`*`
`84`	`87`	`*/`
`85`	`88`	`{`
`@@ -93,7 +96,7 @@ public class JSToolkit extends SunToolkit implements KeyboardFocusManagerPeerPro`
`93`	`96`	`*/`
`94`	`97`
`95`	`98`	`public JSToolkit() {`
`96`		`- super();`
	`99`	`+ super();`
`97`	`100`	`System.out.println("JSToolkit initialized");`
`98`	`101`	`}`
`99`	`102`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@`
`34`	`34`	`import java.awt.event.ContainerListener;`
`35`	`35`	`import java.awt.event.KeyEvent;`
`36`	`36`	`import java.awt.event.KeyListener;`
	`37`	`+import java.awt.event.MouseEvent;`
	`38`	`+import java.awt.peer.PopupMenuPeer;`
`37`	`39`	`import java.beans.PropertyChangeEvent;`
`38`	`40`
`39`	`41`	`import javax.swing.InputMap;`
`@@ -176,11 +178,6 @@ protected void uninstallListeners() {`
`176`	`178`	`}`
`177`	`179`	`}`
`178`	`180`
`179`		`- public Object getPopup() {`
`180`		`- // TODO: this causes an uncaught error.`
`181`		`- return null;`
`182`		`- }`
`183`		`-`
`184`	`181`	`@Override`
`185`	`182`	`public void setVisible(boolean b) {`
`186`	`183`	`// TODO: We are not setting vis false when closing`
`@@ -1178,5 +1175,8 @@ public static void processJ2SMenuCmd(Object[] data) {`
`1178`	`1175`	`}`
`1179`	`1176`	`}`
`1180`	`1177`
	`1178`	`+ public boolean isPopupTrigger(MouseEvent e) {`
	`1179`	`+ return e.isPopupTrigger();`
	`1180`	`+ }`
`1181`	`1181`
`1182`	`1182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void processKeyEvent(KeyEvent e, MenuElement[] path, MenuSelectionManager`
`71`	`71`
`72`	`72`
`73`	`73`
`74`		`-int nAction = 0;`
	`74`	`+ int nAction = 0;`
`75`	`75`
`76`	`76`	`ActionListener listener = new ActionListener() {`
`77`	`77`