Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: Pin.isBetween broken logic

Browse Source 
Two bugs:

1. If our pin is the top page, and self.y == top.y, then x will tell us
   the answer. Before, we'd fall through.

2. If our pin is not the top or bottom, but the top == bottom, then we
   can't possibly be between. Before, we'd incorrectly check the linked
   list starting AFTER top.
This commit is contained in:
Mitchell Hashimoto
2024-07-20 14:50:31 -07:00
parent 3a5b940703
commit 9198adcba3
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/terminal/PageList.zig
View File

@ -3315,21 +3315,47 @@ pub const Pin = struct {
}
if (self.page == top.page) {
// If our pin is the top page and our y is less than the top y
// then we can't possibly be between the top and bottom.
if (self.y < top.y) return false;
// If our y is after the top y but we're on the same page
// then we're between the top and bottom if our y is less
// than or equal to the bottom y IF its the same page. If the
// bottom is another page then it means that the range is
// at least the full top page and since we're the same page
// we're in the range.
if (self.y > top.y) {
return if (self.page == bottom.page)
self.y <= bottom.y
else
true;
}
if (self.x < top.x) return false;
// Otherwise our y is the same as the top y, so we need to
// check the x coordinate.
assert(self.y == top.y);
return self.x >= top.x;
}
if (self.page == bottom.page) {
// Our page is the bottom page so we're between the top and
// bottom if our y is less than the bottom y.
if (self.y > bottom.y) return false;
if (self.y < bottom.y) return true;
// If our y is the same then we're between if we're before
// or equal to the bottom x.
assert(self.y == bottom.y);
return self.x <= bottom.x;
}
// Our page isn't the top or bottom so we need to check if
// our page is somewhere between the top and bottom.
// Since our loop starts at top.page.next we need to check that
// top != bottom because if they're the same then we can't possibly
// be between them.
if (top.page == bottom.page) return false;
var page = top.page.next;
while (page) |p| : (page = p.next) {
if (p == bottom.page) break;