Repin the runtime to makepad 39a9de88 (OpenHarmony idle and input, GL GPU timing, terminal shortcuts)

Cargo.toml

@@ -66,36 +66,36 @@ authors = ["octos-app contributors"]
 # BEGIN native-apps: pins (generated by tools/native_apps.py from native-apps.json; do not edit)
 rinx = { git = "https://github.com/hagency-org/Rinx.git", tag = "v1.1.0", default-features = false, features = ["octosense-module"] }
 octosense-reference = { path = "apps/reference" }
-makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9", default-features = false }
-makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
+makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411", default-features = false }
+makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
 octosense-appcard = { path = "apps/appcard/module" }
 octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "58c3c8aed8fc811a16d67c5f784a8a44214ff876" }
 # END native-apps: pins
 # --- Makepad (OctoSense-org/makepad), the revision Octoscript-Makepad's
 # runtime.json pins (native-runtime.lock.json); resolved to .sources/makepad.
-makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
+makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
 # The script VM alone: system apps' script tests (News's main.splash).
-makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9" }
-makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "e29a0eaa68781231eb9ec582e5f02648c6dad7e9", default-features = false }
+makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411" }
+makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "39a9de88e1af14a9d660887c453fc3102c610411", default-features = false }
 # --- OctoScript (Octoscript 5991dfae) and its Makepad runtime
-# (Octoscript-Makepad 8f103d0c, native-runtime.lock.json).
+# (Octoscript-Makepad 62760863, native-runtime.lock.json).
 octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
 # The bounded VM, capability-leased host modules and executable JSON schemas
 # (the system toolbox's workflow templates, crates/toolbox).
 octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
 octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
 octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" }
-octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "8f103d0c650196d455cbcaa55b13911475121224" }
-octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "8f103d0c650196d455cbcaa55b13911475121224" }
+octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "62760863bc992aeb7b43692b10d479417b4d3d93" }
+octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "62760863bc992aeb7b43692b10d479417b4d3d93" }
 # --- App Hub's host service registry the Mail and llm services register
 # into; the same revision as App Hub's app crate (a native app, above).
 octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "58c3c8aed8fc811a16d67c5f784a8a44214ff876" }

apps/appcard/native-runtime.lock.json

@@ -1,5 +1,5 @@
 {
   "schema_version": 1,
   "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
-  "revision": "8f103d0c650196d455cbcaa55b13911475121224"
+  "revision": "62760863bc992aeb7b43692b10d479417b4d3d93"
 }

native-apps.json

@@ -41,7 +41,7 @@
     {
       "id": "sheets",
       "crate": "makepad-sheets",
-      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "e29a0eaa68781231eb9ec582e5f02648c6dad7e9", "local": ".sources/makepad/apps/sheets" },
+      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "39a9de88e1af14a9d660887c453fc3102c610411", "local": ".sources/makepad/apps/sheets" },
       "module": "makepad_sheets::SHEETS_MODULE",
       "bin": "sheets",
       "bin_features": ["standalone"],
@@ -58,7 +58,7 @@
     {
       "id": "terminal",
       "crate": "makepad-terminal",
-      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "e29a0eaa68781231eb9ec582e5f02648c6dad7e9", "local": ".sources/makepad/apps/terminal" },
+      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "39a9de88e1af14a9d660887c453fc3102c610411", "local": ".sources/makepad/apps/terminal" },
       "module": "makepad_terminal::TERMINAL_MODULE",
       "bin": "terminal",
       "default_features": true,

native-runtime.lock.json

@@ -1,5 +1,5 @@
 {
   "schema_version": 1,
   "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
-  "revision": "8f103d0c650196d455cbcaa55b13911475121224"
+  "revision": "62760863bc992aeb7b43692b10d479417b4d3d93"
 }

phone/docs/build-tool.md

