diff --git a/ShhShell.xcodeproj/project.pbxproj b/ShhShell.xcodeproj/project.pbxproj index 73cdceb..b0ec747 100644 --- a/ShhShell.xcodeproj/project.pbxproj +++ b/ShhShell.xcodeproj/project.pbxproj @@ -77,8 +77,6 @@ A98554612E058433009051BD /* HostsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98554602E058433009051BD /* HostsManager.swift */; }; A98554632E0587DF009051BD /* HostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98554622E0587DF009051BD /* HostsView.swift */; }; A98CAB442E4229F7005E4C42 /* HostSymbolPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98CAB432E4229F7005E4C42 /* HostSymbolPicker.swift */; }; - A99604432E5A0E8F007CA460 /* MiniTerminalDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99604422E5A0E8F007CA460 /* MiniTerminalDelegate.swift */; }; - A99604462E5A257B007CA460 /* MiniTerminalController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A99604452E5A257B007CA460 /* MiniTerminalController.swift */; }; A9A2F4F62E3001D300D0AE9B /* AddSnippetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A2F4F52E3001D300D0AE9B /* AddSnippetView.swift */; }; A9BA1D192E1D9AE1005BDCEF /* SwiftTerm.Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BA1D182E1D9AE1005BDCEF /* SwiftTerm.Color.swift */; }; A9BA1D1E2E1EAD51005BDCEF /* SF-Mono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A9BA1D1C2E1EAD51005BDCEF /* SF-Mono-Bold.otf */; }; @@ -216,8 +214,6 @@ A98554602E058433009051BD /* HostsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostsManager.swift; sourceTree = ""; }; A98554622E0587DF009051BD /* HostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostsView.swift; sourceTree = ""; }; A98CAB432E4229F7005E4C42 /* HostSymbolPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostSymbolPicker.swift; sourceTree = ""; }; - A99604422E5A0E8F007CA460 /* MiniTerminalDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MiniTerminalDelegate.swift; sourceTree = ""; }; - A99604452E5A257B007CA460 /* MiniTerminalController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MiniTerminalController.swift; sourceTree = ""; }; A9A2F4F52E3001D300D0AE9B /* AddSnippetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSnippetView.swift; sourceTree = ""; }; A9BA1D182E1D9AE1005BDCEF /* SwiftTerm.Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftTerm.Color.swift; sourceTree = ""; }; A9BA1D1C2E1EAD51005BDCEF /* SF-Mono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-Mono-Bold.otf"; sourceTree = ""; }; @@ -586,10 +582,8 @@ isa = PBXGroup; children = ( A923172C2E07138000ECE1E6 /* SSHTerminalDelegate.swift */, - A99604422E5A0E8F007CA460 /* MiniTerminalDelegate.swift */, A96BE6A92E116EC000C0FEE9 /* TerminalViewContainer.swift */, A92317292E07113100ECE1E6 /* TerminalController.swift */, - A99604452E5A257B007CA460 /* MiniTerminalController.swift */, ); path = Terminal; sourceTree = ""; @@ -840,7 +834,6 @@ A9DA97732E0D40C100142DDC /* HostSymbolPreview.swift in Sources */, A9CC786B2E4E681400FAEE58 /* RecentsView.swift in Sources */, A9CC786D2E4F534600FAEE58 /* History.swift in Sources */, - A99604432E5A0E8F007CA460 /* MiniTerminalDelegate.swift in Sources */, A90B38342E3EA046002B56FC /* Bundle.swift in Sources */, A9FD376B2E16DABF005319A8 /* AnsiPickerView.swift in Sources */, A9C060ED2E3FBCD000CA9374 /* SnippetPicker.swift in Sources */, @@ -865,7 +858,6 @@ A98554612E058433009051BD /* HostsManager.swift in Sources */, A985545D2E055D4D009051BD /* ConnectionView.swift in Sources */, A9FD37592E143D74005319A8 /* GenericPasswordConvertible.swift in Sources */, - A99604462E5A257B007CA460 /* MiniTerminalController.swift in Sources */, A9485C762E1AF59F00209824 /* FontManagerView.swift in Sources */, A98554592E0553AA009051BD /* KeyManager.swift in Sources */, A93F283D2E2A5DCB0092B8D5 /* SnippetManagerView.swift in Sources */, diff --git a/ShhShell/Terminal/MiniTerminalController.swift b/ShhShell/Terminal/MiniTerminalController.swift deleted file mode 100644 index 5c871b1..0000000 --- a/ShhShell/Terminal/MiniTerminalController.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// MiniTerminalController.swift -// ShhShell -// -// Created by neon443 on 23/08/2025. -// - -import Foundation -import UIKit -import SwiftUI -import SwiftTerm - -struct MiniTerminalController: UIViewRepresentable { - @Binding var text: String - @Binding var cursorType: CursorType - - func makeUIView(context: Context) -> TerminalView { - let tv = MiniTerminalDelegate(frame: CGRect(origin: CGPoint(x: 0, y: 0), size: .zero)) - tv.translatesAutoresizingMaskIntoConstraints = true - tv.autoresizingMask = [.flexibleWidth, .flexibleHeight] - return tv - } - - func updateUIView(_ tv: TerminalView, context: Context) { - guard let tdelegate = tv as? MiniTerminalDelegate else { return } - tdelegate.text = text - tdelegate.cursorType = cursorType - tv.setNeedsLayout() - tv.layoutIfNeeded() - tv.layoutSubviews() - } -} diff --git a/ShhShell/Terminal/MiniTerminalDelegate.swift b/ShhShell/Terminal/MiniTerminalDelegate.swift deleted file mode 100644 index fc307e8..0000000 --- a/ShhShell/Terminal/MiniTerminalDelegate.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// MiniTerminalDelegate.swift -// ShhShell -// -// Created by neon443 on 23/08/2025. -// - -import Foundation -import UIKit -import SwiftUI -import SwiftTerm - -@MainActor -class MiniTerminalDelegate: TerminalView, TerminalViewDelegate { - var text: String = "" - var cursorType = CursorType() - var hasConfigured: Bool = false - - override func layoutSubviews() { - super.layoutSubviews() - - if !hasConfigured && bounds.width > 0 && bounds.height > 0 { - self.getTerminal().resetNormalBuffer() - self.getTerminal().resetToInitialState() - self.getTerminal().softReset() - self.feed(text: "") - self.getTerminal().setCursorStyle(CursorStyle.blinkBar) - hasConfigured = true - } - } - - nonisolated public func sizeChanged(source: TerminalView, newCols: Int, newRows: Int) {} - nonisolated public func setTerminalTitle(source: TerminalView, title: String) {} - nonisolated public func hostCurrentDirectoryUpdate(source: TerminalView, directory: String?) {} - nonisolated public func send(source: TerminalView, data: ArraySlice) {} - nonisolated public func scrolled(source: TerminalView, position: Double) {} - nonisolated public func requestOpenLink(source: SwiftTerm.TerminalView, link: String, params: [String : String]) {} - nonisolated public func bell(source: TerminalView) {} - nonisolated public func clipboardCopy(source: SwiftTerm.TerminalView, content: Data) {} - nonisolated public func iTermContent (source: TerminalView, content: ArraySlice) {} - nonisolated public func rangeChanged(source: SwiftTerm.TerminalView, startY: Int, endY: Int) {} - - public override init(frame: CGRect) { - super.init(frame: frame) - terminalDelegate = self - } - - public convenience required init?(coder: NSCoder) { - fatalError("unimplememented") - } -}