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

terminal: do not have the UTF8Decoder overhead if SIMD

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-02-05 21:26:40 -08:00
parent 8bbcf6821a
commit dc6c52fac1
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal/stream.zig
View File

@ -81,7 +81,7 @@ pub fn Stream(comptime Handler: type) type {
// we are. This can happen if the last chunk of input put us // we are. This can happen if the last chunk of input put us
// in the middle of a control sequence. // in the middle of a control sequence.
for (input[offset..]) |single| { for (input[offset..]) |single| {
try self.next(single); try self.nextNonUtf8(single);
offset += 1; offset += 1;
if (self.parser.state == .ground) break; if (self.parser.state == .ground) break;
} }
@ -117,7 +117,7 @@ pub fn Stream(comptime Handler: type) type {
// Process our control sequence. // Process our control sequence.
for (input[offset..]) |single| { for (input[offset..]) |single| {
try self.next(single); try self.nextNonUtf8(single);
offset += 1; offset += 1;
if (self.parser.state == .ground) break; if (self.parser.state == .ground) break;
} }
@ -171,9 +171,11 @@ pub fn Stream(comptime Handler: type) type {
return input_len; return input_len;
} }
/// Process the next character and call any callbacks if necessary. /// Like nextSlice but takes one byte and is necessarilly a scalar
/// operation that can't use SIMD. Prefer nextSlice if you can and
/// try to get multiple bytes at once.
pub fn next(self: *Self, c: u8) !void { pub fn next(self: *Self, c: u8) !void {
// log.debug("char: {x} {c}", .{ c, c }); // The scalar path can be responsible for decoding UTF-8.
if (self.parser.state == .ground and c != 0x1B) { if (self.parser.state == .ground and c != 0x1B) {
var consumed = false; var consumed = false;
while (!consumed) { while (!consumed) {
@ -187,9 +189,20 @@ pub fn Stream(comptime Handler: type) type {
} }
} }
} }
return; return;
} }
try self.nextNonUtf8(c);
}
/// Process the next character and call any callbacks if necessary.
///
/// This assumes that we're not in the UTF-8 decoding state. If
/// we may be in the UTF-8 decoding state call nextSlice or next.
fn nextNonUtf8(self: *Self, c: u8) !void {
assert(self.parser.state != .ground or c == 0x1B);
const actions = self.parser.next(c); const actions = self.parser.next(c);
for (actions) |action_opt| { for (actions) |action_opt| {
const action = action_opt orelse continue; const action = action_opt orelse continue;