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

Merge pull request #1648 from qwerasd205/fix-copy

Browse Source 
Fix copying selection across page boundaries
This commit is contained in:
Mitchell Hashimoto
2024-04-04 09:46:09 -07:00
committed by GitHub
parent 7db994726d 8be145ec1f
commit 54b9d4937f
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/terminal/Screen.zig
View File

@ -1355,14 +1355,14 @@ pub fn selectionString(self: *Screen, alloc: Allocator, opts: SelectionString) !
defer if (mapbuilder) |*b| b.deinit();
const sel_ordered = opts.sel.ordered(self, .forward);
const sel_start = start: {
var start = sel_ordered.start();
const sel_start: Pin = start: {
var start: Pin = sel_ordered.start();
const cell = start.rowAndCell().cell;
if (cell.wide == .spacer_tail) start.x -= 1;
break :start start;
};
const sel_end = end: {
var end = sel_ordered.end();
const sel_end: Pin = end: {
var end: Pin = sel_ordered.end();
const cell = end.rowAndCell().cell;
switch (cell.wide) {
.narrow, .wide => {},
@ -1433,7 +1433,9 @@ pub fn selectionString(self: *Screen, alloc: Allocator, opts: SelectionString) !
}
}
if (row_count < rows.len - 1 and
const is_final_row = sel_end.page == chunk.page and sel_end.y == chunk.start + row_count;
if (!is_final_row and
(!row.wrap or sel_ordered.rectangle))
{
try strbuilder.append('\n');
@ -7073,6 +7075,37 @@ test "Screen: selectionString, rectangle, more complex w/breaks" {
try testing.expectEqualStrings(expected, contents);
}
test "Screen: selectionString multi-page" {
const testing = std.testing;
const alloc = testing.allocator;
var s = try init(alloc, 130, 40, 512);
defer s.deinit();
// 512 * "y\n"
var str: [1024]u8 = undefined;
var i: usize = 0;
while (i < str.len) : (i += 2) {
str[i] = 'y';
str[i + 1] = '\n';
}
try s.testWriteString(&str);
{
const sel = Selection.init(
s.pages.pin(.{ .screen = .{ .x = 0, .y = 0 } }).?,
s.pages.pin(.{ .active = .{ .x = 1, .y = 39 } }).?,
false,
);
const contents = try s.selectionString(alloc, .{
.sel = sel,
.trim = true,
});
defer alloc.free(contents);
const expected = str[0..1023];
try testing.expectEqualStrings(expected, contents);
}
}
test "Screen: lineIterator" {
const testing = std.testing;
const alloc = testing.allocator;