Skip to content

TerminalFont: add bitty support #2660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xuepoo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

TerminalFont: add bitty support #2660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 74 additions & 22 deletions src/detection/terminalfont/terminalfont.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static void detectGhostty(FFTerminalFontResult* terminalFont, [[maybe_unused]] c
}
}

[[maybe_unused]] static bool detectKitty(const FFstrbuf* exe, FFTerminalFontResult* result) {
[[maybe_unused]] static bool queryKittyFont(FFTerminalFontResult* result) {
FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate();

Expand All @@ -262,30 +262,43 @@ static void detectGhostty(FFTerminalFontResult* terminalFont, [[maybe_unused]] c
ffStrbufAppendC(&fontSize, (char) value);
}
}
ffFontInitValues(&result->font, fontName.chars, fontSize.chars);
return true;
}

return false;
}

[[maybe_unused]] static bool detectKitty(const FFstrbuf* exe, FFTerminalFontResult* result) {
if (queryKittyFont(result)) {
return true;
}

FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate();

FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
if (!ffProcessAppendStdOut(&buf, (char* const[]){
exe->chars,
"+kitten",
"query-terminal",
nullptr,
})) {
ffParsePropLines(buf.chars, "font_family: ", &fontName);
ffParsePropLines(buf.chars, "font_size: ", &fontSize);
} else {
FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
if (!ffProcessAppendStdOut(&buf, (char* const[]){
exe->chars,
"+kitten",
"query-terminal",
nullptr,
})) {
ffParsePropLines(buf.chars, "font_family: ", &fontName);
ffParsePropLines(buf.chars, "font_size: ", &fontSize);
} else {
FFpropquery fontQuery[] = {
{ "font_family ", &fontName },
{ "font_size ", &fontSize },
};
FFpropquery fontQuery[] = {
{ "font_family ", &fontName },
{ "font_size ", &fontSize },
};

ffParsePropFileConfigValues("kitty/kitty.conf", 2, fontQuery);
ffParsePropFileConfigValues("kitty/kitty.conf", 2, fontQuery);

if (fontName.length == 0) {
ffStrbufSetS(&fontName, "monospace");
}
if (fontSize.length == 0) {
ffStrbufSetS(&fontSize, "11.0");
}
if (fontName.length == 0) {
ffStrbufSetS(&fontName, "monospace");
}
if (fontSize.length == 0) {
ffStrbufSetS(&fontSize, "11.0");
}
}

Expand All @@ -294,6 +307,43 @@ static void detectGhostty(FFTerminalFontResult* terminalFont, [[maybe_unused]] c
return true;
}

[[maybe_unused]] static bool detectBitty(const FFstrbuf* exe, FFTerminalFontResult* result) {
#ifndef _WIN32
// Bitty answers the kitty font query directly on the PTY. Keep the
// command-line probe as a fallback for multiplexers/PTY wrappers that
// swallow the DCS response.
if (queryKittyFont(result)) {
return true;
}
#endif

FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
if (ffProcessAppendStdOut(&buf, (char* const[]){
exe->chars,
"+show-font",
nullptr,
})) {
ffStrbufAppendS(&result->error, "`bitty +show-font` failed");
return false;
}

FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate();
ffParsePropLines(buf.chars, "font_family: ", &fontName);
ffParsePropLines(buf.chars, "font_size: ", &fontSize);

if (fontName.length == 0) {
ffStrbufAppendS(&result->error, "`bitty +show-font` reported no font family");
return false;
}
if (fontSize.length == 0) {
ffStrbufSetS(&fontSize, "12");
}

ffFontInitValues(&result->font, fontName.chars, fontSize.chars);
return true;
}

static bool detectWezterm(const FFstrbuf* exe, FFTerminalFontResult* result) {
FF_STRBUF_AUTO_DESTROY cli = ffStrbufCreateCopy(exe);
ffStrbufSubstrBeforeLastC(&cli, '-');
Expand Down Expand Up @@ -414,6 +464,8 @@ static bool detectTerminalFontCommon(const FFTerminalResult* terminal, FFTermina
detectGhostty(terminalFont, "Muxy/ghostty.conf", "muxy/ghostty.conf");
} else if (ffStrbufStartsWithIgnCaseS(&terminal->processName, "rio")) {
detectRio(terminalFont);
} else if (ffStrbufIgnCaseEqualS(&terminal->processName, "bitty")) {
detectBitty(&terminal->exe, terminalFont);
}
#ifndef _WIN32
else if (ffStrbufStartsWithIgnCaseS(&terminal->exe, "/dev/pts/")) {
Expand Down