/**
* TTerminalWindow exposes a ECMA-48 / ANSI X3.64 style terminal in a window.
*/
-public class TTerminalWindow extends TWindow {
+public class TTerminalWindow extends TScrollableWindow {
/**
* 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;
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>();
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)) {