Fix console output code page and add a BufferedWriter, #133

terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java

@@ -40,10 +40,16 @@ public JansiWinSysTerminal(String name, boolean nativeSignals, SignalHandler sig
               name, nativeSignals, signalHandler);
     }
 
+    @Override
     protected int getConsoleOutputCP() {
         return Kernel32.GetConsoleOutputCP();
     }
 
+    @Override
+    protected void setConsoleOutputCP(int cp) {
+        Kernel32.SetConsoleOutputCP(cp);
+    }
+
     @Override
     protected int getConsoleMode() {
         return WindowsSupport.getConsoleMode();

terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java

@@ -38,10 +38,16 @@ public JnaWinSysTerminal(String name, boolean nativeSignals, SignalHandler signa
         strings.put(InfoCmp.Capability.key_mouse, "\\E[M");
     }
 
+    @Override
     protected int getConsoleOutputCP() {
         return Kernel32.INSTANCE.GetConsoleOutputCP();
     }
 
+    @Override
+    protected void setConsoleOutputCP(int cp) {
+        Kernel32.INSTANCE.SetConsoleCP(cp);
+    }
+
     @Override
     protected int getConsoleMode() {
         IntByReference mode = new IntByReference();

terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java

@@ -17,6 +17,7 @@
 import org.jline.utils.ShutdownHooks;
 import org.jline.utils.Signals;
 
+import java.io.BufferedWriter;
 import java.io.FilterInputStream;
 import java.io.InputStream;
 import java.io.IOError;
@@ -35,7 +36,8 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
 
     private static final int PIPE_SIZE = 1024;
 
-    private static final Charset INPUT_CHARSET = Charset.forName("UTF-8");
+    private static final Charset CHARSET = Charset.forName("UTF-8");
+    private static final int CODE_PAGE = 65001;
 
     protected static final int ENABLE_PROCESSED_INPUT = 0x0001;
     protected static final int ENABLE_LINE_INPUT      = 0x0002;
@@ -54,6 +56,7 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     protected final ShutdownHooks.Task closer;
     protected final Attributes attributes = new Attributes();
     protected final Thread pump;
+    protected final int consoleOutputCP;
 
     protected MouseTracking tracking = MouseTracking.Off;
     private volatile boolean closing;
@@ -64,12 +67,10 @@ public AbstractWindowsTerminal(OutputStream output, String name, boolean nativeS
         this.slaveInputPipe = new PipedOutputStream(input);
         this.input = new FilterInputStream(input) {};
         this.output = output;
-        String encoding = getConsoleEncoding();
-        if (encoding == null) {
-            encoding = Charset.defaultCharset().name();
-        }
-        this.reader = new NonBlockingReader(getName(), new org.jline.utils.InputStreamReader(input, INPUT_CHARSET));
-        this.writer = new PrintWriter(new OutputStreamWriter(output, encoding));
+        this.consoleOutputCP = getConsoleOutputCP();
+        setConsoleOutputCP(CODE_PAGE);
+        this.reader = new NonBlockingReader(getName(), new org.jline.utils.InputStreamReader(input, CHARSET));
+        this.writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(output, CHARSET)));
         parseInfoCmp();
         // Attributes
         attributes.setLocalFlag(Attributes.LocalFlag.ISIG, true);
@@ -106,22 +107,6 @@ public SignalHandler handle(Signal signal, SignalHandler handler) {
         return prev;
     }
 
-    protected String getConsoleEncoding() {
-        int codepage = getConsoleOutputCP();
-        //http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html
-        String charsetMS = "ms" + codepage;
-        if (java.nio.charset.Charset.isSupported(charsetMS)) {
-            return charsetMS;
-        }
-        String charsetCP = "cp" + codepage;
-        if (java.nio.charset.Charset.isSupported(charsetCP)) {
-            return charsetCP;
-        }
-        return null;
-    }
-
-    protected abstract int getConsoleOutputCP();
-
     public NonBlockingReader reader() {
         return reader;
     }
@@ -174,10 +159,6 @@ protected int ctrl(char key) {
         return (Character.toUpperCase(key) & 0x1f);
     }
 
-    protected abstract int getConsoleMode();
-
-    protected abstract void setConsoleMode(int mode);
-
     public void setSize(Size size) {
         throw new UnsupportedOperationException("Can not resize windows terminal");
     }
@@ -191,10 +172,9 @@ public void close() throws IOException {
         }
         reader.close();
         writer.close();
+        setConsoleOutputCP(consoleOutputCP);
     }
 
-    protected abstract String readConsoleInput() throws IOException;
-
     protected String getEscapeSequence(short keyCode) {
         // virtual keycodes: http://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
         // TODO: numpad keys, modifiers
@@ -293,7 +273,7 @@ protected void pump() {
         try {
             while (!closing) {
                 String buf = readConsoleInput();
-                for (byte b : buf.getBytes(INPUT_CHARSET)) {
+                for (byte b : buf.getBytes(CHARSET)) {
                     processInputByte(b);
                 }
             }
@@ -344,5 +324,15 @@ public boolean trackMouse(MouseTracking tracking) {
         return true;
     }
 
+    protected abstract int getConsoleOutputCP();
+
+    protected abstract void setConsoleOutputCP(int cp);
+
+    protected abstract int getConsoleMode();
+
+    protected abstract void setConsoleMode(int mode);
+
+    protected abstract String readConsoleInput() throws IOException;
+
 }