neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 21:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove overlay jelly cursor implementation, check jelly branch on https://github.com/neon443/SwiftTerm

Browse Source 
add empty handler for 133 iterm2
This commit is contained in:
neon443
2025-08-31 22:23:17 +01:00
parent 1f687f0b62
commit 28b92466a5
4 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ShhShell/Terminal/SSHTerminalDelegate.swift
View File

@@ -32,6 +32,7 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
applySelectedTheme()
applyScrollbackLength()
applyCursorType()
getTerminal().registerOscHandler(code: 133, handler: { _ in })
// DispatchQueue.main.asyncAfter(deadline: .now()+0.01) {
self.startFeedLoop()
let _ = self.becomeFirstResponder()

58
ShhShell/Views/Terminal/ShellView.swift
View File

@@ -13,8 +13,34 @@ struct ShellView: View {
@ObservedObject var hostsManager: HostsManager
@ObservedObject var container = TerminalViewContainer.shared
@State var jellyLoc: (x: Int, y: Int) = (0, 0)
@State var jellySize: CGSize = CGSize(width: 0, height: 0)
@State var cursorPos: (x: Int, y: Int) = (0, 0)
var jellyLoc: CGSize {
var offset = CGSize(width: cursorPos.x, height: cursorPos.y)
offset.width *= cellDimension.width
offset.height *= cellDimension.height
switch hostsManager.settings.cursorType.cursorShape {
case .block, .bar:
fallthrough
case .underline:
offset.height += cellDimension.height * 0.8
}
return offset
}
@State var cellDimension: CGSize = CGSize(width: 0, height: 0)
var jellySize: CGSize {
var cellDimension: CGSize = cellDimension
switch hostsManager.settings.cursorType.cursorShape {
case .block:
fallthrough
case .bar:
cellDimension.width *= 0.3
case .underline:
cellDimension.height *= 0.2
}
return cellDimension
}
@State var jellyShow: Bool = true
@Environment(\.dismiss) var dismiss
@@ -34,23 +60,27 @@ struct ShellView: View {
let terminalView = container.sessions[handler.sessionID ?? UUID()]?.terminalView
let delegate = terminalView?.terminalDelegate as? SSHTerminalDelegate
terminalView?.getTerminal().hideCursor()
jellyLoc = terminalView?.getTerminal().getCursorLocation() ?? jellyLoc
jellySize = delegate?.computeFontDimensions() ?? jellySize
cursorPos = terminalView?.getTerminal().getCursorLocation() ?? cursorPos
cellDimension = delegate?.computeFontDimensions() ?? cellDimension
// jellyShow = terminalView?.getTerminal().buffer.isCursorInViewPort ?? jellyShow
}
}
RunLoop.main.add(timer, forMode: .common)
// RunLoop.main.add(timer, forMode: .common)
}
Rectangle()
.frame(width: jellySize.width, height: jellySize.height)
.offset(
x: CGFloat(jellyLoc.x)*jellySize.width,
y: CGFloat(jellyLoc.y)*jellySize.height
)
.opacity(jellyShow ? 1 : 0)
.animation(.spring, value: jellyLoc.x)
.animation(.spring, value: jellyLoc.y)
// Rectangle()
// .frame(width: jellySize.width, height: jellySize.height)
// .offset(
// x: jellyLoc.width,
// y: jellyLoc.height
// )
// .opacity(jellyShow ? 1 : 0)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: cursorPos.x)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: cursorPos.y)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: jellyLoc.width)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: jellyLoc.height)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: jellySize.width)
// .animation(.spring(duration: 0.2, bounce: 0.6), value: jellySize.height)
if hostsManager.settings.filter == .crt {
CRTView()