X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=286ded1afd45fcd19f8fc9ec63ea2c4aba2c59d7;hb=26b115b0a77d521da92a06572d9b7819c2d0d49a;hp=49dc7ff1f082fddbb51a1dc28f6fc840e3eda21c;hpb=a703cb429a2f2b417b9850ce3a8fd6f271d182d3;p=jalview.git

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 49dc7ff..286ded1 100644
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -23,6 +23,8 @@ package jalview.util;
 import java.awt.Toolkit;
 import java.awt.event.MouseEvent;
 
+import javax.swing.SwingUtilities;
+
 /**
  * System platform information used by Applet and Application
  * 
@@ -30,25 +32,67 @@ import java.awt.event.MouseEvent;
  */
 public class Platform
 {
-  private static Boolean isAMac = null;
 
+  private static boolean isJS = /** @j2sNative true || */false;
+
+  private static Boolean isNoJSMac = null, isNoJSWin = null, 
+		  isMac = null, isWin = null;
+  
   private static Boolean isHeadless = null;
 
   /**
+   * added to group mouse events into Windows and nonWindows (mac, unix, linux)
+   * @return
+   */
+  public static boolean isMac()
+  {
+	  return (isMac == null ? (isMac = (System.getProperty("os.name").indexOf("Mac") >= 0)) : isMac);
+  }
+
+  /**
+   * added to group mouse events into Windows and nonWindows (mac, unix, linux)
+   * @return
+   */
+  public static boolean isWin() 
+  {
+	  return (isWin == null ? (isWin = (System.getProperty("os.name").indexOf("Win") >= 0)) : isWin);
+  }
+
+  /**
+   * 
+   * @return true if HTML5 JavaScript
+   */
+  public static boolean isJS()
+  {
+	return isJS;
+  }
+
+  /**
    * sorry folks - Macs really are different
    * 
+   * BH: disabled for SwingJS -- will need to check key-press issues
+   * 
    * @return true if we do things in a special way.
    */
-  public static boolean isAMac()
+  public static boolean isAMacAndNotJS()
   {
-    if (isAMac == null)
-    {
-      isAMac = System.getProperty("os.name").indexOf("Mac") > -1;
-    }
-    return isAMac.booleanValue();
-
+	return (isNoJSMac == null ? (isNoJSMac = !isJS && isMac()) : isNoJSMac);
   }
 
+/**
+   * Check if we are on a Microsoft plaform...
+   * 
+   * @return true if we have to cope with another platform variation
+   */
+  public static boolean isWindowsAndNotJS()
+  {
+	return (isNoJSWin == null ? (isNoJSWin = !isJS && isWin()) : isNoJSWin);
+   }
+
+  /**
+   * 
+   * @return true if we are running in non-interactive no UI mode
+   */
   public static boolean isHeadless()
   {
     if (isHeadless == null)
@@ -91,7 +135,7 @@ public class Platform
   /**
    * Answers true if the mouse event has Meta-down (Command key on Mac) or
    * Ctrl-down (on other o/s). Note this answers _false_ if the Ctrl key is
-   * pressed instead of the Meta/Cmd key on Mac. To test for Ctrl-click on Mac,
+   * pressed instead of the Meta/Cmd key on Mac. To test for Ctrl-pressed on Mac,
    * you can use e.isPopupTrigger().
    * 
    * @param e
@@ -99,8 +143,7 @@ public class Platform
    */
   public static boolean isControlDown(MouseEvent e)
   {
-    boolean aMac = isAMac();
-    return isControlDown(e, aMac);
+    return isControlDown(e, isMac());
   }
 
   /**
@@ -112,19 +155,70 @@ public class Platform
    */
   protected static boolean isControlDown(MouseEvent e, boolean aMac)
   {
-    if (aMac)
-    {
-      /*
-       * answer false for right mouse button
-       */
-      if (e.isPopupTrigger())
-      {
-        return false;
-      }
-      return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() & e
-              .getModifiers()) != 0;
-      // could we use e.isMetaDown() here?
+    if (!aMac) {
+        return e.isControlDown();    	
     }
-    return e.isControlDown();
+      // 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?
+  }
+
+  /**
+   * Windows (not Mac, Linux, or Unix) and right button
+   * to test for the right-mouse pressed event in Windows
+   * that would have opened a menu or a Mac. 
+   * 
+   * @param e
+   * @return
+   */
+  public static boolean isWinRightButton(MouseEvent e) 
+  {
+	  // was !isAMac(), but that is true also for Linux and Unix and JS, 
+
+	  return isWin() && SwingUtilities.isRightMouseButton(e);
+  }
+  
+  
+  /**
+   * Windows (not Mac, Linux, or Unix) and middle button -- for mouse wheeling 
+   * without pressing the button.
+   * 
+   * @param e
+   * @return
+   */
+  public static boolean isWinMiddleButton(MouseEvent e) 
+  {
+	// was !isAMac(), but that is true also for Linux and Unix and JS
+	  return isWin() && SwingUtilities.isMiddleMouseButton(e);
   }
+
+  public static boolean allowMnemonics() 
+  {
+	return !isMac();
+  }
+  
+  public final static int TIME_RESET = 0;
+  public final static int TIME_MARK  = 1;
+  
+  public static long time, mark;
+  
+  public static void timeCheck(String msg, int mode) {
+	  switch (mode) {
+	  case TIME_RESET:
+		  time = mark = System.currentTimeMillis();
+		  System.err.println("Platform: timer reset\t\t\t" + msg);
+		  break;
+	  case TIME_MARK:
+		  long t = System.currentTimeMillis();
+		  if (time == 0)
+			  time = mark = t;
+		  System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
+		  mark = t;
+		  break;
+	  }
+  }
+
+   
 }