fix(android): faulty aab through the store

- The installed package is the store one:
      - installer=com.android.vending
  - The crash is immediate on startup.
  - Fresh logcat shows:

  java.lang.IllegalStateException: Required web asset not found (internal): com/kotcrab/vis/ui/skin/x1/uiskin.json
      at com.github.alfu32.sketch.Main.requireWebInternalFile(Main.kt:406)
      at com.github.alfu32.sketch.Main.create(Main.kt:558)

  Root cause

  - The Android store build was compiled with BuildFlags.WEB_BUILD = true.
  - That puts Android into the web-only VisUI startup path, so it looks for web assets that do not exist in the APK.
  - This is why the store install crashes while the working adb install does not.

  - :core:compileKotlin
  - :android:compileDebugKotlin

  Both compiled cleanly.

  - This is not a generic “store vs adb” mystery anymore.
  - It is a concrete stale build-flag bug in the build pipeline.

fix(console): layout

fixed the two console issues and added the Windows activation prompt.
      - this fixes:
          - the cursor being pushed down
          - the stray right-edge margin/artifacts from terminal auto-wrap at the last column
  - core/src/main/kotlin/com/github/alfu32/sketch/console/TerminalController.kt
      - added awaitActivationIfNeeded()
  - core/src/main/kotlin/com/github/alfu32/sketch/console/ConsoleThread.kt
      - now waits for activation before entering raw mode
  - lwjgl3/src/main/kotlin/com/github/alfu32/sketch/lwjgl3/console/LwjglTerminalController.kt
      - on Windows, prints:
          - Octodraw Dev Console - press Enter to activate the terminal UI...
      - then waits for Enter before enabling VT/raw input
  - lwjgl3/src/main/kotlin/com/github/alfu32/sketch/lwjgl3/console/WindowsConsole.kt
      - added openInputStream() needed by the Windows activation path

changed the console to render one column narrower than the reported terminal width:

  - core/src/main/kotlin/com/github/alfu32/sketch/tui/ConsoleTui.kt
      - width now uses size.columns - 1

  Why:

  - some terminals still auto-wrap or corrupt cursor placement when one writes exactly into the last column
  - leaving one gutter column unused is the pragmatic fix

Author: alferio

core/build.gradle

