mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-02-19 07:36:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Create multi path term

Browse Source
This commit is contained in:
crschnick
2026-01-04 12:27:59 +00:00
parent 9abe037213
commit b8fa2ecaff
1 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
View File

@@ -1,12 +1,10 @@
package io.xpipe.app.terminal;
import io.xpipe.app.ext.PrefsChoiceValue;
import io.xpipe.app.issue.ErrorEventFactory;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.prefs.ExternalApplicationType;
import io.xpipe.app.process.CommandBuilder;
import io.xpipe.app.process.LocalShell;
import io.xpipe.app.process.ShellDialects;
import io.xpipe.app.process.TerminalInitFunction;
import io.xpipe.app.process.*;
import io.xpipe.app.update.AppDistributionType;
import io.xpipe.core.OsType;
@@ -344,37 +342,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
return CommandBuilder.of().add("-e").addFile(configuration.single().getScriptFile());
}
};
ExternalTerminalType UXTERM = new SimplePathType("app.uxterm", "uxterm", true) {
@Override
public TerminalOpenFormat getOpenFormat() {
return TerminalOpenFormat.NEW_WINDOW;
}
@Override
public String getWebsite() {
return "https://invisible-island.net/xterm/";
}
@Override
public boolean isRecommended() {
return false;
}
@Override
public boolean useColoredTitle() {
return true;
}
@Override
protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) {
return CommandBuilder.of()
.add("-title")
.addQuoted(configuration.getColoredTitle())
.add("-e")
.addFile(configuration.single().getScriptFile());
}
};
ExternalTerminalType XTERM = new SimplePathType("app.xterm", "xterm", true) {
ExternalTerminalType XTERM = new MultiPathType("app.xterm", true, List.of("uxterm", "xterm")) {
@Override
public TerminalOpenFormat getOpenFormat() {
return TerminalOpenFormat.NEW_WINDOW;
@@ -509,7 +477,6 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
GUAKE,
TILDA,
COSMIC_TERM,
UXTERM,
XTERM,
DEEPIN_TERMINAL,
FOOT,
@@ -673,4 +640,55 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration);
}
abstract class MultiPathType implements ExternalApplicationType.PathApplication, TrackableTerminalType {
@Getter
private final String id;
@Getter
private final List<String> executables;
private final boolean async;
private String executable;
public MultiPathType(String id, boolean async, List<String> executables) {
this.id = id;
this.executables = executables;
this.async = async;
}
@Override
public boolean detach() {
return async;
}
@Override
public void launch(TerminalLaunchConfiguration configuration) throws Exception {
var args = toCommand(configuration);
launch(args);
}
@Override
public String getExecutable() {
if (executable != null) {
return executable;
}
for (String executable : executables) {
try (ShellControl pc = LocalShell.getShell()) {
if (pc.view().findProgram(executable).isPresent()) {
return (this.executable = executable);
}
} catch (Exception e) {
ErrorEventFactory.fromThrowable(e).omit().handle();
}
}
return (executable = executables.getFirst());
}
protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration);
}
}