Merge branch 'main' into gradle-runner

Author: Stefterv

.all-contributorsrc

@@ -1651,6 +1651,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "npNSU",
+      "name": "Nia Perez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/179620963?v=4",
+      "profile": "https://github.com/npNSU",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SuganthiThomas",
+      "name": "SuganthiThomas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150956406?v=4",
+      "profile": "https://github.com/SuganthiThomas",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",

README.md

@@ -315,6 +315,10 @@ _Note: due to GitHub's limitations, this repository's [Contributors](https://git
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/manoellribeiro"><img src="https://avatars.githubusercontent.com/u/59377764?v=4?s=120" width="120px;" alt="Manoel Ribeiro"/><br /><sub><b>Manoel Ribeiro</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=manoellribeiro" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://softmoon.world"><img src="https://avatars.githubusercontent.com/u/15107?v=4?s=120" width="120px;" alt="Moon"/><br /><sub><b>Moon</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=catilac" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/npNSU"><img src="https://avatars.githubusercontent.com/u/179620963?v=4?s=120" width="120px;" alt="Nia Perez"/><br /><sub><b>Nia Perez</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=npNSU" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/SuganthiThomas"><img src="https://avatars.githubusercontent.com/u/150956406?v=4?s=120" width="120px;" alt="SuganthiThomas"/><br /><sub><b>SuganthiThomas</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=SuganthiThomas" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

app/src/processing/app/Base.java

@@ -65,7 +65,9 @@ public class Base {
    * if an empty file named 'debug' is found in the settings folder.
    * See implementation in createAndShowGUI().
    */
-  static public boolean DEBUG = System.getenv().containsKey("DEBUG");
+  
+  static public boolean DEBUG = Boolean.parseBoolean(System.getenv().getOrDefault("DEBUG", "false"));
+
 
   /** True if running via Commander. */
   static private boolean commandLine;

app/src/processing/app/Processing.kt

@@ -12,14 +12,28 @@ import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
 import processing.app.gradle.api.Sketch
 import processing.app.api.Contributions
+import processing.app.api.SketchCommand
 import processing.app.api.Sketchbook
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences
 import kotlin.concurrent.thread
 
-class Processing: SuspendingCliktCommand("processing"){
-    val version by option("-v","--version")
+
+suspend fun main(args: Array<String>) {
+    Processing()
+        .subcommands(
+            LSP(),
+            LegacyCLI(args),
+            Contributions(),
+            Sketchbook(),
+            SketchCommand()
+        )
+        .main(args)
+}
+
+class Processing : SuspendingCliktCommand("processing") {
+    val version by option("-v", "--version")
         .flag()
         .help("Print version information")
 
@@ -30,7 +44,7 @@ class Processing: SuspendingCliktCommand("processing"){
     override fun help(context: Context) = "Start the Processing IDE"
     override val invokeWithoutSubcommand = true
     override suspend fun run() {
-        if(version){
+        if (version) {
             println("processing-${Base.getVersionName()}-${Base.getRevision()}")
             return
         }
@@ -47,21 +61,10 @@ class Processing: SuspendingCliktCommand("processing"){
     }
 }
 
-suspend fun main(args: Array<String>){
-   Processing()
-        .subcommands(
-            LSP(),
-            LegacyCLI(args),
-            Sketch(),
-            Contributions(),
-            Sketchbook()
-        )
-        .main(args)
-}
 
-class LSP: SuspendingCliktCommand("lsp"){
+class LSP : SuspendingCliktCommand("lsp") {
     override fun help(context: Context) = "Start the Processing Language Server"
-    override suspend fun run(){
+    override suspend fun run() {
         try {
             // run in headless mode
             System.setProperty("java.awt.headless", "true")
@@ -76,8 +79,7 @@ class LSP: SuspendingCliktCommand("lsp"){
     }
 }
 
-
-class LegacyCLI(val args: Array<String>): SuspendingCliktCommand("cli") {
+class LegacyCLI(val args: Array<String>) : SuspendingCliktCommand("cli") {
     override val treatUnknownOptionsAsArgs = true
 
     val help by option("--help").flag()
@@ -97,35 +99,35 @@ class LegacyCLI(val args: Array<String>): SuspendingCliktCommand("cli") {
     }
 }
 
-fun updateInstallLocations(){
+fun updateInstallLocations() {
     val preferences = Preferences.userRoot().node("org/processing/app")
     val installLocations = preferences.get("installLocations", "")
         .split(",")
         .dropLastWhile { it.isEmpty() }
         .filter { install ->
-            try{
+            try {
                 val (path, version) = install.split("^")
                 val file = File(path)
-                if(!file.exists() || file.isDirectory){
+                if (!file.exists() || file.isDirectory) {
                     return@filter false
                 }
                 // call the path to check if it is a valid install location
                 val process = ProcessBuilder(path, "--version")
                     .redirectErrorStream(true)
                     .start()
                 val exitCode = process.waitFor()
-                if(exitCode != 0){
+                if (exitCode != 0) {
                     return@filter false
                 }
                 val output = process.inputStream.bufferedReader().readText()
                 return@filter output.contains(version)
-            } catch (e: Exception){
+            } catch (e: Exception) {
                 false
             }
         }
         .toMutableList()
     val command = ProcessHandle.current().info().command()
-    if(command.isEmpty) {
+    if (command.isEmpty) {
         return
     }
     val installLocation = "${command.get()}^${Base.getVersionName()}"

app/src/processing/app/api/SketchCommand.kt

@@ -0,0 +1,62 @@
+package processing.app.api
+
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.help
+import com.github.ajalt.clikt.parameters.options.option
+import processing.app.Language
+import processing.app.Platform
+import processing.app.Preferences
+import java.io.File
+
+class SketchCommand: SuspendingCliktCommand("sketch"){
+    override fun help(context: Context) = "Manage a Processing sketch"
+    override suspend fun run() {
+
+    }
+    init {
+        subcommands(Format())
+    }
+
+    class Format: SuspendingCliktCommand("format"){
+        override fun help(context: Context) = "Format a Processing sketch"
+        val file by argument("file")
+            .help("Path to the sketch file to format")
+        val inPlace by option("-i","--inplace")
+            .flag()
+            .help("Format the file in place, otherwise prints to stdout")
+
+        override suspend fun run(){
+            try {
+                Platform.init()
+                Language.init()
+                Preferences.init()
+
+                // run in headless mode
+                System.setProperty("java.awt.headless", "true")
+
+                val clazz = Class.forName("processing.mode.java.AutoFormat")
+                // Indirect invocation since app does not depend on java mode
+                val formatter = clazz
+                    .getDeclaredConstructor()
+                    .newInstance()
+
+                val method = clazz.getMethod("format", String::class.java)
+                val code = File(file).readText()
+
+                val formatted = method.invoke(formatter, code) as String
+                if(inPlace) {
+                    File(file).writeText(formatted)
+                    return
+                }
+                println(formatted)
+            } catch (e: Exception) {
+                throw InternalError("Failed to invoke main method", e)
+            }
+        }
+    }
+}

app/src/processing/app/ui/Editor.java

@@ -49,17 +49,7 @@
 import javax.swing.undo.*;
 
 import com.formdev.flatlaf.util.SystemInfo;
-import processing.app.Base;
-import processing.app.Formatter;
-import processing.app.Language;
-import processing.app.Messages;
-import processing.app.Mode;
-import processing.app.Platform;
-import processing.app.Preferences;
-import processing.app.Problem;
-import processing.app.RunnerListener;
-import processing.app.Sketch;
-import processing.app.SketchCode;
+import processing.app.*;
 import processing.utils.SketchException;
 import processing.app.contrib.ContributionManager;
 import processing.app.gradle.GradleService;
@@ -148,6 +138,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
   private FindReplace find;
   JMenu toolsMenu;
   JMenu modePopup;
+  JMenu developMenu;
 
   protected List<Problem> problems = Collections.emptyList();
 
@@ -689,6 +680,7 @@ protected void buildMenuBar() {
       helpMenu.setText(helpMenu.getText() + " ");
     }
     menubar.add(helpMenu);
+    updateDevelopMenu(menubar);
 
     Toolkit.setMenuMnemonics(menubar);
     setJMenuBar(menubar);
@@ -1069,6 +1061,37 @@ public JMenu buildModeMenu() {
 
   abstract public JMenu buildHelpMenu();
 
+  public void buildDevelopMenu(){
+    developMenu = new JMenu(Language.text("menu.develop"));
+
+    var updateTrigger = new JMenuItem(Language.text("menu.develop.check_for_updates"));
+    updateTrigger.addActionListener(e -> {
+        Preferences.unset("update.last");
+        new UpdateCheck(base);
+    });
+    developMenu.add(updateTrigger);
+
+  }
+
+  public void updateDevelopMenu(){
+    updateDevelopMenu(null);
+  }
+
+  void updateDevelopMenu(JMenuBar menu){
+      if(menu == null){
+          menu = getJMenuBar();
+      }
+      if(developMenu == null){
+          buildDevelopMenu();
+      }
+      if(Base.DEBUG){
+        menu.add(developMenu);
+      }else{
+        menu.remove(developMenu);
+      }
+
+  }
+
 
   public void showReference(String filename) {
     File file = new File(mode.getReferenceFolder(), filename);

app/src/processing/app/ui/EditorFooter.java

@@ -116,6 +116,7 @@ public EditorFooter(Editor eddie) {
       public void mousePressed(MouseEvent e) {
         if(e.getClickCount() == 5){
           Base.DEBUG = !Base.DEBUG;
+          editor.updateDevelopMenu();
         }
         var debugInformation = String.join("\n",
             "Version: " + Base.getVersionName(),

build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+
+    alias(libs.plugins.versions)
 }
 
 // Set the build directory to not /build to prevent accidental deletion through the clean action
@@ -17,4 +19,20 @@ allprojects{
     tasks.withType<Javadoc> {
         options.encoding = "UTF-8"
     }
-}
+}
+// Configure the dependencyUpdates task
+tasks {
+    dependencyUpdates {
+        gradleReleaseChannel = "current"
+
+        val nonStableKeywords = listOf("alpha", "beta", "rc")
+
+        fun isNonStable(version: String) = nonStableKeywords.any {
+            version.lowercase().contains(it)
+        }
+
+        rejectVersionIf {
+            isNonStable(candidate.version) && !isNonStable(currentVersion)
+        }
+    }
+}

build/shared/lib/languages/PDE.properties

@@ -172,6 +172,8 @@ menu.help.visit.url = https://processing.org/
 menu.help.report.url = https://github.com/processing/processing4/issues
 menu.help.ask.url = https://discourse.processing.org
 
+menu.develop = Develop
+menu.develop.check_for_updates = Force Check for updates
 
 # ---------------------------------------
 # Basics

core/src/processing/core/PApplet.java

@@ -802,6 +802,7 @@ public PSurface getSurface() {
   // Unlike the others above, needs to be public to support
   // the pixelWidth and pixelHeight fields.
   public int pixelDensity = 1;
+  boolean pixelDensityWarning = false;
 
   boolean present;
 
@@ -1082,6 +1083,9 @@ public int displayDensity(int display) {
   */
   public void pixelDensity(int density) {
     //println(density + " " + this.pixelDensity);
+
+
+    this.pixelDensityWarning = false;
     if (density != this.pixelDensity) {
       if (insideSettings("pixelDensity", density)) {
         if (density != 1 && density != 2) {
@@ -2050,6 +2054,10 @@ public void handleDraw() {
     if (frameCount == 0) {
       setup();
 
+      if(pixelDensityWarning){
+        System.err.println("Warning: Processing now sets pixelDensity(2) by default on high-density screens. This may change how your sketch looks. To revert to the old behavior, set pixelDensity(1) in setup().");
+      }
+
     } else {  // frameCount > 0, meaning an actual draw()
       // update the current frameRate
 
@@ -10108,6 +10116,7 @@ static public void runSketch(final String[] args,
     sketch.fullScreen = fullScreen;
 
     sketch.pixelDensity = sketch.displayDensity();
+    sketch.pixelDensityWarning = sketch.pixelDensity > 1;
 
     // For 3.0.1, moved this above handleSettings() so that loadImage() can be
     // used inside settings(). Sets a terrible precedent, but the alternative