From 73280b94740e84887e0ff115f8a70fbadb5c8870 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 23 Oct 2023 13:31:53 +0200 Subject: [PATCH 1/2] Force creation of a dumb terminal if TERM starts with dumb --- .../main/java/org/jline/terminal/TerminalBuilder.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java index 484809b93..fb1426937 100644 --- a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java +++ b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java @@ -29,6 +29,7 @@ import org.jline.terminal.impl.AbstractPosixTerminal; import org.jline.terminal.impl.AbstractTerminal; +import org.jline.terminal.impl.DumbTerminal; import org.jline.terminal.impl.DumbTerminalProvider; import org.jline.terminal.spi.SystemStream; import org.jline.terminal.spi.TerminalProvider; @@ -367,6 +368,8 @@ private Terminal doBuild() throws IOException { Charset encoding = computeEncoding(); String type = computeType(); + boolean forceDumb = + (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR)); Boolean dumb = this.dumb; if (dumb == null) { dumb = getBoolean(PROP_DUMB, null); @@ -389,7 +392,7 @@ private Terminal doBuild() throws IOException { stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream)))); SystemStream systemStream = select(system, systemOutput); - if (system.get(SystemStream.Input) && systemStream != null) { + if (!forceDumb && system.get(SystemStream.Input) && systemStream != null) { if (attributes != null || size != null) { Log.warn("Attributes and size fields are ignored when creating a system terminal"); } @@ -437,8 +440,8 @@ private Terminal doBuild() throws IOException { terminal = null; } } - if (terminal == null && (dumb == null || dumb)) { - if (dumb == null) { + if (terminal == null && (forceDumb || dumb == null || dumb)) { + if (!forceDumb && dumb == null) { if (Log.isDebugEnabled()) { Log.warn("input is tty: {}", system.get(SystemStream.Input)); Log.warn("output is tty: {}", system.get(SystemStream.Output)); From 1ab60ead5f777844f8b509baf7dd068ac4c7ee19 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 23 Oct 2023 14:20:11 +0200 Subject: [PATCH 2/2] Add a property to force a given provider --- .../org/jline/terminal/TerminalBuilder.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java index fb1426937..ec0f98761 100644 --- a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java +++ b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java @@ -48,6 +48,7 @@ public final class TerminalBuilder { public static final String PROP_ENCODING = "org.jline.terminal.encoding"; public static final String PROP_CODEPAGE = "org.jline.terminal.codepage"; public static final String PROP_TYPE = "org.jline.terminal.type"; + public static final String PROP_PROVIDER = "org.jline.terminal.provider"; public static final String PROP_PROVIDERS = "org.jline.terminal.providers"; public static final String PROP_PROVIDER_FFM = "ffm"; public static final String PROP_PROVIDER_JNI = "jni"; @@ -368,14 +369,17 @@ private Terminal doBuild() throws IOException { Charset encoding = computeEncoding(); String type = computeType(); + String forcedProvider = System.getProperty(PROP_PROVIDER, null); + boolean forceDumb = - (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR)); + (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR)) + || (forcedProvider != null && forcedProvider.equals(PROP_PROVIDER_DUMB)); Boolean dumb = this.dumb; if (dumb == null) { dumb = getBoolean(PROP_DUMB, null); } IllegalStateException exception = new IllegalStateException("Unable to create a terminal"); - List providers = getProviders(exception); + List providers = getProviders(forcedProvider, exception); Terminal terminal = null; if ((system != null && system) || (system == null && in == null && out == null)) { if (system != null @@ -596,18 +600,18 @@ public Charset computeEncoding() { return encoding; } - public List getProviders(IllegalStateException exception) { + public List getProviders(String forcedProvider, IllegalStateException exception) { List providers = new ArrayList<>(); // Check ffm provider - checkProvider(exception, providers, ffm, PROP_FFM, PROP_PROVIDER_FFM); + checkProvider(forcedProvider, exception, providers, ffm, PROP_FFM, PROP_PROVIDER_FFM); // Check jni provider - checkProvider(exception, providers, jni, PROP_JNI, PROP_PROVIDER_JNI); + checkProvider(forcedProvider, exception, providers, jni, PROP_JNI, PROP_PROVIDER_JNI); // Check jansi provider - checkProvider(exception, providers, jansi, PROP_JANSI, PROP_PROVIDER_JANSI); + checkProvider(forcedProvider, exception, providers, jansi, PROP_JANSI, PROP_PROVIDER_JANSI); // Check jna provider - checkProvider(exception, providers, jna, PROP_JNA, PROP_PROVIDER_JNA); + checkProvider(forcedProvider, exception, providers, jna, PROP_JNA, PROP_PROVIDER_JNA); // Check exec provider - checkProvider(exception, providers, exec, PROP_EXEC, PROP_PROVIDER_EXEC); + checkProvider(forcedProvider, exception, providers, exec, PROP_EXEC, PROP_PROVIDER_EXEC); // Order providers List order = Arrays.asList( (this.providers != null ? this.providers : System.getProperty(PROP_PROVIDERS, PROP_PROVIDERS_DEFAULT)) @@ -622,12 +626,13 @@ public List getProviders(IllegalStateException exception) { } private void checkProvider( + String forcedProvider, IllegalStateException exception, List providers, Boolean load, String property, String name) { - Boolean doLoad = load; + Boolean doLoad = forcedProvider != null ? (Boolean) name.equals(forcedProvider) : load; if (doLoad == null) { doLoad = getBoolean(property, true); }