Skip to content

support ptyxis as terminal search candidate #916

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
Murmele wants to merge 4 commits into
base: master
Choose a base branch
from
Open

support ptyxis as terminal search candidate #916

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
494e0c9
support ptyxis as terminal search candidate
Murmele Dec 19, 2025
77abe90
fix compilation
Murmele Dec 19, 2025
4e32d13
Update RepoView.cpp
Murmele Dec 19, 2025
0b84d83
cleanup
Murmele Dec 19, 2025
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
52 changes: 34 additions & 18 deletions src/ui/RepoView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2577,20 +2577,19 @@ ConfigDialog *RepoView::configureSettings(ConfigDialog::Index index) {
void RepoView::openTerminal() {
QString terminalCmd =
Settings::instance()->value(Setting::Id::TerminalCommand).toString();
static QString detectedCandidate;

QStringList candidates;
if (terminalCmd.isEmpty()) {
#if defined(Q_OS_WIN)
static QString detectedTerminal = nullptr;

#if defined(Q_OS_WIN)
if (detectedTerminal.isNull()) {
detectedTerminal = "";

QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString programFilesDir = env.value("PROGRAMFILES");
QString programFiles32Dir = env.value("PROGRAMFILES(x86)");

QStringList candidates;

candidates.append("git-bash");
if (!programFilesDir.isEmpty())
candidates.append(programFilesDir + "/Git/git-bash.exe");
Expand All @@ -2602,7 +2601,7 @@ void RepoView::openTerminal() {
candidates.append(programFiles32Dir + "/Git/bin/bash.exe");
candidates.append("cmd");

for (QString candidate : candidates) {
for (const auto& candidate : candidates) {
QString exePath;

if (QDir::isAbsolutePath(candidate)) {
Expand All @@ -2617,6 +2616,7 @@ void RepoView::openTerminal() {
detectedTerminal =
'"' + QDir::toNativeSeparators(exePath.replace("\"", "\"\"")) +
'"';
detectedCandidate = candidate;
break;
}
}
Expand All @@ -2625,21 +2625,22 @@ void RepoView::openTerminal() {
terminalCmd = detectedTerminal;

#elif defined(Q_OS_MACOS)
static QString detectedTerminal = nullptr;
static const char *candidates[] = {"com.googlecode.iterm2",
"com.apple.Terminal", nullptr};
candidates = {
"com.googlecode.iterm2", "com.apple.Terminal"
};

if (detectedTerminal.isNull()) {
detectedTerminal = "";

for (const char **candidate = candidates; *candidate; ++candidate) {
for (const auto& candidate : candidates) {
int res = QProcess::execute(
"osascript", {"-e", QString("tell application \"Finder\" to get "
"application file id \"%1\"")
.arg(*candidate)});
.arg(candidate)});

if (res == 0) {
detectedTerminal = QString("open -b %1").arg(*candidate) + " .";
detectedTerminal = QString("open -b %1").arg(candidate) + " .";
detectedCandidate = candidate;
break;
}
}
Expand All @@ -2648,16 +2649,16 @@ void RepoView::openTerminal() {
terminalCmd = detectedTerminal;

#elif defined(Q_OS_UNIX)
static QString detectedTerminal = nullptr;
static const QStringList candidates = {
candidates = {
"x-terminal-emulator", "xdg-terminal", "i3-sensible-terminal",
"gnome-terminal", "konsole", "xterm",
"gnome-terminal", "konsole", "xterm", "ptyxis"
};

// Caching the string
if (detectedTerminal.isNull()) {
detectedTerminal = "";

for (auto candidate : candidates) {
for (const auto& candidate : candidates) {
#if defined(FLATPAK)
// There is no graphical terminal in the flatpak environment. Use the
// host terminal
Expand All @@ -2671,6 +2672,7 @@ void RepoView::openTerminal() {
#else
QString exePath = QStandardPaths::findExecutable(candidate);
if (!exePath.isEmpty()) {
detectedCandidate = candidate;
detectedTerminal =
'"' + exePath.replace("\\", "\\\\").replace("\"", "\\\"") + '"';
break;
Expand All @@ -2688,6 +2690,14 @@ void RepoView::openTerminal() {
messagebox->setWindowTitle(tr("No terminal executable found"));
messagebox->setText(tr("No terminal executable was found. Please configure "
"a terminal in the configuration."));
QString candidatesString;
for (const auto& candidate: candidates) {
candidatesString.append(candidate);
candidatesString.append(", ");
}
candidatesString.chop(2);

messagebox->setDetailedText(QStringLiteral("The following terminal executables are searched, but any found: %1").arg(candidatesString));
messagebox->setStandardButtons(QMessageBox::Ok);
messagebox->addButton(tr("Open Configuration"), QMessageBox::ApplyRole);
messagebox->setAttribute(Qt::WA_DeleteOnClose);
Expand Down Expand Up @@ -2735,15 +2745,21 @@ void RepoView::openTerminal() {
QProcess child;
#if defined(FLATPAK)
child.setProgram("flatpak-spawn");
child.setArguments(QStringList() << "--host" << terminalCmd);
QStringList arguments = { "--host", terminalCmd };
#else
child.setProgram("sh");
child.setArguments(QStringList() << "-c" << terminalCmd);
QStringList arguments = { "-c", terminalCmd };
#endif

if (detectedCandidate == QStringLiteral("ptyxis")) {
arguments.append("--tab");
arguments.append(QStringLiteral("--working-directory='%1'").arg(mRepo.workdir().absolutePath()));
}
child.setArguments(arguments);
child.setWorkingDirectory(mRepo.workdir().absolutePath());
Debug("Execute Terminal: Arguments: " << child.arguments());
child.startDetached();
#endif
#endif // Q_OS_UNIX
}

void RepoView::openFileManager() {
Expand Down
Loading