Bundle GLFW/GLEW headers in libs/include for all platforms, progress bar in wizard

Author: pepc84

libs/include/GL/eglew.h

@@ -247,84 +247,14 @@ private void showGppDialog(String html, String btn, String url,
   }
 
   private void autoInstallWindows(RunnerListener listener) {
-    String script =
-      "$ErrorActionPreference = 'Stop'\n"
-    + "Write-Host '=== C++ Mode Auto-Installer ==='\n"
-    + "Write-Host ''\n"
-    + "$msys2Dirs = @('C:\\msys64','C:\\msys2','C:\\tools\\msys64',"
-    + "\"$env:USERPROFILE\\msys64\",\"$env:LOCALAPPDATA\\msys64\")\n"
-    + "$pacman = $null\n"
-    + "foreach ($dir in $msys2Dirs) {\n"
-    + "    $p = \"$dir\\usr\\bin\\pacman.exe\"\n"
-    + "    if (Test-Path $p) { $pacman = $p; Write-Host \"Found MSYS2 at $dir\"; break }\n"
-    + "}\n"
-    + "if (-not $pacman) {\n"
-    + "    $inPath = Get-Command pacman -ErrorAction SilentlyContinue\n"
-    + "    if ($inPath) { $pacman = $inPath.Source; Write-Host \"Found pacman on PATH\" }\n"
-    + "}\n"
-    + "if (-not $pacman) {\n"
-    + "    Write-Host 'Downloading MSYS2 installer (this may take a minute)...'\n"
-    + "    $url = 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-x86_64-latest.exe'\n"
-    + "    $dest = \"$env:TEMP\\msys2-installer.exe\"\n"
-    + "    $wc = New-Object System.Net.WebClient\n"
-    + "    $wc.add_DownloadProgressChanged({\n"
-    + "        param($s,$e)\n"
-    + "        $pct = $e.ProgressPercentage\n"
-    + "        $bar = '#' * [int]($pct/2)\n"
-    + "        $empty = '-' * (50 - [int]($pct/2))\n"
-    + "        Write-Host -NoNewline \"\r  [$bar$empty] $pct%  \"\n"
-    + "    })\n"
-    + "    $done = $false\n"
-    + "    $wc.add_DownloadFileCompleted({ $done = $true })\n"
-    + "    $wc.DownloadFileAsync([uri]$url, $dest)\n"
-    + "    while (-not $done) { Start-Sleep -Milliseconds 100 }\n"
-    + "    Write-Host ''\n"
-    + "    Write-Host 'Running MSYS2 installer...'\n"
-    + "    Start-Process -Wait $dest -ArgumentList 'install','--confirm-command','--accept-messages','--root','C:/msys64'\n"
-    + "    $pacman = 'C:\\msys64\\usr\\bin\\pacman.exe'\n"
-    + "    Write-Host 'MSYS2 installed.'\n"
-    + "}\n"
-    + "Write-Host ''\n"
-    + "Write-Host 'Installing g++, GLFW, GLEW...'\n"
-    + "& $pacman -S --noconfirm --needed '--overwrite=*' mingw-w64-x86_64-gcc mingw-w64-x86_64-glfw mingw-w64-x86_64-glew\n"
-    + "Write-Host 'Adding MSYS2 to system PATH...'\n"
-    + "$mingwBin = 'C:\\msys64\\mingw64\\bin'\n"
-    + "$currentPath = [Environment]::GetEnvironmentVariable('PATH','Machine')\n"
-    + "if ($currentPath -notlike \"*$mingwBin*\") {\n"
-    + "    [Environment]::SetEnvironmentVariable('PATH', \"$mingwBin;$currentPath\", 'Machine')\n"
-    + "    Write-Host 'Added to system PATH.'\n"
-    + "} else { Write-Host 'Already in PATH.' }\n"
-    + "Write-Host ''\n"
-    + "Write-Host '============================================'\n"
-    + "Write-Host 'Installation complete!'\n"
-    + "Write-Host 'Please restart Processing4 to use C++ Mode.'\n"
-    + "Write-Host '============================================'\n"
-    + "Read-Host 'Press Enter to close'\n";
+    // Delegate to InstallWizard which handles portable gcc download in-app.
+    // GLFW and GLEW are bundled in libs/windows-x64/ -- no MSYS2 needed.
     try {
-      java.io.File tmp = java.io.File.createTempFile("cpp_install_", ".ps1");
-      tmp.deleteOnExit();
-      try (java.io.PrintWriter pw = new java.io.PrintWriter(tmp)) { pw.print(script); }
-      listener.statusNotice("Launching installer...");
-      new Thread(() -> {
-        try {
-          // Run as admin so PATH can be updated system-wide
-          ProcessBuilder pb2 = new ProcessBuilder(
-            "powershell.exe", "-ExecutionPolicy", "Bypass",
-            "-Command",
-            "Start-Process powershell -Verb RunAs -ArgumentList "
-            + "'-ExecutionPolicy Bypass -NoExit -File \"" + tmp.getAbsolutePath().replace("\\", "\\\\") + "\"'");
-          pb2.start();
-          javax.swing.JOptionPane.showMessageDialog(null,
-            new javax.swing.JLabel(
-              "<html><b>Installer launched!</b><br><br>"
-              + "A PowerShell window is installing g++, GLFW, and GLEW.<br><br>"
-              + "When it says <b>Installation complete!</b>:<br>"
-              + "&nbsp;&nbsp;1. Close the installer window<br>"
-              + "&nbsp;&nbsp;2. <b>Restart Processing4</b></html>"),
-            "Installing...", javax.swing.JOptionPane.INFORMATION_MESSAGE);
-        } catch (Exception e2) { listener.statusError("Error: "+e2.getMessage()); }
-      }).start();
-    } catch (Exception e) { listener.statusError("Error: "+e.getMessage()); }
+      InstallWizard.run(listener);
+    } catch (InstallWizard.CancelledByUser ignored) {
+    } catch (Exception e) {
+      listener.statusError("Auto-install failed: " + e.getMessage());
+    }
   }
 
 
