X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FECMA48Backend.java;h=3e588f992c209c7f6a0e45a2202cfccbf1dd9a22;hb=3e0743556d1f31723a11a6019b5c2b018b4b2104;hp=56e4ee9ef6257e89e36bb8cc326dafdcf2e49e4b;hpb=e16dda65585466c8987bd1efd718431450a96605;p=fanfix.git

diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java
index 56e4ee9..3e588f9 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) 2017 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,23 +30,27 @@ package jexer.backend;
 
 import java.io.InputStream;
 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 final class ECMA48Backend extends GenericBackend {
 
     /**
-     * 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.
@@ -70,42 +74,57 @@ 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;
     }
 
     /**
-     * Sync the logical screen to the physical device.
+     * Public constructor.
+     *
+     * @param listener the object this backend needs to wake up when new
+     * input comes in
+     * @param input the InputStream underlying 'reader'.  Its available()
+     * method is used to determine if reader.read() will block or not.
+     * @param reader a Reader connected to the remote user.
+     * @param writer a PrintWriter connected to the remote user.
+     * @param setRawMode if true, set System.in into raw mode with stty.
+     * This should in general not be used.  It is here solely for Demo3,
+     * which uses System.in.
+     * @throws IllegalArgumentException if input, reader, or writer are null.
      */
-    @Override
-    public void flushScreen() {
-        screen.flushPhysical();
+    public ECMA48Backend(final Object listener, final InputStream input,
+        final Reader reader, final PrintWriter writer,
+        final boolean setRawMode) {
+
+        // Create a terminal and explicitly set stdin into raw mode
+        terminal = new ECMA48Terminal(listener, input, reader, writer,
+            setRawMode);
+
+        // Keep the terminal's sessionInfo so that TApplication can see it
+        sessionInfo = ((ECMA48Terminal) terminal).getSessionInfo();
+
+        // ECMA48Terminal is the screen too
+        screen = (ECMA48Terminal) terminal;
     }
 
     /**
-     * Get keyboard, mouse, and screen resize events.
+     * Public constructor.
      *
-     * @param queue list to append new events to
+     * @param listener the object this backend needs to wake up when new
+     * input comes in
+     * @param input the InputStream underlying 'reader'.  Its available()
+     * method is used to determine if reader.read() will block or not.
+     * @param reader a Reader connected to the remote user.
+     * @param writer a PrintWriter connected to the remote user.
+     * @throws IllegalArgumentException if input, reader, or writer are null.
      */
-    @Override
-    public void getEvents(final List<TInputEvent> queue) {
-        if (terminal.hasEvents()) {
-            terminal.getEvents(queue);
-        }
-    }
+    public ECMA48Backend(final Object listener, final InputStream input,
+        final Reader reader, final PrintWriter writer) {
 
-    /**
-     * Close the I/O, restore the console, etc.
-     */
-    @Override
-    public void shutdown() {
-        terminal.shutdown();
+        this(listener, input, reader, writer, false);
     }
 
+
 }