Repository navigation
terminal: keep CHA, VPA, HPR and VPR origin-relative - #14762
Merged
Merged
Conversation
In origin mode setCursorPos takes coordinates relative to the scrolling region, but the stream handlers for CHA/HPA, VPA, HPR and VPR built them from the cursor's absolute screen position. The coordinate each meant to keep, or move relative to, then had the margin offset added a second time. Add setCursorRow, setCursorCol, cursorRowRelative and cursorColRelative to Terminal, which convert the cursor position into origin-relative coordinates first, as xterm's CursorRow and CursorCol do, and use them from both stream handlers. Fixes esctest's test_CHA_RespectsOriginMode, test_HPR_IgnoresOriginMode and test_VPR_IgnoresOriginMode.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In origin mode setCursorPos takes coordinates relative to the scrolling region, but the stream handlers for CHA/HPA, VPA, HPR and VPR built them from the cursor's absolute screen position. The coordinate each meant to keep, or move relative to, then had the margin offset added a second time.
Add setCursorRow, setCursorCol, cursorRowRelative and cursorColRelative to Terminal, which convert the cursor position into origin-relative coordinates first, as xterm's CursorRow and CursorCol do, and use them from both stream handlers.
Fixes esctest's test_CHA_RespectsOriginMode, test_HPR_IgnoresOriginMode and test_VPR_IgnoresOriginMode.
AI disclosure: Claude Code was used in the preparation of this PR.