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

terminal: parse underline color sequences (but do not handle yet)

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-06-20 09:34:29 -07:00
parent 28a22fc07f
commit b9bc61c0a4
3 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/terminal/Terminal.zig
View File

@ -461,6 +461,9 @@ pub fn setAttribute(self: *Terminal, attr: sgr.Attribute) !void {
self.screen.cursor.pen.attrs.underline = .none;
},
// TODO
.underline_color, .reset_underline_color => {},
.blink => {
log.warn("blink requested, but not implemented", .{});
self.screen.cursor.pen.attrs.blink = true;

56
src/terminal/sgr.zig
View File

@ -33,6 +33,8 @@ pub const Attribute = union(enum) {
/// Underline the text
underline: Underline,
reset_underline: void,
underline_color: RGB,
reset_underline_color: void,
/// Blink the text
blink: void,
@ -210,8 +212,12 @@ pub const Parser = struct {
48 => if (slice.len >= 5 and slice[1] == 2) {
self.idx += 4;
// In the 6-len form, ignore the 3rd param.
const rgb = slice[2..5];
// In the 6-len form, ignore the 3rd param. Otherwise, use it.
const rgb = if (slice.len == 5) slice[2..5] else rgb: {
// Consume one more element
self.idx += 1;
break :rgb slice[3..6];
};
// We use @truncate because the value should be 0 to 255. If
// it isn't, the behavior is undefined so we just... truncate it.
@ -231,6 +237,29 @@ pub const Parser = struct {
49 => return Attribute{ .reset_bg = {} },
58 => if (slice.len >= 5 and slice[1] == 2) {
self.idx += 4;
// In the 6-len form, ignore the 3rd param. Otherwise, use it.
const rgb = if (slice.len == 5) slice[2..5] else rgb: {
// Consume one more element
self.idx += 1;
break :rgb slice[3..6];
};
// We use @truncate because the value should be 0 to 255. If
// it isn't, the behavior is undefined so we just... truncate it.
return Attribute{
.underline_color = .{
.r = @truncate(u8, rgb[0]),
.g = @truncate(u8, rgb[1]),
.b = @truncate(u8, rgb[2]),
},
};
},
59 => return Attribute{ .reset_underline_color = {} },
90...97 => return Attribute{
// 82 instead of 90 to offset to "bright" colors
.@"8_bright_fg" = @intToEnum(color.Name, slice[0] - 82),
@ -437,3 +466,26 @@ test "sgr: 256 color" {
try testing.expect(p.next().? == .@"256_fg");
try testing.expect(p.next().? == .@"256_bg");
}
test "sgr: underline color" {
{
const v = testParseColon(&[_]u16{ 58, 2, 1, 2, 3 });
try testing.expect(v == .underline_color);
try testing.expectEqual(@as(u8, 1), v.underline_color.r);
try testing.expectEqual(@as(u8, 2), v.underline_color.g);
try testing.expectEqual(@as(u8, 3), v.underline_color.b);
}
{
const v = testParseColon(&[_]u16{ 58, 2, 0, 1, 2, 3 });
try testing.expect(v == .underline_color);
try testing.expectEqual(@as(u8, 1), v.underline_color.r);
try testing.expectEqual(@as(u8, 2), v.underline_color.g);
try testing.expectEqual(@as(u8, 3), v.underline_color.b);
}
}
test "sgr: reset underline color" {
var p: Parser = .{ .params = &[_]u16{59} };
try testing.expect(p.next().? == .reset_underline_color);
}

2
src/terminal/stream.zig
View File

@ -386,7 +386,7 @@ pub fn Stream(comptime Handler: type) type {
'm' => if (@hasDecl(T, "setAttribute")) {
var p: sgr.Parser = .{ .params = action.params, .colon = action.sep == .colon };
while (p.next()) |attr| {
//log.info("SGR attribute: {}", .{attr});
log.info("SGR attribute: {}", .{attr});
try self.handler.setAttribute(attr);
}
} else log.warn("unimplemented CSI callback: {}", .{action}),