mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-11 19:59:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal: page clone needs to clone strings

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-07-04 15:16:18 -07:00
parent f8fe0445a5
commit f777e42af2
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/terminal/hyperlink.zig
View File

@@ -35,6 +35,52 @@ pub const Hyperlink = struct {
implicit: size.OffsetInt,
};
/// Duplicate this hyperlink from one page to another.
pub fn dupe(self: *const Hyperlink, self_page: *const Page, dst_page: *Page) !Hyperlink {
var copy = self.*;
// If the pages are the same then we can return a shallow copy.
if (self_page == dst_page) return copy;
// Copy the URI
{
const uri = self.uri.offset.ptr(self_page.memory)[0..self.uri.len];
const buf = try dst_page.string_alloc.alloc(u8, dst_page.memory, uri.len);
@memcpy(buf, uri);
copy.uri = .{
.offset = size.getOffset(u8, dst_page.memory, &buf[0]),
.len = uri.len,
};
}
errdefer dst_page.string_alloc.free(
dst_page.memory,
copy.uri.offset.ptr(dst_page.memory)[0..copy.uri.len],
);
// Copy the ID
switch (copy.id) {
.implicit => {}, // Shallow is fine
.explicit => |slice| {
const id = slice.offset.ptr(self_page.memory)[0..slice.len];
const buf = try dst_page.string_alloc.alloc(u8, dst_page.memory, id.len);
@memcpy(buf, id);
copy.id = .{ .explicit = .{
.offset = size.getOffset(u8, dst_page.memory, &buf[0]),
.len = id.len,
} };
},
}
errdefer switch (copy.id) {
.implicit => {},
.explicit => |v| dst_page.string_alloc.free(
dst_page.memory,
v.offset.ptr(dst_page.memory)[0..v.len],
),
};
return copy;
}
pub fn hash(self: *const Hyperlink, base: anytype) u64 {
var hasher = Wyhash.init(0);
autoHash(&hasher, std.meta.activeTag(self.id));

4
src/terminal/page.zig
View File

@@ -677,12 +677,10 @@ pub const Page = struct {
const other_link = other.hyperlink_set.get(other.memory, id);
const dst_id = try self.hyperlink_set.addContext(
self.memory,
other_link.*,
try other_link.dupe(other, self),
.{ .page = self },
);
try self.setHyperlink(dst_row, dst_cell, dst_id);
// TODO: copy the strings
}
if (src_cell.style_id != style.default_id) {
dst_row.styled = true;