1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107310 from timothyqiu/terminal-args

Browse Source 
Fix not being able to open directory in certain terminals
This commit is contained in:
Rémi Verschelde 2025-06-10 17:56:22 +02:00
commit 199d41b967
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/filesystem_dock.cpp
View File

@ -2271,6 +2271,8 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
#endif
List<String> terminal_emulator_args; // Required for `execute()`, as it doesn't accept `Vector<String>`.
bool append_default_args = true;
#ifdef LINUXBSD_ENABLED
// Prepend default arguments based on the terminal emulator name.
// Use `String.ends_with()` so that installations in non-default paths
@ -2284,12 +2286,21 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
terminal_emulator_args.push_back("-cd");
} else if (chosen_terminal_emulator.ends_with("xfce4-terminal")) {
terminal_emulator_args.push_back("--working-directory");
} else if (chosen_terminal_emulator.ends_with("lxterminal")) {
terminal_emulator_args.push_back("--working-directory={directory}");
append_default_args = false;
} else if (chosen_terminal_emulator.ends_with("kitty")) {
terminal_emulator_args.push_back("--directory");
} else if (chosen_terminal_emulator.ends_with("alacritty")) {
terminal_emulator_args.push_back("--working-directory");
} else if (chosen_terminal_emulator.ends_with("xterm")) {
terminal_emulator_args.push_back("-e");
terminal_emulator_args.push_back("cd '{directory}' && exec $SHELL");
append_default_args = false;
}
}
#endif
bool append_default_args = true;
#ifdef WINDOWS_ENABLED
// Prepend default arguments based on the terminal emulator name.
// Use `String.get_basename().to_lower()` to handle Windows' case-insensitive paths