Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: allow mixed semicolon/colon CSI m commands

Browse Source 
Fixes #487
This commit is contained in:
Mitchell Hashimoto
2023-09-18 21:45:19 -07:00
parent 02b76e5a9b
commit 063a66ea6c
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/terminal/Parser.zig
View File

@ -399,27 +399,20 @@ fn doAction(self: *Parser, action: TransitionAction, c: u8) ?Action {
.none, .semicolon => .semicolon,
.colon => .colon,
// This should never happen because of the checks below
// but we have to exhaustively handle the switch.
// There is nothing that treats mixed separators specially
// afaik so we just treat it as a semicolon.
.mixed => .semicolon,
},
},
};
// We only allow the colon separator for the 'm' command.
// We only allow colon or mixed separators for the 'm' command.
switch (self.params_sep) {
.none => {},
.semicolon => {},
.colon => if (c != 'm') {
.colon, .mixed => if (c != 'm') {
log.warn(
"CSI colon separator only allowed for 'm' command, got: {}",
.{result},
);
break :csi_dispatch null;
},
.mixed => {
log.warn(
"CSI command had mixed colons and semicolons, got: {}",
"CSI colon or mixed separators only allowed for 'm' command, got: {}",
.{result},
);
break :csi_dispatch null;
@ -585,6 +578,25 @@ test "csi: SGR colon followed by semicolon" {
}
}
test "csi: SGR mixed colon and semicolon" {
var p = init();
_ = p.next(0x1B);
for ("[38:5:1;48:5:0") |c| {
const a = p.next(c);
try testing.expect(a[0] == null);
try testing.expect(a[1] == null);
try testing.expect(a[2] == null);
}
{
const a = p.next('m');
try testing.expect(p.state == .ground);
try testing.expect(a[0] == null);
try testing.expect(a[1].? == .csi_dispatch);
try testing.expect(a[2] == null);
}
}
test "csi: SGR ESC [ 48 : 2 m" {
var p = init();
_ = p.next(0x1B);
@ -668,19 +680,6 @@ test "csi: SGR with many blank and colon" {
}
}
test "csi: mixing semicolon/colon" {
var p = init();
_ = p.next(0x1B);
for ("[38:2;4m") |c| {
const a = p.next(c);
try testing.expect(a[0] == null);
try testing.expect(a[1] == null);
try testing.expect(a[2] == null);
}
try testing.expect(p.state == .ground);
}
test "csi: colon for non-m final" {
var p = init();
_ = p.next(0x1B);