mirror of
https://github.com/neon443/ShhShell.git
synced 2026-03-11 13:26:16 +00:00
Merge branch 'ervert'
Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch. Lines starting with '#' will be ignored, and an empty message aborts the commit.
This commit is contained in:
@@ -23,10 +23,6 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
|
|||||||
print(getTerminal().foregroundColor.colorCodable)
|
print(getTerminal().foregroundColor.colorCodable)
|
||||||
|
|
||||||
applySelectedTheme()
|
applySelectedTheme()
|
||||||
|
|
||||||
Task {
|
|
||||||
await startFeedLoop()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func restoreScrollback() async {
|
func restoreScrollback() async {
|
||||||
@@ -74,6 +70,16 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
|
|||||||
// TODO: selectedtext and cursor colors
|
// TODO: selectedtext and cursor colors
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override func didMoveToWindow() {
|
||||||
|
super.didMoveToWindow()
|
||||||
|
if window != nil {
|
||||||
|
Task {
|
||||||
|
await restoreScrollback()
|
||||||
|
await startFeedLoop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public override init(frame: CGRect) {
|
public override init(frame: CGRect) {
|
||||||
super.init(frame: frame)
|
super.init(frame: frame)
|
||||||
terminalDelegate = self
|
terminalDelegate = self
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ struct TerminalController: UIViewRepresentable {
|
|||||||
func makeUIView(context: Context) -> TerminalView {
|
func makeUIView(context: Context) -> TerminalView {
|
||||||
if let sessionID = handler.sessionID {
|
if let sessionID = handler.sessionID {
|
||||||
if let existing = container.sessions[sessionID] {
|
if let existing = container.sessions[sessionID] {
|
||||||
Task {
|
|
||||||
await existing.terminalView.restoreScrollback()
|
|
||||||
}
|
|
||||||
return existing.terminalView
|
return existing.terminalView
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user