X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FECMA48Backend.java;h=5dfac6d4ae9570dfdaef550efa3010715910b52f;hb=3649b9210ea425f398ba8c24f9509669cf72aa96;hp=a6ae361c791d975c152587aaaebbf62a11e85d14;hpb=7b5261bc5b641e0769902f014e3b21f61050b02b;p=nikiroo-utils.git diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java index a6ae361..5dfac6d 100644 --- a/src/jexer/backend/ECMA48Backend.java +++ b/src/jexer/backend/ECMA48Backend.java @@ -1,4 +1,4 @@ -/** +/* * Jexer - Java Text User Interface * * License: LGPLv3 or later @@ -43,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. @@ -53,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 @@ -63,11 +65,11 @@ public class ECMA48Backend extends Backend { * @throws UnsupportedEncodingException if an exception is thrown when * creating the InputStreamReader */ - public ECMA48Backend(final InputStream input, + 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(input, output); + terminal = new ECMA48Terminal(listener, input, output); // Keep the terminal's sessionInfo so that TApplication can see it sessionInfo = terminal.getSessionInfo(); @@ -84,7 +86,7 @@ public class ECMA48Backend extends Backend { * Sync the logical screen to the physical device. */ @Override - public final void flushScreen() { + public void flushScreen() { screen.flushPhysical(); } @@ -92,36 +94,10 @@ public class ECMA48Backend extends Backend { * 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(final List queue, final 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()"); + public void getEvents(final List queue) { + if (terminal.hasEvents()) { terminal.getEvents(queue); } } @@ -130,7 +106,7 @@ public class ECMA48Backend extends Backend { * Close the I/O, restore the console, etc. */ @Override - public final void shutdown() { + public void shutdown() { terminal.shutdown(); }