#18 move to event-driven main loop

[fanfix.git] / src / jexer / TTerminalWindow.java

diff --git a/src/jexer/TTerminalWindow.java b/src/jexer/TTerminalWindow.java
index 17f32e0772db527b54fadc59378263a4e517f340..4b8bec494071c4f88b504382319817ef90ac9771 100644 (file)
--- a/src/jexer/TTerminalWindow.java
+++ b/src/jexer/TTerminalWindow.java
@@ -28,10 +28,7 @@
  */
 package jexer;
 
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.util.LinkedList;
 import java.util.List;
@@ -43,13 +40,15 @@ import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import jexer.event.TResizeEvent;
 import jexer.tterminal.DisplayLine;
+import jexer.tterminal.DisplayListener;
 import jexer.tterminal.ECMA48;
 import static jexer.TKeypress.*;
 
 /**
  * TTerminalWindow exposes a ECMA-48 / ANSI X3.64 style terminal in a window.
  */
-public class TTerminalWindow extends TScrollableWindow {
+public class TTerminalWindow extends TScrollableWindow
+                             implements DisplayListener {
 
     /**
      * The emulator.
@@ -188,8 +187,9 @@ public class TTerminalWindow extends TScrollableWindow {
             shell = pb.start();
             emulator = new ECMA48(deviceType, shell.getInputStream(),
                 shell.getOutputStream());
+            emulator.setListener(this);
         } catch (IOException e) {
-            e.printStackTrace();
+            messageBox("Error", "Error launching shell: " + e.getMessage());
         }
 
         // Setup the scroll bars
@@ -236,39 +236,6 @@ public class TTerminalWindow extends TScrollableWindow {
         }
     }
 
-    /**
-     * Public constructor.
-     *
-     * @param application TApplication that manages this window
-     * @param x column relative to parent
-     * @param y row relative to parent
-     * @param flags mask of CENTERED, MODAL, or RESIZABLE
-     * @param input an InputStream connected to the remote side.  For type ==
-     * XTERM, input is converted to a Reader with UTF-8 encoding.
-     * @param output an OutputStream connected to the remote user.  For type
-     * == XTERM, output is converted to a Writer with UTF-8 encoding.
-     * @throws UnsupportedEncodingException if an exception is thrown when
-     * creating the InputStreamReader
-     */
-    public TTerminalWindow(final TApplication application, final int x,
-        final int y, final int flags, final InputStream input,
-        final OutputStream output) throws UnsupportedEncodingException {
-
-        super(application, "Terminal", x, y, 80 + 2, 24 + 2, flags);
-
-        emulator = new ECMA48(ECMA48.DeviceType.XTERM, input, output);
-
-        // Setup the scroll bars
-        onResize(new TResizeEvent(TResizeEvent.Type.WIDGET, getWidth(),
-                getHeight()));
-
-        // Claim the keystrokes the emulator will need.
-        addShortcutKeys();
-
-        // Add shortcut text
-        newStatusBar("Terminal session executing...");
-    }
-
     /**
      * Draw the display buffer.
      */
@@ -359,6 +326,13 @@ public class TTerminalWindow extends TScrollableWindow {
 
     }
 
+    /**
+     * Called by emulator when fresh data has come in.
+     */
+    public void displayChanged() {
+        doRepaint();
+    }
+
     /**
      * Handle window close.
      */