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

terminal: sgr parsing doesn't parse 4-form 48, allows unstyled underline

Browse Source 
Fixes #362

We previously tried to parse 4-form 48, but as far as I can tell this is
never used anyways and in this real world scenario it expected us to
parse a 3-form followed by an underline. This fixes the real world
scenario as priority and adds a test.

This also fixes an issue where single form colon underline may actually
exist, again from a real world scenario.
This commit is contained in:
Mitchell Hashimoto
2023-08-30 14:58:44 -07:00
parent fb2d4faa03
commit c18527384e
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/terminal/sgr.zig
View File

@ -126,9 +126,8 @@ pub const Parser = struct {
// an element to get here. // an element to get here.
0 => unreachable, 0 => unreachable,
// 1 is unreachable because we can't have a colon // 1 is possible if underline is the last element.
// separator if there are no separators. 1 => return Attribute{ .underline = .single },
1 => unreachable,
// 2 means we have a specific underline style. // 2 means we have a specific underline style.
2 => { 2 => {
@ -214,12 +213,8 @@ pub const Parser = struct {
48 => if (slice.len >= 5 and slice[1] == 2) { 48 => if (slice.len >= 5 and slice[1] == 2) {
self.idx += 4; self.idx += 4;
// In the 6-len form, ignore the 3rd param. Otherwise, use it. // We only support the 5-len form.
const rgb = if (slice.len == 5) slice[2..5] else rgb: { const rgb = slice[2..5];
// Consume one more element
self.idx += 1;
break :rgb slice[3..6];
};
// We use @truncate because the value should be 0 to 255. If // We use @truncate because the value should be 0 to 255. If
// it isn't, the behavior is undefined so we just... truncate it. // it isn't, the behavior is undefined so we just... truncate it.
@ -507,3 +502,33 @@ test "sgr: invisible" {
try testing.expect(p.next().? == .invisible); try testing.expect(p.next().? == .invisible);
try testing.expect(p.next().? == .reset_invisible); try testing.expect(p.next().? == .reset_invisible);
} }
test "sgr: underline, bg, and fg" {
var p: Parser = .{
.params = &[_]u16{ 4, 38, 2, 255, 247, 219, 48, 2, 242, 93, 147, 4 },
};
{
const v = p.next().?;
try testing.expect(v == .underline);
try testing.expectEqual(Attribute.Underline.single, v.underline);
}
{
const v = p.next().?;
try testing.expect(v == .direct_color_fg);
try testing.expectEqual(@as(u8, 255), v.direct_color_fg.r);
try testing.expectEqual(@as(u8, 247), v.direct_color_fg.g);
try testing.expectEqual(@as(u8, 219), v.direct_color_fg.b);
}
{
const v = p.next().?;
try testing.expect(v == .direct_color_bg);
try testing.expectEqual(@as(u8, 242), v.direct_color_bg.r);
try testing.expectEqual(@as(u8, 93), v.direct_color_bg.g);
try testing.expectEqual(@as(u8, 147), v.direct_color_bg.b);
}
{
const v = p.next().?;
try testing.expect(v == .underline);
try testing.expectEqual(Attribute.Underline.single, v.underline);
}
}