PMD code sweep, #6 don't add MyWindow twice to MyApplication
[fanfix.git] / src / jexer / tterminal / ECMA48.java
index caa295ad47776ce242557359407ab18b2d7dacf5..7a37a95fdd765cae7e7eb389cc5446fd603ff5d1 100644 (file)
@@ -90,6 +90,10 @@ import static jexer.TKeypress.*;
  */
 public class ECMA48 implements Runnable {
 
+    // ------------------------------------------------------------------------
+    // Constants --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * The emulator can emulate several kinds of terminals.
      */
@@ -116,194 +120,115 @@ public class ECMA48 implements Runnable {
     }
 
     /**
-     * Return the proper primary Device Attributes string.
-     *
-     * @return string to send to remote side that is appropriate for the
-     * this.type
+     * Parser character scan states.
      */
-    private String deviceTypeResponse() {
-        switch (type) {
-        case VT100:
-            // "I am a VT100 with advanced video option" (often VT102)
-            return "\033[?1;2c";
-
-        case VT102:
-            // "I am a VT102"
-            return "\033[?6c";
-
-        case VT220:
-        case XTERM:
-            // "I am a VT220" - 7 bit version
-            if (!s8c1t) {
-                return "\033[?62;1;6c";
-            }
-            // "I am a VT220" - 8 bit version
-            return "\u009b?62;1;6c";
-        default:
-            throw new IllegalArgumentException("Invalid device type: " + type);
-        }
+    private enum ScanState {
+        GROUND,
+        ESCAPE,
+        ESCAPE_INTERMEDIATE,
+        CSI_ENTRY,
+        CSI_PARAM,
+        CSI_INTERMEDIATE,
+        CSI_IGNORE,
+        DCS_ENTRY,
+        DCS_INTERMEDIATE,
+        DCS_PARAM,
+        DCS_PASSTHROUGH,
+        DCS_IGNORE,
+        SOSPMAPC_STRING,
+        OSC_STRING,
+        VT52_DIRECT_CURSOR_ADDRESS
     }
 
     /**
-     * Return the proper TERM environment variable for this device type.
-     *
-     * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
-     * @return "vt100", "xterm", etc.
+     * The selected number pad mode (DECKPAM, DECKPNM).  We record this, but
+     * can't really use it in keypress() because we do not see number pad
+     * events from TKeypress.
      */
-    public static String deviceTypeTerm(final DeviceType deviceType) {
-        switch (deviceType) {
-        case VT100:
-            return "vt100";
-
-        case VT102:
-            return "vt102";
-
-        case VT220:
-            return "vt220";
-
-        case XTERM:
-            return "xterm";
-
-        default:
-            throw new IllegalArgumentException("Invalid device type: "
-                + deviceType);
-        }
+    private enum KeypadMode {
+        Application,
+        Numeric
     }
 
     /**
-     * Return the proper LANG for this device type.  Only XTERM devices know
-     * about UTF-8, the others are defined by their standard to be either
-     * 7-bit or 8-bit characters only.
-     *
-     * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
-     * @param baseLang a base language without UTF-8 flag such as "C" or
-     * "en_US"
-     * @return "en_US", "en_US.UTF-8", etc.
+     * Arrow keys can emit three different sequences (DECCKM or VT52
+     * submode).
      */
-    public static String deviceTypeLang(final DeviceType deviceType,
-        final String baseLang) {
-
-        switch (deviceType) {
-
-        case VT100:
-        case VT102:
-        case VT220:
-            return baseLang;
-
-        case XTERM:
-            return baseLang + ".UTF-8";
-
-        default:
-            throw new IllegalArgumentException("Invalid device type: "
-                + deviceType);
-        }
+    private enum ArrowKeyMode {
+        VT52,
+        ANSI,
+        VT100
     }
 
     /**
-     * Write a string directly to the remote side.
-     *
-     * @param str string to send
+     * Available character sets for GL, GR, G0, G1, G2, G3.
      */
-    public void writeRemote(final String str) {
-        if (stopReaderThread) {
-            // Reader hit EOF, bail out now.
-            close();
-            return;
-        }
-
-        // System.err.printf("writeRemote() '%s'\n", str);
+    private enum CharacterSet {
+        US,
+        UK,
+        DRAWING,
+        ROM,
+        ROM_SPECIAL,
+        VT52_GRAPHICS,
+        DEC_SUPPLEMENTAL,
+        NRC_DUTCH,
+        NRC_FINNISH,
+        NRC_FRENCH,
+        NRC_FRENCH_CA,
+        NRC_GERMAN,
+        NRC_ITALIAN,
+        NRC_NORWEGIAN,
+        NRC_SPANISH,
+        NRC_SWEDISH,
+        NRC_SWISS
+    }
 
-        switch (type) {
-        case VT100:
-        case VT102:
-        case VT220:
-            if (outputStream == null) {
-                return;
-            }
-            try {
-                outputStream.flush();
-                for (int i = 0; i < str.length(); i++) {
-                    outputStream.write(str.charAt(i));
-                }
-                outputStream.flush();
-            } catch (IOException e) {
-                // Assume EOF
-                close();
-            }
-            break;
-        case XTERM:
-            if (output == null) {
-                return;
-            }
-            try {
-                output.flush();
-                output.write(str);
-                output.flush();
-            } catch (IOException e) {
-                // Assume EOF
-                close();
-            }
-            break;
-        default:
-            throw new IllegalArgumentException("Invalid device type: " + type);
-        }
+    /**
+     * Single-shift states used by the C1 control characters SS2 (0x8E) and
+     * SS3 (0x8F).
+     */
+    private enum Singleshift {
+        NONE,
+        SS2,
+        SS3
     }
 
     /**
-     * Close the input and output streams and stop the reader thread.  Note
-     * that it is safe to call this multiple times.
+     * VT220+ lockshift states.
      */
-    public final void close() {
+    private enum LockshiftMode {
+        NONE,
+        G1_GR,
+        G2_GR,
+        G2_GL,
+        G3_GR,
+        G3_GL
+    }
 
-        // Tell the reader thread to stop looking at input.  It will close
-        // the input streams.
-        if (stopReaderThread == false) {
-            stopReaderThread = true;
-            try {
-                readerThread.join(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+    /**
+     * XTERM mouse reporting protocols.
+     */
+    private enum MouseProtocol {
+        OFF,
+        X10,
+        NORMAL,
+        BUTTONEVENT,
+        ANYEVENT
+    }
 
-        // Now close the output stream.
-        switch (type) {
-        case VT100:
-        case VT102:
-        case VT220:
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                } catch (IOException e) {
-                    // SQUASH
-                }
-                outputStream = null;
-            }
-            break;
-        case XTERM:
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                } catch (IOException e) {
-                    // SQUASH
-                }
-                outputStream = null;
-            }
-            if (output != null) {
-                try {
-                    output.close();
-                } catch (IOException e) {
-                    // SQUASH
-                }
-                output = null;
-            }
-            break;
-        default:
-            throw new IllegalArgumentException("Invalid device type: " +
-                type);
-        }
+    /**
+     * XTERM mouse reporting encodings.
+     */
+    private enum MouseEncoding {
+        X10,
+        UTF8,
+        SGR
     }
 
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * The enclosing listening object.
      */
@@ -320,58 +245,20 @@ public class ECMA48 implements Runnable {
     private Thread readerThread = null;
 
     /**
-     * See if the reader thread is still running.
-     *
-     * @return if true, we are still connected to / reading from the remote
-     * side
-     */
-    public final boolean isReading() {
-        return (!stopReaderThread);
-    }
-
-    /**
-     * The type of emulator to be.
+     * The type of emulator to be.
      */
     private DeviceType type = DeviceType.VT102;
 
-    /**
-     * Obtain a new blank display line for an external user
-     * (e.g. TTerminalWindow).
-     *
-     * @return new blank line
-     */
-    public final DisplayLine getBlankDisplayLine() {
-        return new DisplayLine(currentState.attr);
-    }
-
     /**
      * The scrollback buffer characters + attributes.
      */
     private volatile List<DisplayLine> scrollback;
 
-    /**
-     * Get the scrollback buffer.
-     *
-     * @return the scrollback buffer
-     */
-    public final List<DisplayLine> getScrollbackBuffer() {
-        return scrollback;
-    }
-
     /**
      * The raw display buffer characters + attributes.
      */
     private volatile List<DisplayLine> display;
 
-    /**
-     * Get the display buffer.
-     *
-     * @return the display buffer
-     */
-    public final List<DisplayLine> getDisplayBuffer() {
-        return display;
-    }
-
     /**
      * The terminal's input.  For type == XTERM, this is an InputStreamReader
      * with UTF-8 encoding.
@@ -394,122 +281,16 @@ public class ECMA48 implements Runnable {
      */
     private OutputStream outputStream;
 
-    /**
-     * Parser character scan states.
-     */
-    enum ScanState {
-        GROUND,
-        ESCAPE,
-        ESCAPE_INTERMEDIATE,
-        CSI_ENTRY,
-        CSI_PARAM,
-        CSI_INTERMEDIATE,
-        CSI_IGNORE,
-        DCS_ENTRY,
-        DCS_INTERMEDIATE,
-        DCS_PARAM,
-        DCS_PASSTHROUGH,
-        DCS_IGNORE,
-        SOSPMAPC_STRING,
-        OSC_STRING,
-        VT52_DIRECT_CURSOR_ADDRESS
-    }
-
     /**
      * Current scanning state.
      */
     private ScanState scanState;
 
-    /**
-     * The selected number pad mode (DECKPAM, DECKPNM).  We record this, but
-     * can't really use it in keypress() because we do not see number pad
-     * events from TKeypress.
-     */
-    private enum KeypadMode {
-        Application,
-        Numeric
-    }
-
-    /**
-     * Arrow keys can emit three different sequences (DECCKM or VT52
-     * submode).
-     */
-    private enum ArrowKeyMode {
-        VT52,
-        ANSI,
-        VT100
-    }
-
-    /**
-     * Available character sets for GL, GR, G0, G1, G2, G3.
-     */
-    private enum CharacterSet {
-        US,
-        UK,
-        DRAWING,
-        ROM,
-        ROM_SPECIAL,
-        VT52_GRAPHICS,
-        DEC_SUPPLEMENTAL,
-        NRC_DUTCH,
-        NRC_FINNISH,
-        NRC_FRENCH,
-        NRC_FRENCH_CA,
-        NRC_GERMAN,
-        NRC_ITALIAN,
-        NRC_NORWEGIAN,
-        NRC_SPANISH,
-        NRC_SWEDISH,
-        NRC_SWISS
-    }
-
-    /**
-     * Single-shift states used by the C1 control characters SS2 (0x8E) and
-     * SS3 (0x8F).
-     */
-    private enum Singleshift {
-        NONE,
-        SS2,
-        SS3
-    }
-
-    /**
-     * VT220+ lockshift states.
-     */
-    private enum LockshiftMode {
-        NONE,
-        G1_GR,
-        G2_GR,
-        G2_GL,
-        G3_GR,
-        G3_GL
-    }
-
-    /**
-     * XTERM mouse reporting protocols.
-     */
-    private enum MouseProtocol {
-        OFF,
-        X10,
-        NORMAL,
-        BUTTONEVENT,
-        ANYEVENT
-    }
-
     /**
      * Which mouse protocol is active.
      */
     private MouseProtocol mouseProtocol = MouseProtocol.OFF;
 
-    /**
-     * XTERM mouse reporting encodings.
-     */
-    private enum MouseEncoding {
-        X10,
-        UTF8,
-        SGR
-    }
-
     /**
      * Which mouse encoding is active.
      */
@@ -521,77 +302,12 @@ public class ECMA48 implements Runnable {
      */
     private int width;
 
-    /**
-     * Get the display width.
-     *
-     * @return the width (usually 80 or 132)
-     */
-    public final int getWidth() {
-        return width;
-    }
-
-    /**
-     * Set the display width.
-     *
-     * @param width the new width
-     */
-    public final void setWidth(final int width) {
-        this.width = width;
-        rightMargin = width - 1;
-        if (currentState.cursorX >= width) {
-            currentState.cursorX = width - 1;
-        }
-        if (savedState.cursorX >= width) {
-            savedState.cursorX = width - 1;
-        }
-    }
-
     /**
      * Physical display height.  We start at 80x24, but the user can resize
      * us bigger/smaller.
      */
     private int height;
 
-    /**
-     * Get the display height.
-     *
-     * @return the height (usually 24)
-     */
-    public final int getHeight() {
-        return height;
-    }
-
-    /**
-     * Set the display height.
-     *
-     * @param height the new height
-     */
-    public final void setHeight(final int height) {
-        int delta = height - this.height;
-        this.height = height;
-        scrollRegionBottom += delta;
-        if (scrollRegionBottom < 0) {
-            scrollRegionBottom = height;
-        }
-        if (scrollRegionTop >= scrollRegionBottom) {
-            scrollRegionTop = 0;
-        }
-        if (currentState.cursorY >= height) {
-            currentState.cursorY = height - 1;
-        }
-        if (savedState.cursorY >= height) {
-            savedState.cursorY = height - 1;
-        }
-        while (display.size() < height) {
-            DisplayLine line = new DisplayLine(currentState.attr);
-            line.setReverseColor(reverseVideo);
-            display.add(line);
-        }
-        while (display.size() > height) {
-            scrollback.add(display.remove(0));
-        }
-    }
-
     /**
      * Top margin of the scrolling region.
      */
@@ -641,32 +357,12 @@ public class ECMA48 implements Runnable {
      */
     private boolean cursorVisible = true;
 
-    /**
-     * Get visible cursor flag.
-     *
-     * @return if true, the cursor is visible
-     */
-    public final boolean isCursorVisible() {
-        return cursorVisible;
-    }
-
     /**
      * Screen title as set by the xterm OSC sequence.  Lots of applications
      * send a screenTitle regardless of whether it is an xterm client or not.
      */
     private String screenTitle = "";
 
-    /**
-     * Get the screen title as set by the xterm OSC sequence.  Lots of
-     * applications send a screenTitle regardless of whether it is an xterm
-     * client or not.
-     *
-     * @return screen title
-     */
-    public final String getScreenTitle() {
-        return screenTitle;
-    }
-
     /**
      * Parameter characters being collected.
      */
@@ -722,15 +418,6 @@ public class ECMA48 implements Runnable {
      */
     private boolean columns132 = false;
 
-    /**
-     * Get 132 columns value.
-     *
-     * @return if true, the terminal is in 132 column mode
-     */
-    public final boolean isColumns132() {
-                return columns132;
-        }
-
     /**
      * true = reverse video.  Set by DECSCNM.
      */
@@ -741,6 +428,16 @@ public class ECMA48 implements Runnable {
      */
     private boolean fullDuplex = true;
 
+    /**
+     * The current terminal state.
+     */
+    private SaveableState currentState;
+
+    /**
+     * The last saved terminal state.
+     */
+    private SaveableState savedState;
+
     /**
      * DECSC/DECRC save/restore a subset of the total state.  This class
      * encapsulates those specific flags/modes.
@@ -846,23 +543,520 @@ public class ECMA48 implements Runnable {
             this.lineWrap       = that.lineWrap;
         }
 
-        /**
-         * Public constructor.
-         */
-        public SaveableState() {
-            reset();
+        /**
+         * Public constructor.
+         */
+        public SaveableState() {
+            reset();
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Public constructor.
+     *
+     * @param type one of the DeviceType constants to select VT100, VT102,
+     * VT220, or XTERM
+     * @param inputStream an InputStream connected to the remote side.  For
+     * type == XTERM, inputStream is converted to a Reader with UTF-8
+     * encoding.
+     * @param outputStream an OutputStream connected to the remote user.  For
+     * type == XTERM, outputStream is converted to a Writer with UTF-8
+     * encoding.
+     * @param displayListener a callback to the outer display, or null for
+     * default VT100 behavior
+     * @throws UnsupportedEncodingException if an exception is thrown when
+     * creating the InputStreamReader
+     */
+    public ECMA48(final DeviceType type, final InputStream inputStream,
+        final OutputStream outputStream, final DisplayListener displayListener)
+        throws UnsupportedEncodingException {
+
+        assert (inputStream != null);
+        assert (outputStream != null);
+
+        csiParams         = new ArrayList<Integer>();
+        tabStops          = new ArrayList<Integer>();
+        scrollback        = new LinkedList<DisplayLine>();
+        display           = new LinkedList<DisplayLine>();
+
+        this.type         = type;
+        if (inputStream instanceof TimeoutInputStream) {
+            this.inputStream  = (TimeoutInputStream)inputStream;
+        } else {
+            this.inputStream  = new TimeoutInputStream(inputStream, 2000);
+        }
+        if (type == DeviceType.XTERM) {
+            this.input    = new InputStreamReader(this.inputStream, "UTF-8");
+            this.output   = new OutputStreamWriter(new
+                BufferedOutputStream(outputStream), "UTF-8");
+            this.outputStream = null;
+        } else {
+            this.output       = null;
+            this.outputStream = new BufferedOutputStream(outputStream);
+        }
+        this.displayListener  = displayListener;
+
+        reset();
+        for (int i = 0; i < height; i++) {
+            display.add(new DisplayLine(currentState.attr));
+        }
+
+        // Spin up the input reader
+        readerThread = new Thread(this);
+        readerThread.start();
+    }
+
+    // ------------------------------------------------------------------------
+    // Runnable ---------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Read function runs on a separate thread.
+     */
+    public final void run() {
+        boolean utf8 = false;
+        boolean done = false;
+
+        if (type == DeviceType.XTERM) {
+            utf8 = true;
+        }
+
+        // available() will often return > 1, so we need to read in chunks to
+        // stay caught up.
+        char [] readBufferUTF8 = null;
+        byte [] readBuffer = null;
+        if (utf8) {
+            readBufferUTF8 = new char[128];
+        } else {
+            readBuffer = new byte[128];
+        }
+
+        while (!done && !stopReaderThread) {
+            try {
+                int n = inputStream.available();
+
+                // System.err.printf("available() %d\n", n); System.err.flush();
+                if (utf8) {
+                    if (readBufferUTF8.length < n) {
+                        // The buffer wasn't big enough, make it huger
+                        int newSizeHalf = Math.max(readBufferUTF8.length,
+                            n);
+
+                        readBufferUTF8 = new char[newSizeHalf * 2];
+                    }
+                } else {
+                    if (readBuffer.length < n) {
+                        // The buffer wasn't big enough, make it huger
+                        int newSizeHalf = Math.max(readBuffer.length, n);
+                        readBuffer = new byte[newSizeHalf * 2];
+                    }
+                }
+                if (n == 0) {
+                    try {
+                        Thread.sleep(2);
+                    } catch (InterruptedException e) {
+                        // SQUASH
+                    }
+                    continue;
+                }
+
+                int rc = -1;
+                try {
+                    if (utf8) {
+                        rc = input.read(readBufferUTF8, 0,
+                            readBufferUTF8.length);
+                    } else {
+                        rc = inputStream.read(readBuffer, 0,
+                            readBuffer.length);
+                    }
+                } catch (ReadTimeoutException e) {
+                    rc = 0;
+                }
+
+                // System.err.printf("read() %d\n", rc); System.err.flush();
+                if (rc == -1) {
+                    // This is EOF
+                    done = true;
+                } else {
+                    // Don't step on UI events
+                    synchronized (this) {
+                        for (int i = 0; i < rc; i++) {
+                            int ch = 0;
+                            if (utf8) {
+                                ch = readBufferUTF8[i];
+                            } else {
+                                ch = readBuffer[i];
+                            }
+
+                            consume((char)ch);
+                        }
+                    }
+                    // Permit my enclosing UI to know that I updated.
+                    if (displayListener != null) {
+                        displayListener.displayChanged();
+                    }
+                }
+                // System.err.println("end while loop"); System.err.flush();
+            } catch (IOException e) {
+                e.printStackTrace();
+                done = true;
+            }
+
+        } // while ((done == false) && (stopReaderThread == false))
+
+        // Let the rest of the world know that I am done.
+        stopReaderThread = true;
+
+        try {
+            inputStream.cancelRead();
+            inputStream.close();
+            inputStream = null;
+        } catch (IOException e) {
+            // SQUASH
+        }
+        try {
+            input.close();
+            input = null;
+        } catch (IOException e) {
+            // SQUASH
+        }
+
+        // Permit my enclosing UI to know that I updated.
+        if (displayListener != null) {
+            displayListener.displayChanged();
+        }
+
+        // System.err.println("*** run() exiting..."); System.err.flush();
+    }
+
+    // ------------------------------------------------------------------------
+    // ECMA48 -----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Return the proper primary Device Attributes string.
+     *
+     * @return string to send to remote side that is appropriate for the
+     * this.type
+     */
+    private String deviceTypeResponse() {
+        switch (type) {
+        case VT100:
+            // "I am a VT100 with advanced video option" (often VT102)
+            return "\033[?1;2c";
+
+        case VT102:
+            // "I am a VT102"
+            return "\033[?6c";
+
+        case VT220:
+        case XTERM:
+            // "I am a VT220" - 7 bit version
+            if (!s8c1t) {
+                return "\033[?62;1;6c";
+            }
+            // "I am a VT220" - 8 bit version
+            return "\u009b?62;1;6c";
+        default:
+            throw new IllegalArgumentException("Invalid device type: " + type);
+        }
+    }
+
+    /**
+     * Return the proper TERM environment variable for this device type.
+     *
+     * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
+     * @return "vt100", "xterm", etc.
+     */
+    public static String deviceTypeTerm(final DeviceType deviceType) {
+        switch (deviceType) {
+        case VT100:
+            return "vt100";
+
+        case VT102:
+            return "vt102";
+
+        case VT220:
+            return "vt220";
+
+        case XTERM:
+            return "xterm";
+
+        default:
+            throw new IllegalArgumentException("Invalid device type: "
+                + deviceType);
+        }
+    }
+
+    /**
+     * Return the proper LANG for this device type.  Only XTERM devices know
+     * about UTF-8, the others are defined by their standard to be either
+     * 7-bit or 8-bit characters only.
+     *
+     * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
+     * @param baseLang a base language without UTF-8 flag such as "C" or
+     * "en_US"
+     * @return "en_US", "en_US.UTF-8", etc.
+     */
+    public static String deviceTypeLang(final DeviceType deviceType,
+        final String baseLang) {
+
+        switch (deviceType) {
+
+        case VT100:
+        case VT102:
+        case VT220:
+            return baseLang;
+
+        case XTERM:
+            return baseLang + ".UTF-8";
+
+        default:
+            throw new IllegalArgumentException("Invalid device type: "
+                + deviceType);
+        }
+    }
+
+    /**
+     * Write a string directly to the remote side.
+     *
+     * @param str string to send
+     */
+    public void writeRemote(final String str) {
+        if (stopReaderThread) {
+            // Reader hit EOF, bail out now.
+            close();
+            return;
+        }
+
+        // System.err.printf("writeRemote() '%s'\n", str);
+
+        switch (type) {
+        case VT100:
+        case VT102:
+        case VT220:
+            if (outputStream == null) {
+                return;
+            }
+            try {
+                outputStream.flush();
+                for (int i = 0; i < str.length(); i++) {
+                    outputStream.write(str.charAt(i));
+                }
+                outputStream.flush();
+            } catch (IOException e) {
+                // Assume EOF
+                close();
+            }
+            break;
+        case XTERM:
+            if (output == null) {
+                return;
+            }
+            try {
+                output.flush();
+                output.write(str);
+                output.flush();
+            } catch (IOException e) {
+                // Assume EOF
+                close();
+            }
+            break;
+        default:
+            throw new IllegalArgumentException("Invalid device type: " + type);
+        }
+    }
+
+    /**
+     * Close the input and output streams and stop the reader thread.  Note
+     * that it is safe to call this multiple times.
+     */
+    public final void close() {
+
+        // Tell the reader thread to stop looking at input.  It will close
+        // the input streams.
+        if (stopReaderThread == false) {
+            stopReaderThread = true;
+            try {
+                readerThread.join(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // Now close the output stream.
+        switch (type) {
+        case VT100:
+        case VT102:
+        case VT220:
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    // SQUASH
+                }
+                outputStream = null;
+            }
+            break;
+        case XTERM:
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    // SQUASH
+                }
+                outputStream = null;
+            }
+            if (output != null) {
+                try {
+                    output.close();
+                } catch (IOException e) {
+                    // SQUASH
+                }
+                output = null;
+            }
+            break;
+        default:
+            throw new IllegalArgumentException("Invalid device type: " +
+                type);
+        }
+    }
+
+    /**
+     * See if the reader thread is still running.
+     *
+     * @return if true, we are still connected to / reading from the remote
+     * side
+     */
+    public final boolean isReading() {
+        return (!stopReaderThread);
+    }
+
+    /**
+     * Obtain a new blank display line for an external user
+     * (e.g. TTerminalWindow).
+     *
+     * @return new blank line
+     */
+    public final DisplayLine getBlankDisplayLine() {
+        return new DisplayLine(currentState.attr);
+    }
+
+    /**
+     * Get the scrollback buffer.
+     *
+     * @return the scrollback buffer
+     */
+    public final List<DisplayLine> getScrollbackBuffer() {
+        return scrollback;
+    }
+
+    /**
+     * Get the display buffer.
+     *
+     * @return the display buffer
+     */
+    public final List<DisplayLine> getDisplayBuffer() {
+        return display;
+    }
+
+    /**
+     * Get the display width.
+     *
+     * @return the width (usually 80 or 132)
+     */
+    public final int getWidth() {
+        return width;
+    }
+
+    /**
+     * Set the display width.
+     *
+     * @param width the new width
+     */
+    public final void setWidth(final int width) {
+        this.width = width;
+        rightMargin = width - 1;
+        if (currentState.cursorX >= width) {
+            currentState.cursorX = width - 1;
+        }
+        if (savedState.cursorX >= width) {
+            savedState.cursorX = width - 1;
+        }
+    }
+
+    /**
+     * Get the display height.
+     *
+     * @return the height (usually 24)
+     */
+    public final int getHeight() {
+        return height;
+    }
+
+    /**
+     * Set the display height.
+     *
+     * @param height the new height
+     */
+    public final void setHeight(final int height) {
+        int delta = height - this.height;
+        this.height = height;
+        scrollRegionBottom += delta;
+        if (scrollRegionBottom < 0) {
+            scrollRegionBottom = height;
+        }
+        if (scrollRegionTop >= scrollRegionBottom) {
+            scrollRegionTop = 0;
+        }
+        if (currentState.cursorY >= height) {
+            currentState.cursorY = height - 1;
+        }
+        if (savedState.cursorY >= height) {
+            savedState.cursorY = height - 1;
+        }
+        while (display.size() < height) {
+            DisplayLine line = new DisplayLine(currentState.attr);
+            line.setReverseColor(reverseVideo);
+            display.add(line);
+        }
+        while (display.size() > height) {
+            scrollback.add(display.remove(0));
         }
     }
 
     /**
-     * The current terminal state.
+     * Get visible cursor flag.
+     *
+     * @return if true, the cursor is visible
      */
-    private SaveableState currentState;
+    public final boolean isCursorVisible() {
+        return cursorVisible;
+    }
 
     /**
-     * The last saved terminal state.
+     * Get the screen title as set by the xterm OSC sequence.  Lots of
+     * applications send a screenTitle regardless of whether it is an xterm
+     * client or not.
+     *
+     * @return screen title
      */
-    private SaveableState savedState;
+    public final String getScreenTitle() {
+        return screenTitle;
+    }
+
+    /**
+     * Get 132 columns value.
+     *
+     * @return if true, the terminal is in 132 column mode
+     */
+    public final boolean isColumns132() {
+        return columns132;
+    }
 
     /**
      * Clear the CSI parameters and flags.
@@ -932,61 +1126,6 @@ public class ECMA48 implements Runnable {
         toGround();
     }
 
-    /**
-     * Public constructor.
-     *
-     * @param type one of the DeviceType constants to select VT100, VT102,
-     * VT220, or XTERM
-     * @param inputStream an InputStream connected to the remote side.  For
-     * type == XTERM, inputStream is converted to a Reader with UTF-8
-     * encoding.
-     * @param outputStream an OutputStream connected to the remote user.  For
-     * type == XTERM, outputStream is converted to a Writer with UTF-8
-     * encoding.
-     * @param displayListener a callback to the outer display, or null for
-     * default VT100 behavior
-     * @throws UnsupportedEncodingException if an exception is thrown when
-     * creating the InputStreamReader
-     */
-    public ECMA48(final DeviceType type, final InputStream inputStream,
-        final OutputStream outputStream, final DisplayListener displayListener)
-        throws UnsupportedEncodingException {
-
-        assert (inputStream != null);
-        assert (outputStream != null);
-
-        csiParams         = new ArrayList<Integer>();
-        tabStops          = new ArrayList<Integer>();
-        scrollback        = new LinkedList<DisplayLine>();
-        display           = new LinkedList<DisplayLine>();
-
-        this.type         = type;
-        if (inputStream instanceof TimeoutInputStream) {
-            this.inputStream  = (TimeoutInputStream)inputStream;
-        } else {
-            this.inputStream  = new TimeoutInputStream(inputStream, 2000);
-        }
-        if (type == DeviceType.XTERM) {
-            this.input    = new InputStreamReader(this.inputStream, "UTF-8");
-            this.output   = new OutputStreamWriter(new
-                BufferedOutputStream(outputStream), "UTF-8");
-            this.outputStream = null;
-        } else {
-            this.output       = null;
-            this.outputStream = new BufferedOutputStream(outputStream);
-        }
-        this.displayListener  = displayListener;
-
-        reset();
-        for (int i = 0; i < height; i++) {
-            display.add(new DisplayLine(currentState.attr));
-        }
-
-        // Spin up the input reader
-        readerThread = new Thread(this);
-        readerThread.start();
-    }
-
     /**
      * Append a new line to the bottom of the display, adding lines off the
      * top to the scrollback buffer.
@@ -6015,123 +6154,4 @@ public class ECMA48 implements Runnable {
         return currentState.cursorY;
     }
 
-    /**
-     * Read function runs on a separate thread.
-     */
-    public final void run() {
-        boolean utf8 = false;
-        boolean done = false;
-
-        if (type == DeviceType.XTERM) {
-            utf8 = true;
-        }
-
-        // available() will often return > 1, so we need to read in chunks to
-        // stay caught up.
-        char [] readBufferUTF8 = null;
-        byte [] readBuffer = null;
-        if (utf8) {
-            readBufferUTF8 = new char[128];
-        } else {
-            readBuffer = new byte[128];
-        }
-
-        while (!done && !stopReaderThread) {
-            try {
-                int n = inputStream.available();
-
-                // System.err.printf("available() %d\n", n); System.err.flush();
-                if (utf8) {
-                    if (readBufferUTF8.length < n) {
-                        // The buffer wasn't big enough, make it huger
-                        int newSizeHalf = Math.max(readBufferUTF8.length,
-                            n);
-
-                        readBufferUTF8 = new char[newSizeHalf * 2];
-                    }
-                } else {
-                    if (readBuffer.length < n) {
-                        // The buffer wasn't big enough, make it huger
-                        int newSizeHalf = Math.max(readBuffer.length, n);
-                        readBuffer = new byte[newSizeHalf * 2];
-                    }
-                }
-                if (n == 0) {
-                    try {
-                        Thread.sleep(2);
-                    } catch (InterruptedException e) {
-                        // SQUASH
-                    }
-                    continue;
-                }
-
-                int rc = -1;
-                try {
-                    if (utf8) {
-                        rc = input.read(readBufferUTF8, 0,
-                            readBufferUTF8.length);
-                    } else {
-                        rc = inputStream.read(readBuffer, 0,
-                            readBuffer.length);
-                    }
-                } catch (ReadTimeoutException e) {
-                    rc = 0;
-                }
-
-                // System.err.printf("read() %d\n", rc); System.err.flush();
-                if (rc == -1) {
-                    // This is EOF
-                    done = true;
-                } else {
-                    // Don't step on UI events
-                    synchronized (this) {
-                        for (int i = 0; i < rc; i++) {
-                            int ch = 0;
-                            if (utf8) {
-                                ch = readBufferUTF8[i];
-                            } else {
-                                ch = readBuffer[i];
-                            }
-
-                            consume((char)ch);
-                        }
-                    }
-                    // Permit my enclosing UI to know that I updated.
-                    if (displayListener != null) {
-                        displayListener.displayChanged();
-                    }
-                }
-                // System.err.println("end while loop"); System.err.flush();
-            } catch (IOException e) {
-                e.printStackTrace();
-                done = true;
-            }
-
-        } // while ((done == false) && (stopReaderThread == false))
-
-        // Let the rest of the world know that I am done.
-        stopReaderThread = true;
-
-        try {
-            inputStream.cancelRead();
-            inputStream.close();
-            inputStream = null;
-        } catch (IOException e) {
-            // SQUASH
-        }
-        try {
-            input.close();
-            input = null;
-        } catch (IOException e) {
-            // SQUASH
-        }
-
-        // Permit my enclosing UI to know that I updated.
-        if (displayListener != null) {
-            displayListener.displayChanged();
-        }
-
-        // System.err.println("*** run() exiting..."); System.err.flush();
-    }
-
 }