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

terminal: insert/deleteLines with L/R region across pages

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-25 20:07:19 -07:00
parent e337ebe131
commit ad5d7b6c5a
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/terminal/Terminal.zig
View File

@ -1325,24 +1325,27 @@ pub fn insertLines(self: *Terminal, count: usize) void {
const src: *Row = p.rowAndCell().row; const src: *Row = p.rowAndCell().row;
const dst: *Row = dst_p.rowAndCell().row; const dst: *Row = dst_p.rowAndCell().row;
// If our page doesn't match, then we need to do a copy from
// one page to another. This is the slow path.
if (dst_p.page != p.page) {
dst_p.page.data.clonePartialRowFrom(
&p.page.data,
dst,
src,
self.scrolling_region.left,
self.scrolling_region.right + 1,
) catch |err| {
std.log.warn("TODO: insertLines handle clone error err={}", .{err});
unreachable;
};
// Row never is wrapped if we're full width.
if (!left_right) dst.wrap = false;
continue;
}
if (!left_right) { if (!left_right) {
// If the pages are not the same, we need to do a slow copy.
if (dst_p.page != p.page) {
dst_p.page.data.cloneRowFrom(
&p.page.data,
dst,
src,
) catch |err| {
std.log.warn("TODO: insertLines handle clone error err={}", .{err});
unreachable;
};
// Row never is wrapped
dst.wrap = false;
continue;
}
// Swap the src/dst cells. This ensures that our dst gets the proper // Swap the src/dst cells. This ensures that our dst gets the proper
// shifted rows and src gets non-garbage cell data that we can clear. // shifted rows and src gets non-garbage cell data that we can clear.
const dst_row = dst.*; const dst_row = dst.*;
@ -1358,8 +1361,6 @@ pub fn insertLines(self: *Terminal, count: usize) void {
continue; continue;
} }
assert(dst_p.page == p.page); // TODO: handle different pages for left/right
// Left/right scroll margins we have to copy cells, which is much slower... // Left/right scroll margins we have to copy cells, which is much slower...
const page = &p.page.data; const page = &p.page.data;
page.moveCells( page.moveCells(
@ -1463,24 +1464,25 @@ pub fn deleteLines(self: *Terminal, count_req: usize) void {
const src: *Row = src_p.rowAndCell().row; const src: *Row = src_p.rowAndCell().row;
const dst: *Row = p.rowAndCell().row; const dst: *Row = p.rowAndCell().row;
if (src_p.page != p.page) {
p.page.data.clonePartialRowFrom(
&src_p.page.data,
dst,
src,
self.scrolling_region.left,
self.scrolling_region.right + 1,
) catch |err| {
std.log.warn("TODO: deleteLines handle clone error err={}", .{err});
unreachable;
};
// Row never is wrapped if we're full width.
if (!left_right) dst.wrap = false;
continue;
}
if (!left_right) { if (!left_right) {
// If the pages are not the same, we need to do a slow copy.
if (src_p.page != p.page) {
p.page.data.cloneRowFrom(
&src_p.page.data,
dst,
src,
) catch |err| {
std.log.warn("TODO: deleteLines handle clone error err={}", .{err});
unreachable;
};
// Row never is wrapped
dst.wrap = false;
continue;
}
// Swap the src/dst cells. This ensures that our dst gets the proper // Swap the src/dst cells. This ensures that our dst gets the proper
// shifted rows and src gets non-garbage cell data that we can clear. // shifted rows and src gets non-garbage cell data that we can clear.
const dst_row = dst.*; const dst_row = dst.*;
@ -1495,8 +1497,6 @@ pub fn deleteLines(self: *Terminal, count_req: usize) void {
continue; continue;
} }
assert(src_p.page == p.page); // TODO: handle different pages for left/right
// Left/right scroll margins we have to copy cells, which is much slower... // Left/right scroll margins we have to copy cells, which is much slower...
const page = &p.page.data; const page = &p.page.data;
page.moveCells( page.moveCells(