X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTTerminalWindow.java;h=f85e346e4a230f646e6e41635941a516e6281f72;hb=7c870d89433346ccb5505f8f9ba62d3fc18fe996;hp=83cc86ef19d0f5a890699d41ec102d86de8dca50;hpb=34a42e784bf1238c6bb2847c52d7c841fcfdef5f;p=fanfix.git diff --git a/src/jexer/TTerminalWindow.java b/src/jexer/TTerminalWindow.java index 83cc86e..f85e346 100644 --- a/src/jexer/TTerminalWindow.java +++ b/src/jexer/TTerminalWindow.java @@ -36,6 +36,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.LinkedList; import java.util.List; +import java.util.Map; import jexer.bits.Cell; import jexer.bits.CellAttributes; @@ -79,6 +80,9 @@ public class TTerminalWindow extends TWindow { super(application, "Terminal", x, y, 80 + 2, 24 + 2, flags); + // Assume XTERM + ECMA48.DeviceType deviceType = ECMA48.DeviceType.XTERM; + try { String [] cmdShellWindows = { "cmd.exe" @@ -91,19 +95,21 @@ public class TTerminalWindow extends TWindow { "script", "-fqe", "/dev/null" }; // Spawn a shell and pass its I/O to the other constructor. + ProcessBuilder pb; if (System.getProperty("os.name").startsWith("Windows")) { pb = new ProcessBuilder(cmdShellWindows); } else { pb = new ProcessBuilder(cmdShell); } - // shell = Runtime.getRuntime().exec(cmdShell); - - // TODO: add LANG, TERM, LINES, and COLUMNS + Map env = pb.environment(); + env.put("TERM", ECMA48.deviceTypeTerm(deviceType)); + env.put("LANG", ECMA48.deviceTypeLang(deviceType, "en")); + env.put("COLUMNS", "80"); + env.put("LINES", "24"); pb.redirectErrorStream(true); shell = pb.start(); - emulator = new ECMA48(ECMA48.DeviceType.XTERM, - shell.getInputStream(), + emulator = new ECMA48(deviceType, shell.getInputStream(), shell.getOutputStream()); } catch (IOException e) { e.printStackTrace(); @@ -161,18 +167,13 @@ public class TTerminalWindow extends TWindow { List display = emulator.getDisplayBuffer(); // Put together the visible rows - // System.err.printf("----------------------------\n"); - // System.err.printf("vScroller.value %d\n", vScroller.getValue()); int visibleHeight = getHeight() - 2; - // System.err.printf("visibleHeight %d\n", visibleHeight); int visibleBottom = scrollback.size() + display.size() + vScroller.getValue(); - // System.err.printf("visibleBottom %d\n", visibleBottom); assert (visibleBottom >= 0); List preceedingBlankLines = new LinkedList(); int visibleTop = visibleBottom - visibleHeight; - // System.err.printf("visibleTop %d\n", visibleTop); if (visibleTop < 0) { for (int i = visibleTop; i < 0; i++) { preceedingBlankLines.add(emulator.getBlankDisplayLine()); @@ -184,16 +185,13 @@ public class TTerminalWindow extends TWindow { List displayLines = new LinkedList(); displayLines.addAll(scrollback); displayLines.addAll(display); - // System.err.printf("displayLines.size %d\n", displayLines.size()); List visibleLines = new LinkedList(); visibleLines.addAll(preceedingBlankLines); visibleLines.addAll(displayLines.subList(visibleTop, visibleBottom)); - // System.err.printf("visibleLines.size %d\n", visibleLines.size()); visibleHeight -= visibleLines.size(); - // System.err.printf("visibleHeight %d\n", visibleHeight); assert (visibleHeight >= 0); // Now draw the emulator screen @@ -210,7 +208,7 @@ public class TTerminalWindow extends TWindow { Cell ch = line.charAt(i); Cell newCell = new Cell(); newCell.setTo(ch); - boolean reverse = line.isReverseColor() ^ ch.getReverse(); + boolean reverse = line.isReverseColor() ^ ch.isReverse(); newCell.setReverse(false); if (reverse) { newCell.setBackColor(ch.getForeColor()); @@ -244,7 +242,12 @@ public class TTerminalWindow extends TWindow { * Handle window close. */ @Override public void onClose() { - emulator.close(); + if (shell != null) { + shell.destroy(); + shell = null; + } else { + emulator.close(); + } } /** @@ -262,12 +265,12 @@ public class TTerminalWindow extends TWindow { if (vScroller != null) { setCursorY(getCursorY() - vScroller.getValue()); } - setHasCursor(emulator.visibleCursor()); + setCursorVisible(emulator.isCursorVisible()); if (getCursorX() > getWidth() - 2) { - setHasCursor(false); + setCursorVisible(false); } if ((getCursorY() > getHeight() - 2) || (getCursorY() < 0)) { - setHasCursor(false); + setCursorVisible(false); } if (emulator.getScreenTitle().length() > 0) { // Only update the title if the shell is still alive @@ -275,7 +278,6 @@ public class TTerminalWindow extends TWindow { setTitle(emulator.getScreenTitle()); } } - setMaximumWindowWidth(emulator.getWidth() + 2); // Check to see if the shell has died. if (!emulator.isReading() && (shell != null)) { @@ -297,7 +299,7 @@ public class TTerminalWindow extends TWindow { // The shell is still running, do nothing. } } - + } // synchronized (emulator) } @@ -355,6 +357,31 @@ public class TTerminalWindow extends TWindow { } // synchronized (emulator) } + /** + * Check if a mouse press/release/motion event coordinate is over the + * emulator. + * + * @param mouse a mouse-based event + * @return whether or not the mouse is on the emulator + */ + private final boolean mouseOnEmulator(final TMouseEvent mouse) { + + synchronized (emulator) { + if (!emulator.isReading()) { + return false; + } + } + + if ((mouse.getAbsoluteX() >= getAbsoluteX() + 1) + && (mouse.getAbsoluteX() < getAbsoluteX() + getWidth() - 1) + && (mouse.getAbsoluteY() >= getAbsoluteY() + 1) + && (mouse.getAbsoluteY() < getAbsoluteY() + getHeight() - 1) + ) { + return true; + } + return false; + } + /** * Handle keystrokes. * @@ -386,6 +413,15 @@ public class TTerminalWindow extends TWindow { // Get out of scrollback vScroller.setValue(0); emulator.keypress(keypress.getKey()); + + // UGLY HACK TIME! cmd.exe needs CRLF, not just CR, so if + // this is kBEnter then also send kbCtrlJ. + if (System.getProperty("os.name").startsWith("Windows")) { + if (keypress.equals(kbEnter)) { + emulator.keypress(kbCtrlJ); + } + } + readEmulatorState(); return; } @@ -402,18 +438,86 @@ public class TTerminalWindow extends TWindow { */ @Override public void onMouseDown(final TMouseEvent mouse) { + if (inWindowMove || inWindowResize) { + // TWindow needs to deal with this. + super.onMouseDown(mouse); + return; + } - if (mouse.getMouseWheelUp()) { + if (mouse.isMouseWheelUp()) { vScroller.decrement(); return; } - if (mouse.getMouseWheelDown()) { + if (mouse.isMouseWheelDown()) { vScroller.increment(); return; } + if (mouseOnEmulator(mouse)) { + synchronized (emulator) { + mouse.setX(mouse.getX() - 1); + mouse.setY(mouse.getY() - 1); + emulator.mouse(mouse); + readEmulatorState(); + return; + } + } - // Pass to children + // Emulator didn't consume it, pass it on super.onMouseDown(mouse); } + /** + * Handle mouse release events. + * + * @param mouse mouse button release event + */ + @Override + public void onMouseUp(final TMouseEvent mouse) { + if (inWindowMove || inWindowResize) { + // TWindow needs to deal with this. + super.onMouseUp(mouse); + return; + } + + if (mouseOnEmulator(mouse)) { + synchronized (emulator) { + mouse.setX(mouse.getX() - 1); + mouse.setY(mouse.getY() - 1); + emulator.mouse(mouse); + readEmulatorState(); + return; + } + } + + // Emulator didn't consume it, pass it on + super.onMouseUp(mouse); + } + + /** + * Handle mouse motion events. + * + * @param mouse mouse motion event + */ + @Override + public void onMouseMotion(final TMouseEvent mouse) { + if (inWindowMove || inWindowResize) { + // TWindow needs to deal with this. + super.onMouseMotion(mouse); + return; + } + + if (mouseOnEmulator(mouse)) { + synchronized (emulator) { + mouse.setX(mouse.getX() - 1); + mouse.setY(mouse.getY() - 1); + emulator.mouse(mouse); + readEmulatorState(); + return; + } + } + + // Emulator didn't consume it, pass it on + super.onMouseMotion(mouse); + } + }