Big refactoring of the jline key binding support to be closer to read…

…line() Unicode is also now fully supported
jline · Apr 11, 2011 · f728bf8 · f728bf8
1 parent 7a4d274
commit f728bf8
Show file tree

Hide file tree

Showing 23 changed files with 1,816 additions and 1,207 deletions.
diff --git a/src/main/java/jline/Terminal.java b/src/main/java/jline/Terminal.java
@@ -39,6 +39,8 @@ public interface Terminal
      */
     OutputStream wrapOutIfNeeded(OutputStream out);
 
+    InputStream wrapInIfNeeded(InputStream in) throws IOException;
+
     /**
      * For terminals that don't wrap when character is written in last column,
      * only when the next character is written.
@@ -51,9 +53,4 @@ public interface Terminal
 
     void setEchoEnabled(boolean enabled);
 
-    int readCharacter(InputStream in) throws IOException;
-
-    int readVirtualKey(InputStream in) throws IOException;
-
-    InputStream getDefaultBindings();
 }
diff --git a/src/main/java/jline/TerminalFactory.java b/src/main/java/jline/TerminalFactory.java
@@ -7,13 +7,13 @@
 
 package jline;
 
-import jline.internal.Configuration;
-import jline.internal.Log;
-
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
 
+import jline.internal.Configuration;
+import jline.internal.Log;
+
 /**
  * Creates terminal instances.
  *
@@ -46,10 +46,7 @@ public static synchronized Terminal create() {
             Log.trace(new Throwable("CREATE MARKER"));
         }
 
-        String type = Configuration.getString(JLINE_TERMINAL);
-        if (type == null) {
-            type = AUTO;
-        }
+        String type = Configuration.getString(JLINE_TERMINAL, AUTO);
 
         Log.debug("Creating terminal; type=", type);
 

diff --git a/src/main/java/jline/TerminalSupport.java b/src/main/java/jline/TerminalSupport.java
@@ -7,13 +7,13 @@
 
 package jline;
 
-import jline.internal.Log;
-import jline.internal.Configuration;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import jline.internal.Configuration;
+import jline.internal.Log;
+
 /**
  * Provides support for {@link Terminal} instances.
  *
@@ -23,8 +23,6 @@
 public abstract class TerminalSupport
     implements Terminal
 {
-    public static String DEFAULT_KEYBINDINGS_PROPERTIES = "keybindings.properties";
-
     public static final String JLINE_SHUTDOWNHOOK = "jline.shutdownhook";
 
     public static final int DEFAULT_WIDTH = 80;
@@ -41,6 +39,8 @@ public abstract class TerminalSupport
 
     private boolean ansiSupported;
 
+    private Configuration configuration;
+
     protected TerminalSupport(final boolean supported) {
         this.supported = supported;
         this.shutdownHookEnabled = Configuration.getBoolean(JLINE_SHUTDOWNHOOK, false);
@@ -148,16 +148,8 @@ public synchronized void setEchoEnabled(final boolean enabled) {
         Log.debug("Echo enabled: ", enabled);
     }
 
-    public int readCharacter(final InputStream in) throws IOException {
-        return in.read();
-    }
-
-    public int readVirtualKey(final InputStream in) throws IOException {
-        return readCharacter(in);
-    }
-
-    public InputStream getDefaultBindings() {
-        return TerminalSupport.class.getResourceAsStream(DEFAULT_KEYBINDINGS_PROPERTIES);
+    public InputStream wrapInIfNeeded(InputStream in) throws IOException {
+        return in;
     }
 
     //

diff --git a/src/main/java/jline/UnixTerminal.java b/src/main/java/jline/UnixTerminal.java
@@ -7,21 +7,9 @@
 
 package jline;
 
-import jline.console.Key;
-import jline.internal.Configuration;
 import jline.internal.Log;
-import jline.internal.ReplayPrefixOneCharInputStream;
 import jline.internal.TerminalLineSettings;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import static jline.UnixTerminal.UnixKey.*;
-import static jline.console.Key.*;
-
 /**
  * Terminal that is used for unix platforms. Terminal initialization
  * is handled by issuing the <em>stty</em> command against the
@@ -41,15 +29,8 @@ public class UnixTerminal
 {
     private final TerminalLineSettings settings = new TerminalLineSettings();
 
-    private final ReplayPrefixOneCharInputStream replayStream;
-
-    private final InputStreamReader replayReader;
-
     public UnixTerminal() throws Exception {
         super(true);
-
-        this.replayStream = new ReplayPrefixOneCharInputStream(Configuration.getInputEncoding());
-        this.replayReader = new InputStreamReader(replayStream, replayStream.getEncoding());
     }
 
     protected TerminalLineSettings getSettings() {
@@ -120,113 +101,4 @@ public synchronized void setEchoEnabled(final boolean enabled) {
         }
     }
 
-    @Override
-    public int readVirtualKey(final InputStream in) throws IOException {
-        int c = readCharacter(in);
-
-        if (Key.valueOf(c) == DELETE && settings.getProperty("erase") == DELETE.code) {
-            c = BACKSPACE.code;
-        }
-
-        UnixKey key = UnixKey.valueOf(c);
-
-        // in Unix terminals, arrow keys are represented by a sequence of 3 characters. E.g., the up arrow key yields 27, 91, 68
-        if (key == ARROW_START) {
-            // also the escape key is 27 thats why we read until we have something different than 27
-            // this is a bugfix, because otherwise pressing escape and than an arrow key was an undefined state
-            while (key == ARROW_START) {
-                c = readCharacter(in);
-                key = UnixKey.valueOf(c);
-            }
-
-            if (key == ARROW_PREFIX || key == O_PREFIX) {
-                c = readCharacter(in);
-                key = UnixKey.valueOf(c);
-
-                if (key == ARROW_UP) {
-                    return CTRL_P.code;
-                }
-                else if (key == ARROW_DOWN) {
-                    return CTRL_N.code;
-                }
-                else if (key == ARROW_LEFT) {
-                    return CTRL_B.code;
-                }
-                else if (key == ARROW_RIGHT) {
-                    return CTRL_F.code;
-                }
-                else if (key == HOME_CODE) {
-                    return CTRL_A.code;
-                }
-                else if (key == END_CODE) {
-                    return CTRL_E.code;
-                }
-                else if (key == DEL_THIRD) {
-                    readCharacter(in); // read 4th & ignore
-                    return DELETE.code;
-                }
-            }
-        }
-
-        // handle unicode characters, thanks for a patch from amyi@inf.ed.ac.uk
-        if (c > 128) {
-            // handle unicode characters longer than 2 bytes,
-            // thanks to Marc.Herbert@continuent.com
-            replayStream.setInput(c, in);
-            // replayReader = new InputStreamReader(replayStream, encoding);
-            c = replayReader.read();
-        }
-
-        return c;
-    }
-
-    /**
-     * Unix keys.
-     */
-    public static enum UnixKey
-    {
-        ARROW_START(27),
-
-        ARROW_PREFIX(91),
-
-        ARROW_LEFT(68),
-
-        ARROW_RIGHT(67),
-
-        ARROW_UP(65),
-
-        ARROW_DOWN(66),
-
-        O_PREFIX(79),
-
-        HOME_CODE(72),
-
-        END_CODE(70),
-
-        DEL_THIRD(51),
-
-        DEL_SECOND(126),;
-
-        public final short code;
-
-        UnixKey(final int code) {
-            this.code = (short) code;
-        }
-
-        private static final Map<Short, UnixKey> codes;
-
-        static {
-            Map<Short, UnixKey> map = new HashMap<Short, UnixKey>();
-
-            for (UnixKey key : UnixKey.values()) {
-                map.put(key.code, key);
-            }
-
-            codes = map;
-        }
-
-        public static UnixKey valueOf(final int code) {
-            return codes.get((short) code);
-        }
-    }
 }