X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FECMA48Backend.java;h=0614e17d9ccc6bb5ba690da0bbd30d39ec3f5851;hb=505be508ae7d3fb48122be548b310a238cfb91eb;hp=857985562b8fcc3de75bf235c3db4871fa3d5d05;hpb=55d2b2c2b29ce51f4f910448a115073371deeae8;p=nikiroo-utils.git

diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java
index 8579855..0614e17 100644
--- a/src/jexer/backend/ECMA48Backend.java
+++ b/src/jexer/backend/ECMA48Backend.java
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2016 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,22 +33,63 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
-import java.util.List;
-
-import jexer.event.TInputEvent;
-import jexer.io.ECMA48Screen;
-import jexer.io.ECMA48Terminal;
 
 /**
  * This class uses an xterm/ANSI X3.64/ECMA-48 type terminal to provide a
  * screen, keyboard, and mouse to TApplication.
  */
-public final class ECMA48Backend extends Backend {
+public class ECMA48Backend extends GenericBackend {
+
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
 
     /**
-     * Input events are processed by this Terminal.
+     * Public constructor will use System.in and System.out and UTF-8
+     * encoding. On non-Windows systems System.in will be put in raw mode;
+     * shutdown() will (blindly!) put System.in in cooked mode.
+     *
+     * @throws UnsupportedEncodingException if an exception is thrown when
+     * creating the InputStreamReader
      */
-    private ECMA48Terminal terminal;
+    public ECMA48Backend() throws UnsupportedEncodingException {
+        this(null, null, null);
+    }
+
+    /**
+     * Public constructor.
+     *
+     * @param listener the object this backend needs to wake up when new
+     * input comes in
+     * @param input an InputStream connected to the remote user, or null for
+     * System.in.  If System.in is used, then on non-Windows systems it will
+     * be put in raw mode; shutdown() will (blindly!) put System.in in cooked
+     * mode.  input is always converted to a Reader with UTF-8 encoding.
+     * @param output an OutputStream connected to the remote user, or null
+     * for System.out.  output is always converted to a Writer with UTF-8
+     * encoding.
+     * @param windowWidth the number of text columns to start with
+     * @param windowHeight the number of text rows to start with
+     * @param fontSize the size in points.  ECMA48 cannot set it, but it is
+     * here to match the Swing API.
+     * @throws UnsupportedEncodingException if an exception is thrown when
+     * creating the InputStreamReader
+     */
+    public ECMA48Backend(final Object listener, final InputStream input,
+        final OutputStream output, final int windowWidth,
+        final int windowHeight, final int fontSize)
+        throws UnsupportedEncodingException {
+
+        // Create a terminal and explicitly set stdin into raw mode
+        terminal = new ECMA48Terminal(listener, input, output, windowWidth,
+            windowHeight);
+
+        // Keep the terminal's sessionInfo so that TApplication can see it
+        sessionInfo = ((ECMA48Terminal) terminal).getSessionInfo();
+
+        // ECMA48Terminal is the screen too
+        screen = (ECMA48Terminal) terminal;
+    }
 
     /**
      * Public constructor.
@@ -72,14 +113,10 @@ public final class ECMA48Backend extends Backend {
         terminal = new ECMA48Terminal(listener, input, output);
 
         // Keep the terminal's sessionInfo so that TApplication can see it
-        sessionInfo = terminal.getSessionInfo();
-
-        // Create a screen
-        screen = new ECMA48Screen(terminal);
+        sessionInfo = ((ECMA48Terminal) terminal).getSessionInfo();
 
-        // Clear the screen
-        terminal.getOutput().write(terminal.clearAll());
-        terminal.flush();
+        // ECMA48Terminal is the screen too
+        screen = (ECMA48Terminal) terminal;
     }
 
     /**
@@ -105,14 +142,10 @@ public final class ECMA48Backend extends Backend {
             setRawMode);
 
         // Keep the terminal's sessionInfo so that TApplication can see it
-        sessionInfo = terminal.getSessionInfo();
-
-        // Create a screen
-        screen = new ECMA48Screen(terminal);
+        sessionInfo = ((ECMA48Terminal) terminal).getSessionInfo();
 
-        // Clear the screen
-        terminal.getOutput().write(terminal.clearAll());
-        terminal.flush();
+        // ECMA48Terminal is the screen too
+        screen = (ECMA48Terminal) terminal;
     }
 
     /**
@@ -132,42 +165,4 @@ public final class ECMA48Backend extends Backend {
         this(listener, input, reader, writer, false);
     }
 
-    /**
-     * Sync the logical screen to the physical device.
-     */
-    @Override
-    public void flushScreen() {
-        screen.flushPhysical();
-    }
-
-    /**
-     * Get keyboard, mouse, and screen resize events.
-     *
-     * @param queue list to append new events to
-     */
-    @Override
-    public void getEvents(final List<TInputEvent> queue) {
-        if (terminal.hasEvents()) {
-            terminal.getEvents(queue);
-        }
-    }
-
-    /**
-     * Close the I/O, restore the console, etc.
-     */
-    @Override
-    public void shutdown() {
-        terminal.shutdown();
-    }
-
-    /**
-     * Set the window title.
-     *
-     * @param title the new title
-     */
-    @Override
-    public void setTitle(final String title) {
-        ((ECMA48Screen) screen).setTitle(title);
-    }
-
 }