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

fix some bugs

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-05-21 16:36:19 -07:00
parent 2a657d1ec9
commit 656488bff9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/terminal/Screen.zig
View File

@ -88,7 +88,7 @@ pub fn getCell(self: Screen, row: usize, col: usize) *Cell {
assert(row < self.rows); assert(row < self.rows);
assert(col < self.cols); assert(col < self.cols);
const row_idx = self.rowIndex(row); const row_idx = self.rowIndex(row);
return self.storage[row_idx + col]; return &self.storage[row_idx + col];
} }
/// Returns the index for the given row (0-indexed) into the underlying /// Returns the index for the given row (0-indexed) into the underlying
@ -125,6 +125,7 @@ pub fn copyRow(self: *Screen, dst: usize, src: usize) void {
/// Turns the screen into a string. /// Turns the screen into a string.
pub fn testString(self: Screen, alloc: Allocator) ![]const u8 { pub fn testString(self: Screen, alloc: Allocator) ![]const u8 {
const buf = try alloc.alloc(u8, self.storage.len + self.rows); const buf = try alloc.alloc(u8, self.storage.len + self.rows);
var i: usize = 0; var i: usize = 0;
var y: usize = 0; var y: usize = 0;
var rows = self.rowIterator(); var rows = self.rowIterator();
@ -137,13 +138,16 @@ pub fn testString(self: Screen, alloc: Allocator) ![]const u8 {
} }
for (row) |cell| { for (row) |cell| {
// Turn NUL into space. // TODO: handle character after null
const char = if (cell.char == 0) 0x20 else cell.char; if (cell.char > 0) {
i += try std.unicode.utf8Encode(@intCast(u21, char), buf[i..]); i += try std.unicode.utf8Encode(@intCast(u21, cell.char), buf[i..]);
}
} }
} }
return buf[0..i]; // Never render the final newline
const str = std.mem.trimRight(u8, buf[0..i], "\n");
return try alloc.realloc(buf, str.len);
} }
/// Writes a basic string into the screen for testing. Newlines (\n) separate /// Writes a basic string into the screen for testing. Newlines (\n) separate