ExternalTerminal should accept attributes (eg ECHO false) in construc…

…tor, and set them before starting pump thread, fixes #433
jline · Jan 6, 2020 · 37ef992 · 37ef992
1 parent 2327d64
commit 37ef992
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -422,14 +422,7 @@ private Terminal doBuild() throws IOException {
                     Log.debug("Error creating JANSI based terminal: ", t.getMessage(), t);
                 }
             }
-            Terminal terminal = new ExternalTerminal(name, type, in, out, encoding, signalHandler, paused);
-            if (attributes != null) {
-                terminal.setAttributes(attributes);
-            }
-            if (size != null) {
-                terminal.setSize(size);
-            }
-            return terminal;
+            return new ExternalTerminal(name, type, in, out, encoding, signalHandler, paused, attributes, size);
         }
     }
 

diff --git a/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java
@@ -8,7 +8,9 @@
  */
 package org.jline.terminal.impl;
 
+import org.jline.terminal.Attributes;
 import org.jline.terminal.Cursor;
+import org.jline.terminal.Size;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,8 +59,25 @@ public ExternalTerminal(String name, String type,
                             Charset encoding,
                             SignalHandler signalHandler,
                             boolean paused) throws IOException {
+        this(name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
+    }
+
+    public ExternalTerminal(String name, String type,
+                            InputStream masterInput,
+                            OutputStream masterOutput,
+                            Charset encoding,
+                            SignalHandler signalHandler,
+                            boolean paused,
+                            Attributes attributes,
+                            Size size) throws IOException {
         super(name, type, masterOutput, encoding, signalHandler);
         this.masterInput = masterInput;
+        if (attributes != null) {
+            setAttributes(attributes);
+        }
+        if (size != null) {
+            setSize(size);
+        }
         if (!paused) {
             resume();
         }