Terminal (Android): fix termux detection

This commit is contained in:
李通洲
2023-09-03 20:49:46 +08:00
parent 9e839d3b8b
commit 3483673ef7
3 changed files with 10 additions and 4 deletions
@@ -55,7 +55,7 @@ exit:
void ffDetectTerminalFontPlatform(const FFTerminalShellResult* terminalShell, FFTerminalFontResult* terminalFont)
{
if(ffStrbufCompS(&terminalShell->terminalProcessName, "Termux") != 0)
if(ffStrbufCompS(&terminalShell->terminalProcessName, "com.termux") != 0)
{
ffStrbufSetS(&terminalFont->error, "Unsupported terminal");
return;
+1 -1
View File
@@ -310,7 +310,7 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
{
#ifdef __ANDROID__
if(ffStrbufEqualS(processName, "Termux"))
if(ffStrbufEqualS(processName, "com.termux"))
return getTerminalVersionTermux(version);
#endif
@@ -237,7 +237,7 @@ static void getTerminalFromEnv(FFTerminalShellResult* result)
getenv("TERMUX_VERSION") != NULL ||
getenv("TERMUX_MAIN_PACKAGE_FORMAT") != NULL ||
getenv("TMUX_TMPDIR") != NULL
)) term = "Termux";
)) term = "com.termux";
#endif
#ifdef __linux__
@@ -390,7 +390,13 @@ const FFTerminalShellResult* ffDetectTerminalShell()
if(ffStrbufEqualS(&result.terminalProcessName, "wezterm-gui"))
ffStrbufInitStatic(&result.terminalPrettyName, "WezTerm");
#if defined(__linux__) || defined(__FreeBSD__)
#if defined(__ANDROID__)
else if(ffStrbufEqualS(&result.terminalProcessName, "com.termux"))
ffStrbufInitStatic(&result.terminalPrettyName, "Termux");
#elif defined(__linux__) || defined(__FreeBSD__)
else if(ffStrbufStartsWithS(&result.terminalProcessName, "gnome-terminal-"))
ffStrbufInitStatic(&result.terminalPrettyName, "gnome-terminal");