@@ -424,7 +354,6 @@ private void checkGppAvailable(RunnerListener listener) throws Exception {
           System.getProperty("user.home") + "\\msys64\\mingw64\\bin\\g++.exe",
           "C:\\msys64\\ucrt64\\bin\\g++.exe"})
         if (new File(p).exists()) return;
-      // Try PATH g++ as final fallback (bundled DLLs cover GLFW/GLEW)
       try {
         if (Runtime.getRuntime().exec(new String[]{"g++","--version"}).waitFor()==0) return;
       } catch (Exception ignored) {}
@@ -435,16 +364,14 @@ private void checkGppAvailable(RunnerListener listener) throws Exception {
       int ch = javax.swing.JOptionPane.showOptionDialog(null,
         new javax.swing.JLabel(
           "<html><b>g++ (C++ compiler) not found.</b><br><br>"
-          + "C++ Mode requires MSYS2 with g++, GLFW, and GLEW.<br><br>"
+          + "C++ Mode needs g++ to compile sketches.<br>"
+          + "GLFW and GLEW are already bundled — no extra downloads needed.<br><br>"
           + "<b>Auto-Install (recommended):</b><br>"
-          + "&nbsp;&nbsp;Click <b>Auto-Install</b> to install everything automatically.<br><br>"
+          + "&nbsp;&nbsp;Click <b>Auto-Install</b> to download g++ automatically.<br><br>"
           + "<b>Manual:</b><br>"
-          + "&nbsp;&nbsp;1. Install MSYS2 from https://www.msys2.org<br>"
-          + "&nbsp;&nbsp;2. Open <b>MSYS2 MinGW 64-bit</b> terminal<br>"
-          + "&nbsp;&nbsp;3. Run:<br>"
-          + "&nbsp;&nbsp;&nbsp;&nbsp;<code>pacman -S mingw-w64-x86_64-gcc"
-          + " mingw-w64-x86_64-glfw mingw-w64-x86_64-glew</code><br>"
-          + "&nbsp;&nbsp;4. Restart Processing</html>"),
+          + "&nbsp;&nbsp;Install MSYS2 from https://www.msys2.org and run:<br>"
+          + "&nbsp;&nbsp;<code>pacman -S mingw-w64-x86_64-gcc</code><br>"
+          + "&nbsp;&nbsp;Then restart Processing.</html>"),
         "C++ Compiler Not Found",
         javax.swing.JOptionPane.YES_NO_CANCEL_OPTION,
         javax.swing.JOptionPane.ERROR_MESSAGE,

libs/include/GL/glew.h

@@ -165,8 +165,10 @@ private void runCheck(Sketch sketch, int currentTab, String liveText) {
             cmd.add("-std=c++23");
             cmd.add("-I");
             cmd.add(runtimeDir.getAbsolutePath());
+            // Bundled headers (GLFW, GLEW)
+            File bundledInc = new File(runtimeDir.getParentFile(), "libs/include");
+            if (bundledInc.exists()) { cmd.add("-I"); cmd.add(bundledInc.getAbsolutePath()); }
             if (gch != null) {
-                // Point g++ at the cache dir so it finds Processing.h.gch
                 cmd.add("-I");
                 cmd.add(gch.getParentFile().getAbsolutePath());
             }

libs/include/GL/glxew.h

@@ -85,9 +85,14 @@ public static boolean run(RunnerListener listener) throws CancelledByUser {
     final Object lock = new Object();
     SwingUtilities.invokeLater(() -> {
       Object[] options = { "Install", "Cancel" };
+      String missingMsg = isWin
+        ? "C++ Mode needs a C++ compiler (g++) to compile sketches.\n\n"
+          + "Click Install to download g++ automatically (~130 MB).\n"
+          + "GLFW and GLEW are already bundled — no extra downloads needed."
+        : "Missing: " + String.join(", ", missing) + "\n\n"
+          + "C++ Mode needs these to compile and run sketches.";
       int choice = JOptionPane.showOptionDialog(null,
-        "Missing: " + String.join(", ", missing) + "\n\n"
-          + "C++ Mode needs these to compile and run sketches.",
+        missingMsg,
         "C++ Mode — Missing Dependencies",
         JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE,
         null, options, options[0]);
@@ -126,6 +131,7 @@ public static boolean run(RunnerListener listener) throws CancelledByUser {
   private JDialog dialog;
   private JTextArea log;
   private JLabel stepLabel;
+  private JProgressBar progressBar;
   private JButton cancelButton;
   private final AtomicBoolean cancelled = new AtomicBoolean(false);
   private final AtomicBoolean succeeded = new AtomicBoolean(false);
@@ -148,11 +154,17 @@ private void buildDialog(String title) {
     stepLabel.setFont(stepLabel.getFont().deriveFont(Font.BOLD, 13f));
     root.add(stepLabel, BorderLayout.NORTH);
 
-    log = new JTextArea(14, 56);
+    progressBar = new JProgressBar(0, 100);
+    progressBar.setStringPainted(true);
+    progressBar.setString("");
+    progressBar.setValue(0);
+    root.add(progressBar, BorderLayout.CENTER);
+
+    log = new JTextArea(10, 56);
     log.setEditable(false);
     log.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
     JScrollPane scroll = new JScrollPane(log);
-    root.add(scroll, BorderLayout.CENTER);
+    root.add(scroll, BorderLayout.SOUTH);
 
     JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT, 8, 0));
     cancelButton = new JButton("Cancel");
@@ -177,6 +189,21 @@ private void appendLog(String text) {
     });
   }
 
+  private void setProgress(int pct) {
+    SwingUtilities.invokeLater(() -> {
+      progressBar.setValue(pct);
+      progressBar.setString(pct + "%");
+      if (pct >= 100) progressBar.setString("Done");
+    });
+  }
+
+  private void setIndeterminate(boolean b) {
+    SwingUtilities.invokeLater(() -> {
+      progressBar.setIndeterminate(b);
+      if (b) progressBar.setString("Working...");
+    });
+  }
+
   private void requestCancel() {
     cancelled.set(true);
     finishDialog(false, "Cancelled.");
@@ -186,6 +213,9 @@ private void finishDialog(boolean success, String finalMessage) {
     succeeded.set(success);
     SwingUtilities.invokeLater(() -> {
       if (finalMessage != null) setStep(finalMessage);
+      progressBar.setIndeterminate(false);
+      progressBar.setValue(success ? 100 : progressBar.getValue());
+      progressBar.setString(success ? "Done" : "Failed");
       cancelButton.setText("Close");
     });
     synchronized (doneLock) {
@@ -260,6 +290,8 @@ private boolean installPortableGcc() {
       appendLog("Source: " + WINLIBS_URL);
       appendLog("Destination: " + gccDir.getAbsolutePath());
       appendLog("Size: ~130 MB — please wait...");
+      final long WINLIBS_SIZE = 136 * 1024 * 1024L; // ~130 MB
+      setProgress(0);
       try (java.io.InputStream in = new java.net.URI(WINLIBS_URL).toURL().openStream();
            java.io.OutputStream out = new java.io.FileOutputStream(zipFile)) {
         byte[] buf = new byte[64 * 1024];
@@ -268,12 +300,16 @@ private boolean installPortableGcc() {
           if (cancelled.get()) return false;
           out.write(buf, 0, n);
           total += n;
-          if (total % (5 * 1024 * 1024) < buf.length)
+          int pct = (int) Math.min(99, total * 100 / WINLIBS_SIZE);
+          setProgress(pct);
+          if (total % (10 * 1024 * 1024) < buf.length)
             appendLog("Downloaded " + (total / (1024 * 1024)) + " MB...");
         }
       }
+      setProgress(100);
       setStep("Extracting gcc...");
       appendLog("Extracting to " + gccDir.getAbsolutePath());
+      setIndeterminate(true);
       // Use PowerShell Expand-Archive (available on all modern Windows)
       Process extract = new ProcessBuilder(
         "powershell", "-NoProfile", "-Command",
@@ -283,6 +319,8 @@ private boolean installPortableGcc() {
       streamToLog(extract);
       int code = extract.waitFor();
       zipFile.delete(); // clean up zip after extraction
+      setIndeterminate(false);
+      setProgress(100);
       if (code != 0) { appendLog("Extraction failed."); return false; }
       if (!getPortableGpp().exists()) {
         appendLog("g++.exe not found after extraction -- unexpected zip structure.");
@@ -308,8 +346,6 @@ private java.util.List<String> detectWindowsMissing() {
         if (new File(p).exists()) { haveGpp = true; break; }
       }
     }
-    // GLFW and GLEW are bundled in libs/windows-x64/ -- no MSYS2 needed for them.
-    // Only report them missing if the bundled DLLs aren't present AND MSYS2 doesn't have them.
     java.util.List<String> missing = new java.util.ArrayList<>();
     if (!haveGpp) missing.add("g++");
     return missing;
@@ -486,8 +522,6 @@ private boolean runMac(java.util.List<String> missing) {
     if (missing.contains("glew")) missingLibs.add("glew");
 
     Thread worker = new Thread(() -> {
-      // Resolve brew at known locations first -- Processing may launch without
-      // /opt/homebrew/bin in PATH on Apple Silicon Macs.
       String brewExe = null;
       if (new File("/opt/homebrew/bin/brew").exists()) brewExe = "/opt/homebrew/bin/brew";
       else if (new File("/usr/local/bin/brew").exists()) brewExe = "/usr/local/bin/brew";
@@ -539,6 +573,7 @@ private boolean runMac(java.util.List<String> missing) {
       }
 
       setStep("Installing: " + String.join(", ", missingLibs));
+      setIndeterminate(true);
       try {
         java.util.List<String> cmd = new java.util.ArrayList<>();
         cmd.add(brewExe); cmd.add("install"); cmd.addAll(missingLibs);