Skip to content

feat: expose userScrolling for scroll-lock during output #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
k3rnelpan11c wants to merge 1 commit into from
Closed

feat: expose userScrolling for scroll-lock during output #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Sources/SwiftTerm/Apple/AppleTerminalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,8 @@ extension TerminalView {
{
search.invalidate()
// Preserve manual selection while output is streaming when mouse reporting is disabled.
if allowMouseReporting {
// Also preserve when user is scrolled back (viewing history while output arrives).
if allowMouseReporting && !terminal.userScrolling {
selection.active = false
}
startDisplayUpdates()
Expand Down
5 changes: 3 additions & 2 deletions Sources/SwiftTerm/Mac/MacTerminalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,

open func linefeed(source: Terminal) {
// Preserve manual selection while output is streaming when mouse reporting is disabled.
if allowMouseReporting {
// Also preserve when user is scrolled back (viewing history while output arrives).
if allowMouseReporting && !source.userScrolling {
selection.selectNone()
}
}
Expand Down Expand Up @@ -2259,7 +2260,7 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
}
}

public override func scrollWheel(with event: NSEvent) {
open override func scrollWheel(with event: NSEvent) {
if event.deltaY == 0 {
return
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftTerm/Terminal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ open class Terminal {
var refreshEnd = -1
var scrollInvariantRefreshStart = Int.max
var scrollInvariantRefreshEnd = -1
var userScrolling = false
public var userScrolling = false
var lineFeedMode = false

// We do not implement smooth scrolling here, dubious value, but
Expand Down