Better resizing under ptypipe

[fanfix.git] / src / jexer / TTerminalWindow.java

diff --git a/src/jexer/TTerminalWindow.java b/src/jexer/TTerminalWindow.java
index 4b8bec494071c4f88b504382319817ef90ac9771..165ab713119dfdf3cb81b6e9e03a2f7a590ebcf7 100644 (file)
--- a/src/jexer/TTerminalWindow.java
+++ b/src/jexer/TTerminalWindow.java
@@ -60,6 +60,13 @@ public class TTerminalWindow extends TScrollableWindow
      */
     private Process shell;
 
+    /**
+     * If true, we are using the ptypipe utility to support dynamic window
+     * resizing.  ptypipe is available at
+     * https://github.com/klamonte/ptypipe .
+     */
+    private boolean ptypipe = false;
+
     /**
      * Claim the keystrokes the emulator will need.
      */
@@ -165,10 +172,19 @@ public class TTerminalWindow extends TScrollableWindow
             String [] cmdShellBSD = {
                 "script", "-q", "-F", "/dev/null"
             };
+            String [] cmdShellPtypipe = {
+                "ptypipe", "/bin/bash", "--login"
+            };
             // Spawn a shell and pass its I/O to the other constructor.
 
             ProcessBuilder pb;
-            if (System.getProperty("os.name").startsWith("Windows")) {
+            if ((System.getProperty("jexer.TTerminal.ptypipe") != null)
+                && (System.getProperty("jexer.TTerminal.ptypipe").
+                    equals("true"))
+            ) {
+                pb = new ProcessBuilder(cmdShellPtypipe);
+                ptypipe = true;
+            } else if (System.getProperty("os.name").startsWith("Windows")) {
                 pb = new ProcessBuilder(cmdShellWindows);
             } else if (System.getProperty("os.name").startsWith("Mac")) {
                 pb = new ProcessBuilder(cmdShellBSD);
@@ -186,8 +202,7 @@ public class TTerminalWindow extends TScrollableWindow
             pb.redirectErrorStream(true);
             shell = pb.start();
             emulator = new ECMA48(deviceType, shell.getInputStream(),
-                shell.getOutputStream());
-            emulator.setListener(this);
+                shell.getOutputStream(), this);
         } catch (IOException e) {
             messageBox("Error", "Error launching shell: " + e.getMessage());
         }
@@ -333,6 +348,24 @@ public class TTerminalWindow extends TScrollableWindow
         doRepaint();
     }
 
+    /**
+     * Function to call to obtain the display width.
+     *
+     * @return the number of columns in the display
+     */
+    public int getDisplayWidth() {
+        return getWidth() - 2;
+    }
+
+    /**
+     * Function to call to obtain the display height.
+     *
+     * @return the number of rows in the display
+     */
+    public int getDisplayHeight() {
+        return getHeight() - 2;
+    }
+
     /**
      * Handle window close.
      */
@@ -429,6 +462,14 @@ public class TTerminalWindow extends TScrollableWindow
 
                 // Get out of scrollback
                 setVerticalValue(0);
+
+                if (ptypipe) {
+                    emulator.setWidth(getWidth() - 2);
+                    emulator.setHeight(getHeight() - 2);
+
+                    emulator.writeRemote("\033[8;" + (getHeight() - 2) + ";" +
+                        (getWidth() - 2) + "t");
+                }
             }
             return;