/**
* The enclosing listening object.
*/
- private DisplayListener listener;
-
- /**
- * Set a listening object.
- *
- * @param listener the object that will have displayChanged() called
- * after bytes are received from the remote terminal
- */
- public void setListener(final DisplayListener listener) {
- this.listener = listener;
- }
+ private DisplayListener displayListener;
/**
* When true, the reader thread is expected to exit.
* @param height the new height
*/
public final void setHeight(final int height) {
+ int delta = height - this.height;
this.height = height;
- scrollRegionBottom = height - 1;
+ scrollRegionBottom += delta;
+ if (scrollRegionBottom < 0) {
+ scrollRegionBottom = height;
+ }
if (scrollRegionTop >= scrollRegionBottom) {
scrollRegionTop = 0;
}
arrowKeyMode = ArrowKeyMode.ANSI;
keypadMode = KeypadMode.Numeric;
wrapLineFlag = false;
+ if (displayListener != null) {
+ width = displayListener.getDisplayWidth();
+ height = displayListener.getDisplayHeight();
+ rightMargin = width - 1;
+ }
// Flags
shiftOut = false;
* @param outputStream an OutputStream connected to the remote user. For
* type == XTERM, outputStream is converted to a Writer with UTF-8
* encoding.
+ * @param displayListener a callback to the outer display, or null for
+ * default VT100 behavior
* @throws UnsupportedEncodingException if an exception is thrown when
* creating the InputStreamReader
*/
public ECMA48(final DeviceType type, final InputStream inputStream,
- final OutputStream outputStream) throws UnsupportedEncodingException {
+ final OutputStream outputStream, final DisplayListener displayListener)
+ throws UnsupportedEncodingException {
assert (inputStream != null);
assert (outputStream != null);
this.output = null;
this.outputStream = new BufferedOutputStream(outputStream);
}
+ this.displayListener = displayListener;
reset();
for (int i = 0; i < height; i++) {
return sb.toString();
}
- if (keypress.equals(kbBackspace)) {
+ if (keypress.equals(kbBackspaceDel)) {
switch (type) {
case VT100:
return "\010";
} else {
// 80 columns
columns132 = false;
- rightMargin = 79;
+ if ((displayListener != null)
+ && (type == DeviceType.XTERM)
+ ) {
+ // For xterms, reset to the actual width, not 80
+ // columns.
+ width = displayListener.getDisplayWidth();
+ rightMargin = width - 1;
+ } else {
+ rightMargin = 79;
+ width = rightMargin + 1;
+ }
}
- width = rightMargin + 1;
// Entire screen is cleared, and scrolling region is
// reset
eraseScreen(0, 0, height - 1, width - 1, false);
// This is EOF
done = true;
} else {
- for (int i = 0; i < rc; i++) {
- int ch = 0;
- if (utf8) {
- ch = readBufferUTF8[i];
- } else {
- ch = readBuffer[i];
- }
+ // Don't step on UI events
+ synchronized (this) {
+ for (int i = 0; i < rc; i++) {
+ int ch = 0;
+ if (utf8) {
+ ch = readBufferUTF8[i];
+ } else {
+ ch = readBuffer[i];
+ }
- synchronized (this) {
- // Don't step on UI events
consume((char)ch);
}
}
// Permit my enclosing UI to know that I updated.
- if (listener != null) {
- listener.displayChanged();
+ if (displayListener != null) {
+ displayListener.displayChanged();
}
}
// System.err.println("end while loop"); System.err.flush();
// SQUASH
}
+ // Permit my enclosing UI to know that I updated.
+ if (displayListener != null) {
+ displayListener.displayChanged();
+ }
+
// System.err.println("*** run() exiting..."); System.err.flush();
}