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

terminal: insert lines (IL) handles left/right scroll regions

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-10-08 20:51:00 -07:00
parent 38f968e368
commit 76bbb7c361
2 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal/Screen.zig
View File

@ -498,6 +498,27 @@ pub const Row = struct {
}
}
/// Copy a single cell from column x in src to column x in this row.
pub fn copyCell(self: Row, src: Row, x: usize) !void {
const dst_cell = self.getCellPtr(x);
const src_cell = src.getCellPtr(x);
// If our destination has graphemes, we have to clear them.
if (dst_cell.attrs.grapheme) self.clearGraphemes(x);
dst_cell.* = src_cell.*;
// If the source doesn't have any graphemes, then we can just copy.
if (!src_cell.attrs.grapheme) return;
// Source cell has graphemes. Copy them.
const src_key = src.getId() + x + 1;
const src_data = src.screen.graphemes.get(src_key) orelse return;
const dst_key = self.getId() + x + 1;
const dst_gop = try self.screen.graphemes.getOrPut(self.screen.alloc, dst_key);
dst_gop.value_ptr.* = try src_data.copy(self.screen.alloc);
self.storage[0].header.flags.grapheme = true;
}
/// Copy the row src into this row. The row can be from another screen.
pub fn copyRow(self: Row, src: Row) !void {
// If we have graphemes, clear first to unset them.

50
src/terminal/Terminal.zig
View File

@ -1590,7 +1590,9 @@ pub fn insertLines(self: *Terminal, count: usize) !void {
while (y > top) : (y -= 1) {
const src = self.screen.getRow(.{ .active = y - adjusted_count });
const dst = self.screen.getRow(.{ .active = y });
try dst.copyRow(src);
for (self.scrolling_region.left..self.scrolling_region.right + 1) |x| {
try dst.copyCell(src, x);
}
}
// Insert count blank lines
@ -2730,29 +2732,29 @@ test "Terminal: insertLines top/bottom scroll region" {
}
}
// test "Terminal: insertLines left/right scroll region" {
// const alloc = testing.allocator;
// var t = try init(alloc, 10, 10);
// defer t.deinit(alloc);
//
// try t.printString("ABC123");
// t.carriageReturn();
// try t.linefeed();
// try t.printString("DEF456");
// t.carriageReturn();
// try t.linefeed();
// try t.printString("GHI789");
// t.scrolling_region.left = 1;
// t.scrolling_region.right = 3;
// t.setCursorPos(2, 2);
// try t.insertLines(1);
//
// {
// var str = try t.plainString(testing.allocator);
// defer testing.allocator.free(str);
// try testing.expectEqualStrings("ABC123\nD 56\nGEF489\n HI7", str);
// }
// }
test "Terminal: insertLines left/right scroll region" {
const alloc = testing.allocator;
var t = try init(alloc, 10, 10);
defer t.deinit(alloc);
try t.printString("ABC123");
t.carriageReturn();
try t.linefeed();
try t.printString("DEF456");
t.carriageReturn();
try t.linefeed();
try t.printString("GHI789");
t.scrolling_region.left = 1;
t.scrolling_region.right = 3;
t.setCursorPos(2, 2);
try t.insertLines(1);
{
var str = try t.plainString(testing.allocator);
defer testing.allocator.free(str);
try testing.expectEqualStrings("ABC123\nD 56\nGEF489\n HI7", str);
}
}
test "Terminal: insertLines" {
const alloc = testing.allocator;