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

Selection: don't alter x position when rectangle select is off viewport

Browse Source 
This ensures that the start or end x values do not get adjusted when
they are off the viewport in rectangle select.

This also includes some tests for the toViewport method.

Fixes #1339.
This commit is contained in:
Chris Marchesi
2024-01-21 19:34:25 -08:00
parent 483380e0ad
commit 1b8b59538c
1 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/terminal/Selection.zig
View File

@ -34,8 +34,8 @@ pub fn toViewport(self: Selection, screen: *const Screen) ?Selection {
const start = self.start.toViewport(screen);
const end = self.end.toViewport(screen);
return Selection{
.start = .{ .x = start.x, .y = start.y },
.end = .{ .x = end.x, .y = end.y },
.start = .{ .x = if (self.rectangle) self.start.x else start.x, .y = start.y },
.end = .{ .x = if (self.rectangle) self.end.x else end.x, .y = end.y },
.rectangle = self.rectangle,
};
}
@ -1064,3 +1064,89 @@ test "ordered" {
try testing.expectEqual(sel.ordered(.mirrored_forward), sel_forward);
}
}
test "toViewport" {
const testing = std.testing;
var screen = try Screen.init(testing.allocator, 24, 80, 0);
defer screen.deinit();
screen.viewport = 11; // Scroll us down a bit
{
// Not in viewport (null)
const sel: Selection = .{
.start = .{ .x = 10, .y = 1 },
.end = .{ .x = 3, .y = 3 },
.rectangle = false,
};
try testing.expectEqual(null, sel.toViewport(&screen));
}
{
// In viewport
const sel: Selection = .{
.start = .{ .x = 10, .y = 11 },
.end = .{ .x = 3, .y = 13 },
.rectangle = false,
};
const want: Selection = .{
.start = .{ .x = 10, .y = 0 },
.end = .{ .x = 3, .y = 2 },
.rectangle = false,
};
try testing.expectEqual(want, sel.toViewport(&screen));
}
{
// Top off viewport
const sel: Selection = .{
.start = .{ .x = 10, .y = 1 },
.end = .{ .x = 3, .y = 13 },
.rectangle = false,
};
const want: Selection = .{
.start = .{ .x = 0, .y = 0 },
.end = .{ .x = 3, .y = 2 },
.rectangle = false,
};
try testing.expectEqual(want, sel.toViewport(&screen));
}
{
// Bottom off viewport
const sel: Selection = .{
.start = .{ .x = 10, .y = 11 },
.end = .{ .x = 3, .y = 40 },
.rectangle = false,
};
const want: Selection = .{
.start = .{ .x = 10, .y = 0 },
.end = .{ .x = 79, .y = 23 },
.rectangle = false,
};
try testing.expectEqual(want, sel.toViewport(&screen));
}
{
// Both off viewport
const sel: Selection = .{
.start = .{ .x = 10, .y = 1 },
.end = .{ .x = 3, .y = 40 },
.rectangle = false,
};
const want: Selection = .{
.start = .{ .x = 0, .y = 0 },
.end = .{ .x = 79, .y = 23 },
.rectangle = false,
};
try testing.expectEqual(want, sel.toViewport(&screen));
}
{
// Both off viewport (rectangle)
const sel: Selection = .{
.start = .{ .x = 10, .y = 1 },
.end = .{ .x = 3, .y = 40 },
.rectangle = true,
};
const want: Selection = .{
.start = .{ .x = 10, .y = 0 },
.end = .{ .x = 3, .y = 23 },
.rectangle = true,
};
try testing.expectEqual(want, sel.toViewport(&screen));
}
}