@@ -74,15 +74,19 @@ data class K3DVersion(
 
 tasks.register('generateBuildFlags') {
   def outFile = file("src/main/kotlin/com/github/alfu32/sketch/BuildFlags.kt")
-  outputs.file(outFile)
-  doLast {
+  def webBuildProvider = providers.provider {
     def explicit = project.findProperty("webBuild")
     def taskNames = gradle.startParameter.taskNames
     def inferredWeb = taskNames.any { name ->
       def lower = name.toLowerCase()
       lower.contains(":web:") || lower.startsWith("web:")
     }
-    def webBuild = explicit != null ? explicit.toString().toBoolean() : inferredWeb
+    explicit != null ? explicit.toString().toBoolean() : inferredWeb
+  }
+  inputs.property("webBuild", webBuildProvider)
+  outputs.file(outFile)
+  doLast {
+    def webBuild = webBuildProvider.get()
     outFile.parentFile.mkdirs()
     outFile.text = """package com.github.alfu32.sketch
 

core/src/main/kotlin/com/github/alfu32/sketch/BuildFlags.kt

@@ -1,5 +1,5 @@
 package com.github.alfu32.sketch
 
 object BuildFlags {
-  const val WEB_BUILD: Boolean = true
+  const val WEB_BUILD: Boolean = false
 }

core/src/main/kotlin/com/github/alfu32/sketch/console/ConsoleThread.kt

@@ -10,6 +10,7 @@ class ConsoleThread(
     private var running = true
 
     override fun run() {
+        terminal.awaitActivationIfNeeded()
         terminal.enterRawMode()
         try {
             tui.history.loadFromDisk()

core/src/main/kotlin/com/github/alfu32/sketch/console/TerminalController.kt

@@ -13,6 +13,10 @@ open class TerminalController {
     private var lastKnownSize: TerminalSize = querySize()
     private var lastSizeCheckNanos: Long = 0L
 
+    open fun awaitActivationIfNeeded() {
+        // No-op by default.
+    }
+
     open fun enterRawMode() {
         originalConfig = captureTerminalState()
         runShellCommand("stty raw -echo < /dev/tty")

core/src/main/kotlin/com/github/alfu32/sketch/tui/ConsoleTui.kt

@@ -39,7 +39,7 @@ class ConsoleTui(
     fun render() {
         dirty = false
         val size = terminal.size()
-        val width = size.columns.coerceAtLeast(20)
+        val width = (size.columns - 1).coerceAtLeast(20)
         val height = size.rows.coerceAtLeast(12)
         val topBarHeight = 1
         val outputHeaderHeight = 1
@@ -52,16 +52,16 @@ class ConsoleTui(
         builder.append(ANSI_HIDE_CURSOR)
         builder.append(ANSI_CLEAR)
         builder.append(ANSI_HOME)
-
-        builder.append(renderTopBar(width)).append('\n')
-        builder.append(renderSectionHeader("Console", outputHeaderMeta(), width)).append('\n')
+        val rows = mutableListOf<String>()
+        rows += renderTopBar(width)
+        rows += renderSectionHeader("Console", outputHeaderMeta(), width)
 
         val outputLines = outputPane.visibleLines(outputHeight, width - 2)
         for (i in 0 until outputHeight) {
             val line = outputLines.getOrNull(i) ?: ""
-            builder.append(padLine("│${truncateAnsi(line, width - 2)}", width)).append('\n')
+            rows += padLine("│${truncateAnsi(line, width - 2)}", width)
         }
-        builder.append(renderSectionHeader("Prompt", promptHeaderMeta(), width)).append('\n')
+        rows += renderSectionHeader("Prompt", promptHeaderMeta(), width)
 
         val lines = editorPane.lines()
         val (cursorLine, cursorColumn) = editorPane.lineAndColumn(editorPane.cursorPosition)
@@ -76,9 +76,13 @@ class ConsoleTui(
             val prefix = if (lineIndex == 0) "│> " else "│  "
             val highlighted = highlight(rawLine)
             val trimmed = truncateAnsi(highlighted, width - prefix.length)
-            builder.append(padLine(prefix + trimmed, width)).append('\n')
+            rows += padLine(prefix + trimmed, width)
+        }
+        rows += renderFooter(width)
+        rows.forEachIndexed { index, row ->
+            builder.append(ANSI_MOVE_CURSOR.format(Locale.US, index + 1, 1))
+            builder.append(padLine(row, width))
         }
-        builder.append(renderFooter(width))
         val cursorRow = topBarHeight + outputHeaderHeight + outputHeight + promptHeaderHeight + (cursorLine - editorScrollTop) + 1
         val prefixLength = 3
         val cursorCol = (prefixLength + cursorColumn + 1).coerceAtLeast(1)

lwjgl3/src/main/kotlin/com/github/alfu32/sketch/lwjgl3/console/LwjglTerminalController.kt

@@ -9,6 +9,21 @@ import java.util.concurrent.TimeUnit
 
 class LwjglTerminalController : TerminalController() {
     private val isWindows = WindowsConsole.isWindows()
+    private val activationInput by lazy { WindowsConsole.openInputStream() }
+
+    override fun awaitActivationIfNeeded() {
+        if (!isWindows) {
+            return
+        }
+        print("Octodraw Dev Console - press Enter to activate the terminal UI...\r\n")
+        flushStdout()
+        while (true) {
+            val next = activationInput.read()
+            if (next == -1 || next == '\n'.code || next == '\r'.code) {
+                break
+            }
+        }
+    }
 
     override fun enterRawMode() {
         if (!isWindows) {

lwjgl3/src/main/kotlin/com/github/alfu32/sketch/lwjgl3/console/WindowsConsole.kt

@@ -6,6 +6,8 @@ import com.sun.jna.Native
 import com.sun.jna.NativeLibrary
 import com.sun.jna.Pointer
 import com.sun.jna.ptr.IntByReference
+import java.io.FileInputStream
+import java.io.InputStream
 
 object WindowsConsole {
     private const val ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
@@ -60,6 +62,17 @@ object WindowsConsole {
 
     fun isWindows(): Boolean = isWindows
 
+    fun openInputStream(): InputStream {
+        if (!isWindows) return System.`in`
+        val k32 = kernel32 ?: return System.`in`
+        val handle = k32.GetStdHandle(STD_INPUT_HANDLE)
+        val fileType = if (handle == null) 0 else k32.GetFileType(handle)
+        if (fileType == FILE_TYPE_CHAR) {
+            return System.`in`
+        }
+        return runCatching { FileInputStream("CONIN$") }.getOrDefault(System.`in`)
+    }
+
     fun enableVirtualTerminalProcessing(): Boolean {
         if (!isWindows) return true
         val k32 = kernel32 ?: return false

web/build/dist/webapp/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Octodraw 4.7.2</title>
+        <title>Octodraw 4.7.4</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
         <style>
             body {
@@ -29,6 +29,6 @@
             }
             window.addEventListener("load", start);
         </script>
-        <script type="text/javascript" charset="utf-8" src="octodraw-4.7.2.js"></script>
+        <script type="text/javascript" charset="utf-8" src="octodraw-4.7.4.js"></script>
     </body>
 </html>