From 4e9d2e44e84231184300b5aed4b146721e0f6f15 Mon Sep 17 00:00:00 2001 From: lithium03 Date: Tue, 11 Apr 2023 00:40:19 +0900 Subject: [PATCH] update params --- sshview.xcodeproj/project.pbxproj | 4 ++-- sshview/SSHDaemon.swift | 14 +++++++------- sshview/TerminalView.swift | 11 ----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/sshview.xcodeproj/project.pbxproj b/sshview.xcodeproj/project.pbxproj index f7cbf8a..143fa65 100644 --- a/sshview.xcodeproj/project.pbxproj +++ b/sshview.xcodeproj/project.pbxproj @@ -339,7 +339,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_ASSET_PATHS = "\"sshview/Preview Content\""; DEVELOPMENT_TEAM = 7A9X38B4YU; ENABLE_PREVIEWS = YES; @@ -373,7 +373,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_ASSET_PATHS = "\"sshview/Preview Content\""; DEVELOPMENT_TEAM = 7A9X38B4YU; ENABLE_PREVIEWS = YES; diff --git a/sshview/SSHDaemon.swift b/sshview/SSHDaemon.swift index ee35019..fea21cb 100644 --- a/sshview/SSHDaemon.swift +++ b/sshview/SSHDaemon.swift @@ -73,7 +73,7 @@ actor LocalPortForward { var connSockfds: [Int32: ssh_channel] = [:] - static let buflen = 512 * 1024 + static let buflen = 4 * 1024 var buffer = [UInt8](repeating: 0, count: buflen) init?(session: ssh_session, localPort: UInt16, remoteHost: String, remotePort: UInt16) { @@ -290,7 +290,7 @@ actor TerminalSession { var channel: ssh_channel! - static let buflen = 512 * 1024 + static let buflen = 4 * 1024 var buffer = [UInt8](repeating: 0, count: buflen) init?(session: ssh_session, stdinFnc: (()->[UInt8]?)?, stdoutFnc: ((ArraySlice)->Void)?, stderrFnc: ((ArraySlice)->Void)?) async throws { @@ -460,7 +460,7 @@ actor CommandSession { var channel: ssh_channel! - static let buflen = 512 * 1024 + static let buflen = 4 * 1024 var buffer = [UInt8](repeating: 0, count: buflen) init? (session: ssh_session, comand: [UInt8], stdinFnc: (()->[UInt8]?)?, stdoutFnc: ((ArraySlice)->Void)?, stderrFnc: ((ArraySlice)->Void)?) async throws { @@ -741,17 +741,17 @@ class SSHDaemon: ObservableObject { } let connection = Connections() - static let buflen = 512 * 1024 + static let buflen = 4 * 1024 var buffer = [UInt8](repeating: 0, count: buflen) var task = Task {} init() { signal(SIGPIPE, handler) - task = Task { + task = Task.detached { while true { - await processDataLoop() - try? await Task.sleep(nanoseconds: 1_000_000) + await self.processDataLoop() + try? await Task.sleep(nanoseconds: 50_000) } } } diff --git a/sshview/TerminalView.swift b/sshview/TerminalView.swift index 91e9f12..06ccc11 100644 --- a/sshview/TerminalView.swift +++ b/sshview/TerminalView.swift @@ -104,18 +104,15 @@ class InvisibleTextView: UIView, UIKeyInput { guard value >= 0x40, value <= 0x5F else { return } - print("^"+text) let code = value & 0x1F delegate?.insertCode(code: [code]) } else { - print(text) delegate?.insertText(text: text) } } func deleteBackward() { - print("(delete)") delegate?.deleteText() } @@ -298,7 +295,6 @@ class CanvasView: UIView { } let th = atan2(d.y, d.x) let count = Int(length / 50.0) + 1 - print(count, length, th) if th >= -CGFloat.pi / 4, th < CGFloat.pi / 4 { // right if console.applicationCursor { @@ -550,7 +546,6 @@ class consoleScreen: ObservableObject { ] let s = NSAttributedString(string: " ", attributes: stringAttributes).boundingRect(with: UIScreen.main.bounds.size, context: nil) let newSize = (width: Int(ceil(size.width) / floor(s.width)), height: Int(ceil(size.height) / floor(s.height))) - print(newSize) for i in 0.. 0 { if c == 0x1B { @@ -959,7 +953,6 @@ class TerminalScreen: ObservableObject { continue } - print(escSequence) escSequence = [] continue case 0x24: @@ -986,7 +979,6 @@ class TerminalScreen: ObservableObject { } escSequence.append(c) - print(escSequence) escSequence = [] continue } @@ -1165,7 +1157,6 @@ class TerminalScreen: ObservableObject { let command = String(bytes: [endc], encoding: .utf8)! let Pt = String(bytes: escSequence[2...].dropLast(), encoding: .utf8)! - print(Pt, command) if command == "@" { // ICH // CSI Ps @ @@ -1759,7 +1750,6 @@ class TerminalScreen: ObservableObject { if v.count == 2 { let Ps = String(bytes: v[0], encoding: .utf8)! let Pt = String(bytes: v[1], encoding: .utf8)! - print(Ps, Pt) if Ps == "0" || Ps == "1" || Ps == "2" { // window title windowTitle = Pt @@ -1854,7 +1844,6 @@ class TerminalScreen: ObservableObject { } screenBuffer = [] screen.drawView() - print(screen.curX, screen.curY) } }