Skip to content
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.

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

ssh doc addition, and remove compiler warning #6168

Merged
merged 2 commits into from
Sep 22, 2024
Merged

Conversation

loops
Copy link
Contributor

@loops loops commented Sep 20, 2024

Two small separate changes.

Address a compiler warning, and make a small doc change for changes from #6093

Copy link
Owner

@wez wez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for tackling this! I think the scrolling issue is probably more complex, so I'd suggest splitting that out from the other two fixes so that we can get those merged in the meantime

docs/ssh.md Outdated Show resolved Hide resolved
if scroll_region.start != 0 || scroll_region.end as usize != self.physical_rows {
if scroll_region.start != 0
|| scroll_region.end as usize != self.physical_rows
|| !self.allow_scrollback
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this change; it implies that the seqno's of the viewport are not being correctly invalidated by the main logic below for the common case. In particular, I'm concerned that if this is needed, it should probably be unconditional rather than scoped to the !allow_scrollback case.

The reason this is conditional is to avoid an additional O(screen-height) fixed overhead for every scroll operation.

Please translate your repro scenario from #6166 into a unit test in
https://github.com/wez/wezterm/blob/main/term/src/test/mod.rs that triggers the problem; I'd like to see what is happening to the seqno's of the lines being scrolled without attempting to fix it, then we can figure out what the right fix is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do.

Dropped for now and will resubmit.

For enhancement requested in issue wez#6093
As per <rust-lang/rust#123748>
! will no longer degrades into () which in this situation
breaks type deduction; so specify it explicitly.
@loops loops changed the title Alt scroll in mux, ssh doc addition, and compiler warning ssh doc addition, and remove compiler warning Sep 22, 2024
@wez wez merged commit 2b76c63 into wez:main Sep 22, 2024
15 of 16 checks passed
@wez
Copy link
Owner

wez commented Sep 22, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants