*
* The MIT License (MIT)
*
- * Copyright (C) 2016 Kevin Lamonte
+ * Copyright (C) 2017 Kevin Lamonte
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
*/
package jexer;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
import java.util.LinkedList;
import java.util.List;
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 TWindow {
+public class TTerminalWindow extends TScrollableWindow
+ implements DisplayListener {
/**
* The emulator.
*/
private Process shell;
- /**
- * Vertical scrollbar.
- */
- private TVScroller vScroller;
-
/**
* Claim the keystrokes the emulator will need.
*/
super(application, "Terminal", x, y, 80 + 2, 24 + 2, flags);
+ vScroller = new TVScroller(this, getWidth() - 2, 0, getHeight() - 2);
+ setBottomValue(0);
+
// Assume XTERM
ECMA48.DeviceType deviceType = ECMA48.DeviceType.XTERM;
shell = pb.start();
emulator = new ECMA48(deviceType, shell.getInputStream(),
shell.getOutputStream());
+ emulator.setListener(this);
} catch (IOException e) {
- e.printStackTrace();
+ messageBox("Error", "Error launching shell: " + e.getMessage());
}
// Setup the scroll bars
}
}
- /**
- * Public constructor.
- *
- * @param application TApplication that manages this window
- * @param x column relative to parent
- * @param y row relative to parent
- * @param flags mask of CENTERED, MODAL, or RESIZABLE
- * @param input an InputStream connected to the remote side. For type ==
- * XTERM, input is converted to a Reader with UTF-8 encoding.
- * @param output an OutputStream connected to the remote user. For type
- * == XTERM, output is converted to a Writer with UTF-8 encoding.
- * @throws UnsupportedEncodingException if an exception is thrown when
- * creating the InputStreamReader
- */
- public TTerminalWindow(final TApplication application, final int x,
- final int y, final int flags, final InputStream input,
- final OutputStream output) throws UnsupportedEncodingException {
-
- super(application, "Terminal", x, y, 80 + 2, 24 + 2, flags);
-
- emulator = new ECMA48(ECMA48.DeviceType.XTERM, input, output);
-
- // Setup the scroll bars
- onResize(new TResizeEvent(TResizeEvent.Type.WIDGET, getWidth(),
- getHeight()));
-
- // Claim the keystrokes the emulator will need.
- addShortcutKeys();
-
- // Add shortcut text
- newStatusBar("Terminal session executing...");
- }
-
/**
* Draw the display buffer.
*/
synchronized (emulator) {
// Update the scroll bars
- reflow();
+ reflowData();
// Draw the box using my superclass
super.draw();
// Put together the visible rows
int visibleHeight = getHeight() - 2;
int visibleBottom = scrollback.size() + display.size()
- + vScroller.getValue();
+ + getVerticalValue();
assert (visibleBottom >= 0);
List<DisplayLine> preceedingBlankLines = new LinkedList<DisplayLine>();
}
+ /**
+ * Called by emulator when fresh data has come in.
+ */
+ public void displayChanged() {
+ doRepaint();
+ }
+
/**
* Handle window close.
*/
setCursorX(emulator.getCursorX() + 1);
setCursorY(emulator.getCursorY() + 1
- + (getHeight() - 2 - emulator.getHeight()));
- if (vScroller != null) {
- setCursorY(getCursorY() - vScroller.getValue());
- }
+ + (getHeight() - 2 - emulator.getHeight())
+ - getVerticalValue());
setCursorVisible(emulator.isCursorVisible());
if (getCursorX() > getWidth() - 2) {
setCursorVisible(false);
if (resize.getType() == TResizeEvent.Type.WIDGET) {
// Resize the scroll bars
- reflow();
+ reflowData();
+ placeScrollbars();
// Get out of scrollback
- vScroller.setValue(0);
+ setVerticalValue(0);
}
return;
/**
* Resize scrollbars for a new width/height.
*/
- private void reflow() {
+ @Override
+ public void reflowData() {
// Synchronize against the emulator so we don't stomp on its reader
// thread.
readEmulatorState();
// Vertical scrollbar
- if (vScroller == null) {
- vScroller = new TVScroller(this, getWidth() - 2, 0,
- getHeight() - 2);
- vScroller.setBottomValue(0);
- vScroller.setValue(0);
- } else {
- vScroller.setX(getWidth() - 2);
- vScroller.setHeight(getHeight() - 2);
- }
- vScroller.setTopValue(getHeight() - 2
+ setTopValue(getHeight() - 2
- (emulator.getScrollbackBuffer().size()
+ emulator.getDisplayBuffer().size()));
- vScroller.setBigChange(getHeight() - 2);
+ setVerticalBigChange(getHeight() - 2);
} // synchronized (emulator)
}
|| keypress.equals(kbCtrlPgUp)
|| keypress.equals(kbAltPgUp)
) {
- vScroller.bigDecrement();
+ bigVerticalDecrement();
return;
}
if (keypress.equals(kbShiftPgDn)
|| keypress.equals(kbCtrlPgDn)
|| keypress.equals(kbAltPgDn)
) {
- vScroller.bigIncrement();
+ bigVerticalIncrement();
return;
}
synchronized (emulator) {
if (emulator.isReading()) {
// Get out of scrollback
- vScroller.setValue(0);
+ setVerticalValue(0);
emulator.keypress(keypress.getKey());
// UGLY HACK TIME! cmd.exe needs CRLF, not just CR, so if
}
if (mouse.isMouseWheelUp()) {
- vScroller.decrement();
+ verticalDecrement();
return;
}
if (mouse.isMouseWheelDown()) {
- vScroller.increment();
+ verticalIncrement();
return;
}
if (mouseOnEmulator(mouse)) {
git://git.nikiroo.be / fanfix.git / blobdiff