X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FECMA48Backend.java;h=ed2563096de360694a54dc9ce36cc4fe421586cd;hb=091d8a06c7f9f91c2a15c9350b6502cf4c10f5a3;hp=835dfaa7e705762cddec7f5cd536fbda463acfd0;hpb=05dbb28d6e8613216f43e8d0fae487c1d9c2fcd3;p=fanfix.git
diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java
index 835dfaa..ed25630 100644
--- a/src/jexer/backend/ECMA48Backend.java
+++ b/src/jexer/backend/ECMA48Backend.java
@@ -1,16 +1,11 @@
/**
* Jexer - Java Text User Interface
*
- * Version: $Id$
- *
- * Author: Kevin Lamonte, kevin.lamonte@gmail.com
- *
* License: LGPLv3 or later
*
- * Copyright: This module is licensed under the GNU Lesser General
- * Public License Version 3. Please see the file "COPYING" in this
- * directory for more information about the GNU Lesser General Public
- * License Version 3.
+ * This module is licensed under the GNU Lesser General Public License
+ * Version 3. Please see the file "COPYING" in this directory for more
+ * information about the GNU Lesser General Public License Version 3.
*
* Copyright (C) 2015 Kevin Lamonte
*
@@ -29,6 +24,9 @@
* http://www.gnu.org/licenses/, or write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
+ *
+ * @author Kevin Lamonte [kevin.lamonte@gmail.com]
+ * @version 1
*/
package jexer.backend;
@@ -45,7 +43,7 @@ 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 class ECMA48Backend extends Backend {
+public final class ECMA48Backend extends Backend {
/**
* Input events are processed by this Terminal.
@@ -55,6 +53,8 @@ public class ECMA48Backend extends Backend {
/**
* 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
@@ -62,18 +62,24 @@ public class ECMA48Backend extends Backend {
* @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.
+ * @throws UnsupportedEncodingException if an exception is thrown when
+ * creating the InputStreamReader
*/
- public ECMA48Backend(InputStream input, OutputStream output) throws UnsupportedEncodingException {
+ public ECMA48Backend(final Object listener, final InputStream input,
+ final OutputStream output) throws UnsupportedEncodingException {
+
+ // Create a terminal and explicitly set stdin into raw mode
+ terminal = new ECMA48Terminal(listener, input, output);
- // Create a terminal and explicitly set stdin into raw mode
- terminal = new ECMA48Terminal(input, output);
+ // Keep the terminal's sessionInfo so that TApplication can see it
+ sessionInfo = terminal.getSessionInfo();
- // Create a screen
- screen = new ECMA48Screen(terminal);
+ // Create a screen
+ screen = new ECMA48Screen(terminal);
- // Clear the screen
- terminal.getOutput().write(terminal.clearAll());
- terminal.flush();
+ // Clear the screen
+ terminal.getOutput().write(terminal.clearAll());
+ terminal.flush();
}
/**
@@ -81,29 +87,27 @@ public class ECMA48Backend extends Backend {
*/
@Override
public void flushScreen() {
- screen.flushPhysical();
+ screen.flushPhysical();
}
/**
* Get keyboard, mouse, and screen resize events.
*
- * @param timeout maximum amount of time (in millis) to wait for an
- * event. 0 means to return immediately, i.e. perform a poll.
- * @return events received, or an empty list if the timeout was reached
- * first
+ * @param queue list to append new events to
*/
@Override
- public List getEvents(int timeout) {
- return terminal.getEvents();
+ public void getEvents(final List queue) {
+ if (terminal.hasEvents()) {
+ terminal.getEvents(queue);
+ }
}
/**
- * Subclasses must provide an implementation that closes sockets,
- * restores console, etc.
+ * Close the I/O, restore the console, etc.
*/
@Override
public void shutdown() {
- terminal.shutdown();
+ terminal.shutdown();
}
}