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

Merge pull request #1655 from qwerasd205/fix-copy

Browse Source 
Fix copy
This commit is contained in:
Mitchell Hashimoto
2024-04-04 15:16:58 -07:00
committed by GitHub
parent 3f2fc75ba6 be07856647
commit 72edec3962
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/terminal/Screen.zig
View File

@ -1433,7 +1433,7 @@ pub fn selectionString(self: *Screen, alloc: Allocator, opts: SelectionString) !
} }
} }
const is_final_row = sel_end.page == chunk.page and sel_end.y == chunk.start + row_count; const is_final_row = chunk.page == sel_end.page and y == sel_end.y;
if (!is_final_row and if (!is_final_row and
(!row.wrap or sel_ordered.rectangle)) (!row.wrap or sel_ordered.rectangle))
@ -7079,29 +7079,30 @@ test "Screen: selectionString multi-page" {
const testing = std.testing; const testing = std.testing;
const alloc = testing.allocator; const alloc = testing.allocator;
var s = try init(alloc, 130, 40, 512); var s = try init(alloc, 1, 3, 2048);
defer s.deinit(); defer s.deinit();
// 512 * "y\n"
var str: [1024]u8 = undefined; const first_page_size = s.pages.pages.first.?.data.capacity.rows;
var i: usize = 0;
while (i < str.len) : (i += 2) { // Lazy way to seek to the first page boundary.
str[i] = 'y'; for (0..first_page_size - 1) |_| {
str[i + 1] = '\n'; try s.testWriteString("\n");
} }
try s.testWriteString(&str);
try s.testWriteString("y\ny\ny");
{ {
const sel = Selection.init( const sel = Selection.init(
s.pages.pin(.{ .screen = .{ .x = 0, .y = 0 } }).?, s.pages.pin(.{ .active = .{ .x = 0, .y = 0 } }).?,
s.pages.pin(.{ .active = .{ .x = 1, .y = 39 } }).?, s.pages.pin(.{ .active = .{ .x = 0, .y = 2 } }).?,
false, false,
); );
const contents = try s.selectionString(alloc, .{ const contents = try s.selectionString(alloc, .{
.sel = sel, .sel = sel,
.trim = true, .trim = false,
}); });
defer alloc.free(contents); defer alloc.free(contents);
const expected = str[0..1023]; const expected = "y\ny\ny";
try testing.expectEqualStrings(expected, contents); try testing.expectEqualStrings(expected, contents);
} }
} }