X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTTerminalWindow.java;h=89280fd1d4d18d1b0a4ff0c05139dc916bb8c56a;hb=85c07c5e6db3a5e74f5ba2bd6e7ee2656d5b63a0;hp=96043e85af96849dc2ceaea5b09d83b1387e0c0d;hpb=fe0770f988e64fc0ccafd3d3b086b4a0eb559d3b;p=fanfix.git diff --git a/src/jexer/TTerminalWindow.java b/src/jexer/TTerminalWindow.java index 96043e8..89280fd 100644 --- a/src/jexer/TTerminalWindow.java +++ b/src/jexer/TTerminalWindow.java @@ -40,13 +40,15 @@ import jexer.event.TKeypressEvent; import jexer.event.TMouseEvent; import jexer.event.TResizeEvent; import jexer.tterminal.DisplayLine; +import jexer.tterminal.DisplayListener; import jexer.tterminal.ECMA48; import static jexer.TKeypress.*; /** * TTerminalWindow exposes a ECMA-48 / ANSI X3.64 style terminal in a window. */ -public class TTerminalWindow extends TScrollableWindow { +public class TTerminalWindow extends TScrollableWindow + implements DisplayListener { /** * The emulator. @@ -58,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. */ @@ -163,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); @@ -185,6 +203,7 @@ public class TTerminalWindow extends TScrollableWindow { shell = pb.start(); emulator = new ECMA48(deviceType, shell.getInputStream(), shell.getOutputStream()); + emulator.setListener(this); } catch (IOException e) { messageBox("Error", "Error launching shell: " + e.getMessage()); } @@ -323,6 +342,13 @@ public class TTerminalWindow extends TScrollableWindow { } + /** + * Called by emulator when fresh data has come in. + */ + public void displayChanged() { + doRepaint(); + } + /** * Handle window close. */ @@ -419,6 +445,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;