Expose width/height in TApplication constructor, attempt on ECMA48

diff --git a/build.xml b/build.xml
index 807a6ea387faa24df2c3adfe0e801777e2a0771c..f21f321d703367c558c6472ef0533473709da021 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,7 @@
       <fileset dir="${src.dir}" includes="**/*.properties"/>
 
       <!-- Include source by default. -->
-      <fileset dir="${src.dir}"/>
+      <!-- <fileset dir="${src.dir}"/> -->
 
       <manifest>
         <attribute name="Main-Class" value="jexer.demos.Demo1"/>

diff --git a/src/jexer/TApplication.java b/src/jexer/TApplication.java
index e6c5819a22c58fb2195e0cfe185a7c4d8c43a2b1..e61cea28d631afba3c84964c7a2a13803c597aca 100644 (file)
--- a/src/jexer/TApplication.java
+++ b/src/jexer/TApplication.java
@@ -575,6 +575,39 @@ public class TApplication implements Runnable {
     // Constructors -----------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * Public constructor.
+     *
+     * @param backendType BackendType.XTERM, BackendType.ECMA48 or
+     * BackendType.SWING
+     * @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
+     * @throws UnsupportedEncodingException if an exception is thrown when
+     * creating the InputStreamReader
+     */
+    public TApplication(final BackendType backendType, final int windowWidth,
+        final int windowHeight, final int fontSize)
+        throws UnsupportedEncodingException {
+
+        switch (backendType) {
+        case SWING:
+            backend = new SwingBackend(this, windowWidth, windowHeight,
+                fontSize);
+            break;
+        case XTERM:
+            // Fall through...
+        case ECMA48:
+            backend = new ECMA48Backend(this, null, null, windowWidth,
+                windowHeight, fontSize);
+            break;
+        default:
+            throw new IllegalArgumentException("Invalid backend type: "
+                + backendType);
+        }
+        TApplicationImpl();
+    }
+
     /**
      * Public constructor.
      *

diff --git a/src/jexer/TEditColorThemeWindow.java b/src/jexer/TEditColorThemeWindow.java
index b4f0dcf4a35cfcf3b7f5e6f54a506d7fad981aca..5b4abf39f467a80ecfaf4203cdfcb5bfd53cbffe 100644 (file)
--- a/src/jexer/TEditColorThemeWindow.java
+++ b/src/jexer/TEditColorThemeWindow.java
@@ -44,7 +44,7 @@ import static jexer.TKeypress.*;
  * color theme.
  *
  */
-public final class TEditColorThemeWindow extends TWindow {
+public class TEditColorThemeWindow extends TWindow {
 
     /**
      * Translated strings.

diff --git a/src/jexer/backend/ECMA48Backend.java b/src/jexer/backend/ECMA48Backend.java
index 3e588f992c209c7f6a0e45a2202cfccbf1dd9a22..59cd670552b482b201fca443c966763988ab086c 100644 (file)
--- a/src/jexer/backend/ECMA48Backend.java
+++ b/src/jexer/backend/ECMA48Backend.java
@@ -52,6 +52,41 @@ public final class ECMA48Backend extends GenericBackend {
         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.
      *

diff --git a/src/jexer/backend/ECMA48Terminal.java b/src/jexer/backend/ECMA48Terminal.java
index 56c2c7c348943479a46c85d449d11932a4ec66a3..ae356107ee9c05f3d049f8bbb8b969a1aea50135 100644 (file)
--- a/src/jexer/backend/ECMA48Terminal.java
+++ b/src/jexer/backend/ECMA48Terminal.java
@@ -290,6 +290,37 @@ public final class ECMA48Terminal extends LogicalScreen
         }
     }
 
+    /**
+     * Constructor sets up state for getEvent().
+     *
+     * @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
+     * @throws UnsupportedEncodingException if an exception is thrown when
+     * creating the InputStreamReader
+     */
+    public ECMA48Terminal(final Object listener, final InputStream input,
+        final OutputStream output, final int windowWidth,
+        final int windowHeight) throws UnsupportedEncodingException {
+
+        this(listener, input, output);
+
+        // Send dtterm/xterm sequences, which will probably not work because
+        // allowWindowOps is defaulted to false.
+        String resizeString = String.format("\033[8;%d;%dt", windowHeight,
+            windowWidth);
+        this.output.write(resizeString);
+        this.output.flush();
+    }
+
     /**
      * Constructor sets up state for getEvent().
      *