JAL-3446 no need for SHIFT_DOWN or ALT_DOWN masks

[jalview.git] / src / jalview / util / Platform.java

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index b1b6697..e4ed14f 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -22,7 +22,9 @@ package jalview.util;
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,6 +34,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -108,6 +111,32 @@ public class Platform
             : isMac);
   }
 
+  public static int SHORTCUT_KEY_MASK = (Platform.isMac() ? KeyEvent.META_DOWN_MASK : KeyEvent.CTRL_DOWN_MASK);
+ 
+  static
+  {
+    if (!GraphicsEnvironment.isHeadless())
+    {
+      try
+      {
+
+        Toolkit tk = Toolkit.getDefaultToolkit();
+        Method method = tk.getClass().getMethod("getMenuShortcutKeyMaskEx");
+        if (method == null)
+          method = tk.getClass().getMethod("getMenuShortcutKeyMask");
+        SHORTCUT_KEY_MASK = ((int) method.invoke(tk, new Object[0]));
+        if (SHORTCUT_KEY_MASK <= 0xF)
+        {
+          // shift this into the extended region (was Java 8)
+          SHORTCUT_KEY_MASK = SHORTCUT_KEY_MASK << 6;
+        }
+      } catch (Exception e)
+      {
+        e.printStackTrace();
+      }
+    }
+  }
+
   /**
    * added to group mouse events into Windows and nonWindows (mac, unix, linux)
    * 
@@ -209,30 +238,13 @@ public class Platform
    */
   protected static boolean isControlDown(MouseEvent e, boolean aMac)
   {
-    if (!aMac)
-    {
-      return e.isControlDown();
-
-      // Jalview 2.11 code below: above is as amended for JalviewJS
-      // /*
-      // * answer false for right mouse button
-      // */
-      // if (e.isPopupTrigger())
-      // {
-      // return false;
-      // }
-      // return
-      // (jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx() //
-      // .getMenuShortcutKeyMaskEx()
-      // & jalview.util.ShortcutKeyMaskExWrapper
-      // .getModifiersEx(e)) != 0; // getModifiers()) != 0;
-    }
-    // answer false for right mouse button
-    // shortcut key will be META for a Mac
-    return !e.isPopupTrigger()
-            && (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
-                    & e.getModifiers()) != 0;
-    // could we use e.isMetaDown() here?
+
+    System.out.println(e.isPopupTrigger() 
+            + " " + ((SHORTCUT_KEY_MASK & e.getModifiersEx()) != 0) 
+            + " " + e.isControlDown());
+    return (aMac ? !e.isPopupTrigger()
+            && (SHORTCUT_KEY_MASK & e.getModifiersEx()) != 0
+            : e.isControlDown());
   }
 
   // BH: I don't know about that previous method. Here is what SwingJS uses.