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

terminal/new: pagelist more cols

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-02-29 22:21:31 -08:00
parent f6071ca53e
commit 437980a28d
1 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/terminal/new/PageList.zig
View File

@ -437,7 +437,6 @@ fn resizeWithoutReflow(self: *PageList, opts: Resize) !void {
// Unlikely fast path: we have capacity in the page. This // Unlikely fast path: we have capacity in the page. This
// is only true if we resized to less cols earlier. // is only true if we resized to less cols earlier.
if (page.capacity.cols >= cols) { if (page.capacity.cols >= cols) {
if (true) @panic("TODO: TEST");
page.size.cols = cols; page.size.cols = cols;
continue; continue;
} }
@ -445,9 +444,17 @@ fn resizeWithoutReflow(self: *PageList, opts: Resize) !void {
// Likely slow path: we don't have capacity, so we need // Likely slow path: we don't have capacity, so we need
// to allocate a page, and copy the old data into it. // to allocate a page, and copy the old data into it.
// TODO: handle capacity can't fit rows for cols // TODO: handle capacity can't fit rows for cols
if (true) @panic("TODO after page.cloneFrom");
const new_page = try self.createPage(cap); const new_page = try self.createPage(cap);
_ = new_page; errdefer self.destroyPage(new_page);
new_page.data.size.rows = page.size.rows;
try new_page.data.cloneFrom(page, 0, page.size.rows);
// Insert our new page before the old page.
// Remove the old page.
// Deallocate the old page.
self.pages.insertBefore(chunk.page, new_page);
self.pages.remove(chunk.page);
self.destroyPage(chunk.page);
} }
self.cols = cols; self.cols = cols;
@ -609,6 +616,14 @@ fn createPage(self: *PageList, cap: Capacity) !*List.Node {
return page; return page;
} }
/// Destroy the memory of the given page and return it to the pool. The
/// page is assumed to already be removed from the linked list.
fn destroyPage(self: *PageList, page: *List.Node) void {
@memset(page.data.memory, 0);
self.pool.pages.destroy(@ptrCast(page.data.memory.ptr));
self.pool.nodes.destroy(page);
}
/// Erase the rows from the given top to bottom (inclusive). Erasing /// Erase the rows from the given top to bottom (inclusive). Erasing
/// the rows doesn't clear them but actually physically REMOVES the rows. /// the rows doesn't clear them but actually physically REMOVES the rows.
/// If the top or bottom point is in the middle of a page, the other /// If the top or bottom point is in the middle of a page, the other
@ -719,11 +734,7 @@ fn erasePage(self: *PageList, page: *List.Node) void {
// Remove the page from the linked list // Remove the page from the linked list
self.pages.remove(page); self.pages.remove(page);
self.destroyPage(page);
// Reset the page memory and return it back to the pool.
@memset(page.data.memory, 0);
self.pool.pages.destroy(@ptrCast(page.data.memory.ptr));
self.pool.nodes.destroy(page);
} }
/// Get the top-left of the screen for the given tag. /// Get the top-left of the screen for the given tag.
@ -1896,22 +1907,46 @@ test "PageList resize (no reflow) less cols clears graphemes" {
} }
} }
// test "PageList resize (no reflow) more cols" { test "PageList resize (no reflow) more cols" {
// const testing = std.testing; const testing = std.testing;
// const alloc = testing.allocator; const alloc = testing.allocator;
//
// var s = try init(alloc, 5, 3, 0); var s = try init(alloc, 5, 3, 0);
// defer s.deinit(); defer s.deinit();
//
// // Resize // Resize
// try s.resize(.{ .cols = 10, .reflow = false }); try s.resize(.{ .cols = 10, .reflow = false });
// try testing.expectEqual(@as(usize, 10), s.cols); try testing.expectEqual(@as(usize, 10), s.cols);
// try testing.expectEqual(@as(usize, 3), s.totalRows()); try testing.expectEqual(@as(usize, 3), s.totalRows());
//
// var it = s.rowIterator(.{ .screen = .{} }, null); var it = s.rowIterator(.{ .screen = .{} }, null);
// while (it.next()) |offset| { while (it.next()) |offset| {
// const rac = offset.rowAndCell(0); const rac = offset.rowAndCell(0);
// const cells = offset.page.data.getCells(rac.row); const cells = offset.page.data.getCells(rac.row);
// try testing.expectEqual(@as(usize, 10), cells.len); try testing.expectEqual(@as(usize, 10), cells.len);
// } }
// } }
test "PageList resize (no reflow) less cols then more cols" {
const testing = std.testing;
const alloc = testing.allocator;
var s = try init(alloc, 5, 3, 0);
defer s.deinit();
// Resize less
try s.resize(.{ .cols = 2, .reflow = false });
try testing.expectEqual(@as(usize, 2), s.cols);
// Resize
try s.resize(.{ .cols = 5, .reflow = false });
try testing.expectEqual(@as(usize, 5), s.cols);
try testing.expectEqual(@as(usize, 3), s.totalRows());
var it = s.rowIterator(.{ .screen = .{} }, null);
while (it.next()) |offset| {
const rac = offset.rowAndCell(0);
const cells = offset.page.data.getCells(rac.row);
try testing.expectEqual(@as(usize, 5), cells.len);
}
}