X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fjalview%2Fbin%2FHiDPISetting.java;h=d6d440a363298761080ea333db85f23dc7d60fe3;hb=1a4dd17cef65c03cf088a1e5aa4520078f1daeb8;hp=bea9daecd8c7d07a10feb190f7d6a3d32e2fd9a9;hpb=841509c5eccc4b4d9997897004bd916a85a30943;p=jalview.git

diff --git a/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java b/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java
index bea9dae..d6d440a 100644
--- a/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java
+++ b/getdown/src/getdown/core/src/main/java/jalview/bin/HiDPISetting.java
@@ -1,62 +1,212 @@
 package jalview.bin;
 
-import java.awt.Toolkit;
+import java.awt.HeadlessException;
 
 public class HiDPISetting
 {
-  public static final int dpi;
+  private static final int hidpiThreshold = 160;
 
-  public static final int scale;
+  private static final int hidpiMultiThreshold = 240;
 
-  private static final int hidpi = 110;
+  private static final int bigScreenThreshold = 1400;
 
-  private static final String scalePropertyName = "sun.java2d.uiScale";
-
-  private static final boolean isAMac;
+  public static final String scalePropertyName = "sun.java2d.uiScale";
 
   private static final boolean isLinux;
 
-  private static final boolean isWindows;
+  // private static final boolean isAMac;
+
+  // private static final boolean isWindows;
+
+  public static final String setHiDPIPropertyName = "setHiDPI";
+
+  public static final String setHiDPIScalePropertyName = "setHiDPIScale";
+
+  private static boolean setHiDPI = false;
+
+  private static int setHiDPIScale = 0;
+
+  public static int dpi = 0;
 
-  public static final String forceHiDPISettingPropertyName = "forceHiDPISetting";
+  public static int mindimension = 0;
 
-  private static final boolean forceHiDPISetting;
+  public static int width = 0;
+
+  public static int scale = 0;
+
+  private static boolean doneInit = false;
+
+  private static boolean allowScalePropertyArg = false;
+
+  private static ScreenInfo screenInfo = new ScreenInfo();
 
   static
   {
-    isAMac = System.getProperty("os.name").indexOf("Mac") > -1;
-    isLinux = System.getProperty("os.name").toLowerCase()
-            .indexOf("linux") > -1;
-    isWindows = System.getProperty("os.name").toLowerCase()
-            .indexOf("windows") > -1;
-    dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-    scale = dpi / hidpi + 1;
-    String forceHiDPISettingProperty = System
-            .getProperty(forceHiDPISettingPropertyName);
-    forceHiDPISetting = forceHiDPISettingProperty != null
-            && forceHiDPISettingProperty.equalsIgnoreCase("true");
-    if (doCondition())
+    String system = System.getProperty("os.name") == null ? null
+            : System.getProperty("os.name").toLowerCase();
+    if (system != null)
+    {
+      isLinux = system.indexOf("linux") > -1;
+      // isAMac = system.indexOf("mac") > -1;
+      // isWindows = system.indexOf("windows") > -1;
+    }
+    else
+    {
+      isLinux = false;
+      // isAMac = isWindows = false;
+    }
+  }
+
+  private static void init()
+  {
+    if (doneInit)
+    {
+      return;
+    }
+
+    // get and use command line property values first
+    String setHiDPIProperty = System.getProperty(setHiDPIPropertyName);
+    setHiDPI = setHiDPIProperty != null
+            && setHiDPIProperty.equalsIgnoreCase("true");
+
+    String setHiDPIScaleProperty = System
+            .getProperty(setHiDPIScalePropertyName);
+    if (setHiDPIScaleProperty != null)
+    {
+      try
+      {
+        setHiDPIScale = Integer.parseInt(setHiDPIScaleProperty);
+      } catch (NumberFormatException e)
+      {
+        System.err.println(setHiDPIScalePropertyName + " property give ("
+                + setHiDPIScaleProperty + ") but not parseable as integer");
+      }
+    }
+    if (setHiDPI && setHiDPIScale > 0)
+    {
+      setHiDPIScale(setHiDPIScale);
+      return;
+    }
+
+    // check to see if the scale property has already been set by something else
+    // (e.g. the OS)
+    String existingProperty = System.getProperty(scalePropertyName);
+    if (existingProperty != null)
+    {
+      try
+      {
+        int existingPropertyVal = Integer.parseInt(existingProperty);
+        System.out.println("Existing " + scalePropertyName + " is "
+                + existingPropertyVal);
+        if (existingPropertyVal > 1)
+        {
+          setHiDPIScale(existingPropertyVal);
+          return;
+        }
+      } catch (NumberFormatException e)
+      {
+        System.out.println("Could not convert property " + scalePropertyName
+                + " vale '" + existingProperty + "' to number");
+      }
+    }
+
+    // Try and auto guess a good scale based on reported DPI (not trustworthy)
+    // and screen resolution (more trustworthy)
+
+    // get screen dpi
+    screenInfo = getScreenInfo();
+    try
+    {
+      dpi = screenInfo.getScreenResolution();
+    } catch (HeadlessException e)
+    {
+      System.err.println("Cannot get screen resolution: " + e.getMessage());
+    }
+
+    // try and get screen size height and width
+    try
+    {
+      int height = screenInfo.getScreenHeight();
+      int width = screenInfo.getScreenWidth();
+      // using mindimension in case of portrait screens
+      mindimension = Math.min(height, width);
+    } catch (HeadlessException e)
+    {
+      System.err.println(
+              "Cannot get screen size height and width:" + e.getMessage());
+    }
+
+    // attempt at a formula for scaling based on screen dpi and mindimension.
+    // scale will be an integer >=1. This formula is based on some testing and
+    // guesswork!
+
+    // scale based on reported dpi. if dpi>hidpiThreshold then scale=2+multiples
+    // of hidpiMultiThreshold (else scale=1)
+    // (e.g. dpi of 110 scales 1. dpi of 120 scales 2. dpi of 360 scales 3)
+    int dpiScale = (dpi - hidpiThreshold > 0)
+            ? 2 + ((dpi - hidpiThreshold) / hidpiMultiThreshold)
+            : 1;
+
+    int dimensionScale = 1 + (mindimension / bigScreenThreshold);
+
+    // choose larger of dimensionScale or dpiScale (most likely dimensionScale
+    // as dpiScale often misreported)
+    int autoScale = Math.max(dpiScale, dimensionScale);
+
+    // only make an automatic change if scale is changed and other conditions
+    // (OS is linux) apply, or if setHiDPI has been specified
+    if ((autoScale > 1 && isLinux) || setHiDPI)
     {
-      System.out.println("Property '" + forceHiDPISettingPropertyName + "'="
-              + forceHiDPISettingProperty);
-      System.out.println("boolean forceHiDPISetting=" + forceHiDPISetting);
-      System.out.println("DPI detected as " + dpi
-              + ". Scaling factor set to " + scale + ".");
+      setHiDPIScale(autoScale);
+      return;
     }
+
+    // looks like we're not doing any scaling
+    doneInit = true;
   }
 
-  private static synchronized boolean doCondition()
+  public static void setHiDPIScale(int s)
   {
-    return (scale > 1 && isLinux) || forceHiDPISetting;
+    scale = s;
+    allowScalePropertyArg = true;
+    doneInit = true;
   }
 
-  public static synchronized String getScalePropertyArg()
+  public static String getScalePropertyArg(int s)
   {
+    return "-D" + scalePropertyName + "=" + String.valueOf(s);
+  }
+
+  public static String getScalePropertyArg()
+  {
+    init();
     // HiDPI setting. Just looking at Linux to start with. Test with Windows.
-    if (doCondition())
+    return allowScalePropertyArg ? getScalePropertyArg(scale) : null;
+  }
+
+  public static void clear()
+  {
+    setHiDPI = false;
+    setHiDPIScale = 0;
+    dpi = 0;
+    mindimension = 0;
+    width = 0;
+    scale = 0;
+    doneInit = false;
+    allowScalePropertyArg = false;
+  }
+
+  public static void setScreenInfo(ScreenInfo si)
+  {
+    screenInfo = si;
+  }
+
+  public static ScreenInfo getScreenInfo()
+  {
+    if (screenInfo == null)
     {
-      return "-D" + scalePropertyName + "=" + scale;
+      screenInfo = new ScreenInfo();
     }
-    return null;
+    return screenInfo;
   }
 }