@@ -73,9 +73,9 @@ move that touches `tools/cargo_makepad` is the usual trigger):
 cargo install --path .sources/makepad/tools/cargo_makepad --force
 ```
 
-The shared release selects Makepad main `e29a0eaa`, which includes App Hub's
+The shared release selects Makepad main `39a9de88`, which includes App Hub's
 isolate containment (#22), contained script apps (#30), the QR scanner
-(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) the keyboard's hide after a cancelled search (#57, #59) and the terminal's tab titles, wide-character reflow, non-blocking PTY writes, control-request timeout and running-job close confirmation (#61–#65), and its grapheme clusters, Kitty keyboard and synchronized output, close handshake and rendering polish (#66–#69), text shaping and drag-select (#70–#72), and clickable links and scrollback search (#73, #74); the consumer lock
+(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) the keyboard's hide after a cancelled search (#57, #59) and the terminal's tab titles, wide-character reflow, non-blocking PTY writes, control-request timeout and running-job close confirmation (#61–#65), and its grapheme clusters, Kitty keyboard and synchronized output, close handshake and rendering polish (#66–#69), text shaping and drag-select (#70–#72), clickable links and scrollback search (#73, #74), keyboard shortcuts (#76) and OpenHarmony run (#91), GL GPU timing (#81), atlas text on phones (#82), the Android touch-down power hint (#83) and Vulkan without a debug messenger (#92), Linux GL remote grabs (#93), a hidden map's idle frame loop (#79), and OpenHarmony's keyboard, Studio, GL lifetimes and idle frames (#84, #85, #87–#89); the consumer lock
 needs no `makepad_override`.
 
 To see which checkout an installed tool reads its Java from:

phone/docs/makepad-fork.md

@@ -20,9 +20,9 @@ Makepad and that no fork is required do not.
 The revision is pinned as a chain, not in one place:
 
 1. `native-runtime.lock.json` here names one revision of
-   `OctoSense-org/Octoscript-Makepad` (`8f103d0c`, its main).
+   `OctoSense-org/Octoscript-Makepad` (`62760863`, its main).
 2. That repo's `runtime.json` names the Makepad fork revision
-   (`e29a0eaa`, Makepad main: the enforced isolate policy of PR #22, module
+   (`39a9de88`, Makepad main: the enforced isolate policy of PR #22, module
    windows, the ROM's Splash fixes, the contained script apps and host
    services of PR #30, the QR scanner of PR #31, Splash `reapply_text` of
    PR #35, the self-confirmed assistant tools of PR #36, the one-call-site
@@ -37,7 +37,13 @@ The revision is pinned as a chain, not in one place:
    PRs #57 and #59 and the terminal fixes and close veto of PRs #61–#65 and the
    terminal's grapheme clusters, Kitty keyboard, close handshake and rendering
    polish of PRs #66–#69, its text shaping and drag-select of PRs #70–#72, and
-   its clickable links and scrollback search of PRs #73 and #74) and the
+   its clickable links and scrollback search of PRs #73 and #74, the
+   terminal's keyboard shortcuts of PR #76 and its OpenHarmony run of PR #91,
+   GL GPU timing of PR #81, atlas text on phones of PR #82, the Android
+   touch-down power hint of PR #83 and Vulkan without a debug messenger of
+   PR #92, Linux GL remote grabs of PR #93, a hidden map's idle frame loop of
+   PR #79, and OpenHarmony's keyboard, Studio, GL lifetimes and idle frames
+   of PRs #84, #85 and #87–#89) and the
    Octoscript revision
    (`5991dfa`). OctoSense, AppCard, Rinx and the ROM lock the same release.
 3. The manifests repeat the Makepad revision as `rev = "…"`: here in

runtime-patches.lock.json

@@ -1,20 +1,17 @@
 {
   "schema_version": 1,
   "makepad": {
-    "base_revision": "e29a0eaa68781231eb9ec582e5f02648c6dad7e9",
+    "base_revision": "39a9de88e1af14a9d660887c453fc3102c610411",
     "patch": "tools/runtime-patches/makepad-settings.patch",
-    "sha256": "1bf3c9d5367bb35a0e2ab0eb92b614507817066d31d8030404cbb0655c758268",
-    "tree": "46c5e8a22592382620c3edf9ffb2dccf789c5c8a",
+    "sha256": "b17352ebf59e50ab3db6ff1cb825c4e006bcdff47d83522e372b8fe585e57570",
+    "tree": "976bf55b6b94ae145f941f9aa39ca2b1036352ec",
     "product_fixes": [
       "Settings integration: Android IME synchronization, accessibility and reduced motion, GLES program-cache validation, obscured-gesture cancellation and scroll-position observation.",
       "Contained-app isolation and secret-input restrictions come from the pinned upstream runtime; the Settings overlay preserves those gates.",
       "System Back callback owners suppress compatibility Back keys to avoid duplicate navigation on Android 13+.",
       "A cancelled search's keyboard hides once: an editor session going inactive retires its input connection without restarting input, which brought the keyboard back empty while it was hiding (Android 11).",
       "Windows remote grabs send raw RGBA pixels to the bounded PNG worker before presenting, keeping full-size encoding off the UI thread and scaling before encoding.",
-      "Windows frame completion: backport Makepad work c508ab0c8 GPU completion polls around native and hosted repaint so upload buffers can retire.",
-      "A map that is not drawn (Maps sent to the background) no longer asks for a frame and a full redraw every frame, nor ticks its tile fades every 16 ms, while it waits to draw (OctoSense-org/makepad#79).",
-      "OpenHarmony GL frees retired GPU allocations through completion fences and serves that retirement on idle vsync beats, as on Android; before, the debt never settled and an idle app repainted at display rate (OctoSense-org/makepad#88).",
-      "A DrawText no longer redraws a draw list from inside that list's own redraw; one DrawText drawing the big clock as SLUG and labels as raster kept an idle OpenHarmony Home re-recording its scene every frame (OctoSense-org/makepad#89)."
+      "Windows frame completion: backport Makepad work c508ab0c8 GPU completion polls around native and hosted repaint so upload buffers can retire."
     ],
     "stacked": [
       {
@@ -32,18 +29,6 @@
       {
         "patch": "tools/runtime-patches/makepad-windows-frame-completion.patch",
         "sha256": "8d58e16bc12aae5f4313fdc5c9d3f6944b96ee20e609fe5ff069fe2403954595"
-      },
-      {
-        "patch": "tools/runtime-patches/makepad-map-hidden-no-frame-loop.patch",
-        "sha256": "e89a4776c617d48242c4a33495972e1566036016584c81f58f8cb4affc535d8f"
-      },
-      {
-        "patch": "tools/runtime-patches/makepad-ohos-gl-lifetimes.patch",
-        "sha256": "997cca9b560a0ea8fa38a209613752a5430467bcac99a5d90069dc280721a0c7"
-      },
-      {
-        "patch": "tools/runtime-patches/makepad-drawtext-current-list-redraw.patch",
-        "sha256": "a64d6b6db40a6ac7c5518d2b9ba6675abd8b8ad04c917e27a674bd41d4904ee4"
       }
     ]
   }