A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
refactor: drop dead resize-retry schedules in TerminalScreen / ViewModel
ExTvede4821f6f5c
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.ktindex 3141688..60c436a 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt@@ -238,25 +238,19 @@ fun TerminalScreen(// existing state draws on first layout.view.onScreenUpdated()- // Push cols/rows to the session on a schedule:- // forceUpdateSizeFromView — Paint-based fallback, works before mRenderer- // is initialized; uses currentTypeface so custom- // fonts produce correct metrics.- // view.updateSize() — renderer-based, accurate after first draw.- // Both are called; the renderer path is called last so it wins once ready.- // Multiple delays ensure the VM's ctrl.sock resize daemon receives the- // message even if it wasn't listening yet at the initial post.- val pushSize = {+ // Push initial cols/rows once the view has laid out.+ // forceUpdateSizeFromView is the Paint-based fallback that works+ // before mRenderer is initialized; view.updateSize() is the renderer+ // path called last so it wins once metrics are ready.+ view.post {viewModel.forceUpdateSizeFromView(view)view.updateSize()view.onScreenUpdated()}- view.post(pushSize)- view.postDelayed(pushSize, 150)- view.postDelayed(pushSize, 600)- view.postDelayed(pushSize, 1500)- // Debounce resize: keyboard animation fires one layout change per frame- // (~25 events). Only send RESIZE after the view has been stable for 150ms.++ // Keyboard animation fires one layout change per frame (~25 events).+ // Debounce so SIGWINCH only fires once after the view has been stable+ // for 150 ms — turns 25 prompt-redraw flashes into one.val resizeHandler = android.os.Handler(android.os.Looper.getMainLooper())var pendingResize: Runnable? = nullval listener = android.view.View.OnLayoutChangeListener { v, left, top, right, bottom,@@ -284,14 +278,10 @@ fun TerminalScreen(factory = { view },update = { v ->v.setTextSize(fontSize)- // setTextSize immediately recreates mRenderer with new metrics.- // Use v.updateSize() directly — it reads from mRenderer (correct),- // avoiding the off-by-row conflict with forceUpdateSizeFromView's- // different line-height formula. Multiple delays ensure the VM's- // resize daemon receives the message even under load.+ // setTextSize recreates mRenderer with new metrics; one updateSize+ // post-layout is enough because virtio-console reliably delivers+ // RESIZE to the VM (no need for the old multi-shot retries).v.post { v.updateSize() }- v.postDelayed({ v.updateSize() }, 300)- v.postDelayed({ v.updateSize() }, 800)},modifier = Modifier.fillMaxSize(),)diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.ktindex 84f56d7..92af110 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt@@ -103,8 +103,6 @@ class TerminalViewModel @Inject constructor(v.updateSize()v.onScreenUpdated()}- v.postDelayed({ v.updateSize() }, 300)- v.postDelayed({ v.updateSize() }, 800)}fun updateShowExtraKeys(value: Boolean) { showExtraKeys = value }@@ -170,7 +168,6 @@ class TerminalViewModel @Inject constructor(terminalView?.setTypeface(typeface)terminalView?.let { v ->v.post { forceUpdateSizeFromView(v); v.updateSize() }- v.postDelayed({ v.updateSize() }, 400)}}