X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FECMA48Backend.java;h=56e4ee9ef6257e89e36bb8cc326dafdcf2e49e4b;hb=32437017f5e13c3668fe12328364ed3cd8eac8eb;hp=e0ea360820499c48e6518f29142ab37ba4d9de57;hpb=9edb442b712de01d1b7af81d1d57a29c2c6e7871;p=fanfix.git
diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java
index e0ea360..56e4ee9 100644
--- a/src/jexer/backend/ECMA48Backend.java
+++ b/src/jexer/backend/ECMA48Backend.java
@@ -1,34 +1,30 @@
-/**
+/*
* Jexer - Java Text User Interface
*
- * Version: $Id$
- *
- * Author: Kevin Lamonte, kevin.lamonte@gmail.com
+ * The MIT License (MIT)
*
- * License: LGPLv3 or later
+ * Copyright (C) 2016 Kevin Lamonte
*
- * 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.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * Copyright (C) 2015 Kevin Lamonte
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see
- * 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 +41,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 +51,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 +60,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,54 +85,27 @@ public class ECMA48Backend extends Backend {
*/
@Override
public void flushScreen() {
- screen.flushPhysical();
+ screen.flushPhysical();
}
/**
* Get keyboard, mouse, and screen resize events.
*
* @param queue list to append new events to
- * @param timeout maximum amount of time (in millis) to wait for an
- * event. 0 means to return immediately, i.e. perform a poll.
*/
@Override
- public void getEvents(List queue, int timeout) {
- if (timeout > 0) {
- // Try to sleep, let the terminal's input thread wake me up if
- // something came in.
- synchronized (terminal) {
- try {
- terminal.wait(timeout);
- if (terminal.hasEvents()) {
- // System.err.println("getEvents()");
- terminal.getEvents(queue);
- } else {
- // If I got here, then I timed out. Call
- // terminal.getIdleEvents() to pick up stragglers
- // like bare resize.
- // System.err.println("getIdleEvents()");
- terminal.getIdleEvents(queue);
- }
- } catch (InterruptedException e) {
- // Spurious interrupt, pretend it was like a timeout.
- // System.err.println("[interrupt] getEvents()");
- terminal.getIdleEvents(queue);
- }
- }
- } else {
- // Asking for a poll, go get it.
- System.err.println("[polled] getEvents()");
- terminal.getEvents(queue);
- }
+ 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();
}
}