make pixelDensity(displayDensity()) work properly, fixes processing#3436

benfry · benfry · commit 9e08b98ae325 · 2015-06-26T08:47:00.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -1120,6 +1120,7 @@ public int displayDensity() {
           return 1;
         }
       }
+      // If nobody's density is 1 (or != 2, to be exact) then everyone is 2
       return 2;
     }
     return displayDensity(display);
@@ -1153,7 +1154,7 @@ static public int displayDensity(int display) {
               System.err.println("Only one display is currently known, use displayDensity(1).");
             } else {
               System.err.format("Your displays are numbered %d through %d, " +
-                "pass one of those numbers to displayDensity()", 1, devices.length);
+                "pass one of those numbers to displayDensity()%n", 1, devices.length);
             }
             throw new RuntimeException("Display " + display + " does not exist.");
           }
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -329,6 +329,11 @@ make sure that it uses numbers (or displayWidth/Height), copy into settings
     String[] pixelDensityContents = matchMethod("pixelDensity", searchArea);
     if (pixelDensityContents != null) {
       extraStatements.append(pixelDensityContents[0]);
+    } else {
+      pixelDensityContents = matchDensityMess(searchArea);
+      if (pixelDensityContents != null) {
+        extraStatements.append(pixelDensityContents[0]);
+      }
     }
 
     String[] sizeContents = matchMethod("size", searchArea);
@@ -433,6 +438,13 @@ static protected String[] matchMethod(String methodName, String searchArea) {
   }
 
 
+  static protected String[] matchDensityMess(String searchArea) {
+    final String regexp =
+      "(?:^|\\s|;)pixelDensity\\s*\\(\\s*displayDensity\\s*\\([^\\)]*\\)\\s*\\)\\s*\\;";
+    return PApplet.match(searchArea, regexp);
+  }
+
+
   /**
    * Replace all commented portions of a given String as spaces.
    * Utility function used here and in the preprocessor.

Original file line number	Diff line number	Diff line change
`@@ -1120,6 +1120,7 @@ public int displayDensity() {`
`1120`	`1120`	`return 1;`
`1121`	`1121`	`}`
`1122`	`1122`	`}`
	`1123`	`+ // If nobody's density is 1 (or != 2, to be exact) then everyone is 2`
`1123`	`1124`	`return 2;`
`1124`	`1125`	`}`
`1125`	`1126`	`return displayDensity(display);`
`@@ -1153,7 +1154,7 @@ static public int displayDensity(int display) {`
`1153`	`1154`	`System.err.println("Only one display is currently known, use displayDensity(1).");`
`1154`	`1155`	`} else {`
`1155`	`1156`	`System.err.format("Your displays are numbered %d through %d, " +`
`1156`		`- "pass one of those numbers to displayDensity()", 1, devices.length);`
	`1157`	`+ "pass one of those numbers to displayDensity()%n", 1, devices.length);`
`1157`	`1158`	`}`
`1158`	`1159`	`throw new RuntimeException("Display " + display + " does not exist.");`
`1159`	`1160`	`}`