X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Ftterminal%2FECMA48.java;h=31bb5b1573cda8d66922036a40027e117b52e83f;hb=6f8ff91a29056209f9fd5f40e2dcf1ae285e0210;hp=66ee95e235f96be49b701c0d1336ca240f7b22f5;hpb=bb35d91958450cc7152d2063f1d6cd34c15e2a3d;p=fanfix.git diff --git a/src/jexer/tterminal/ECMA48.java b/src/jexer/tterminal/ECMA48.java index 66ee95e..31bb5b1 100644 --- a/src/jexer/tterminal/ECMA48.java +++ b/src/jexer/tterminal/ECMA48.java @@ -1,35 +1,34 @@ -/** +/* * Jexer - Java Text User Interface * - * License: LGPLv3 or later - * - * This module is licensed under the GNU Lesser General Public License - * Version 3. Please see the file "COPYING" in this directory for more - * information about the GNU Lesser General Public License Version 3. + * The MIT License (MIT) * - * Copyright (C) 2015 Kevin Lamonte + * Copyright (C) 2017 Kevin Lamonte * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see - * http://www.gnu.org/licenses/, or write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 */ package jexer.tterminal; +import java.io.BufferedOutputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.IOException; @@ -43,14 +42,17 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import jexer.TKeypress; +import jexer.event.TMouseEvent; import jexer.bits.Color; import jexer.bits.Cell; import jexer.bits.CellAttributes; -import jexer.TKeypress; +import jexer.io.ReadTimeoutException; +import jexer.io.TimeoutInputStream; import static jexer.TKeypress.*; /** - * This implements a complex ANSI ECMA-48/ISO 6429/ANSI X3.64 type consoles, + * This implements a complex ECMA-48/ISO 6429/ANSI X3.64 type console, * including a scrollback buffer. * *

@@ -58,6 +60,11 @@ import static jexer.TKeypress.*; * caveats: * *

+ * - The vttest scenario for VT220 8-bit controls (11.1.2.3) reports a + * failure with XTERM. This is due to vttest failing to decode the UTF-8 + * stream. + * + *

* - Smooth scrolling, printing, keyboard locking, keyboard leds, and tests * from VT100 are not supported. * @@ -125,15 +132,13 @@ public class ECMA48 implements Runnable { return "\033[?6c"; case VT220: + case XTERM: // "I am a VT220" - 7 bit version if (!s8c1t) { return "\033[?62;1;6c"; } // "I am a VT220" - 8 bit version return "\u009b?62;1;6c"; - case XTERM: - // "I am a VT100 with advanced video option" (often VT102) - return "\033[?1;2c"; default: throw new IllegalArgumentException("Invalid device type: " + type); } @@ -142,24 +147,26 @@ public class ECMA48 implements Runnable { /** * Return the proper TERM environment variable for this device type. * - * @return "TERM=vt100", "TERM=xterm", etc. + * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc. + * @return "vt100", "xterm", etc. */ - public String deviceTypeTerm() { - switch (type) { + public static String deviceTypeTerm(final DeviceType deviceType) { + switch (deviceType) { case VT100: - return "TERM=vt100"; + return "vt100"; case VT102: - return "TERM=vt102"; + return "vt102"; case VT220: - return "TERM=vt220"; + return "vt220"; case XTERM: - return "TERM=xterm"; + return "xterm"; default: - throw new IllegalArgumentException("Invalid device type: " + type); + throw new IllegalArgumentException("Invalid device type: " + + deviceType); } } @@ -168,27 +175,27 @@ public class ECMA48 implements Runnable { * about UTF-8, the others are defined by their standard to be either * 7-bit or 8-bit characters only. * + * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc. * @param baseLang a base language without UTF-8 flag such as "C" or * "en_US" - * @return "LANG=en_US", "LANG=en_US.UTF-8", etc. + * @return "en_US", "en_US.UTF-8", etc. */ - public String deviceTypeLang(final String baseLang) { - switch (type) { + public static String deviceTypeLang(final DeviceType deviceType, + final String baseLang) { - case VT100: - return "LANG=" + baseLang; + switch (deviceType) { + case VT100: case VT102: - return "LANG=" + baseLang; - case VT220: - return "LANG=" + baseLang; + return baseLang; case XTERM: - return "LANG=" + baseLang + ".UTF-8"; + return baseLang + ".UTF-8"; default: - throw new IllegalArgumentException("Invalid device type: " + type); + throw new IllegalArgumentException("Invalid device type: " + + deviceType); } } @@ -197,7 +204,7 @@ public class ECMA48 implements Runnable { * * @param str string to send */ - private void writeRemote(final String str) { + public void writeRemote(final String str) { if (stopReaderThread) { // Reader hit EOF, bail out now. close(); @@ -214,6 +221,7 @@ public class ECMA48 implements Runnable { return; } try { + outputStream.flush(); for (int i = 0; i < str.length(); i++) { outputStream.write(str.charAt(i)); } @@ -228,6 +236,7 @@ public class ECMA48 implements Runnable { return; } try { + output.flush(); output.write(str); output.flush(); } catch (IOException e) { @@ -246,77 +255,60 @@ public class ECMA48 implements Runnable { */ public final void close() { - // Synchronize so we don't stomp on the reader thread. - synchronized (this) { - - // Close the input stream - switch (type) { - case VT100: - case VT102: - case VT220: - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - // SQUASH - } - inputStream = null; - } - break; - case XTERM: - if (input != null) { - try { - input.close(); - } catch (IOException e) { - // SQUASH - } - input = null; - inputStream = null; - } - break; + // Tell the reader thread to stop looking at input. It will close + // the input streams. + if (stopReaderThread == false) { + stopReaderThread = true; + try { + readerThread.join(1000); + } catch (InterruptedException e) { + e.printStackTrace(); } + } - // Tell the reader thread to stop looking at input. - if (stopReaderThread == false) { - stopReaderThread = true; + // Now close the output stream. + switch (type) { + case VT100: + case VT102: + case VT220: + if (outputStream != null) { try { - readerThread.join(); - } catch (InterruptedException e) { - e.printStackTrace(); + outputStream.close(); + } catch (IOException e) { + // SQUASH } + outputStream = null; } - - // Close the output stream. - switch (type) { - case VT100: - case VT102: - case VT220: - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - // SQUASH - } - outputStream = null; + break; + case XTERM: + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + // SQUASH } - break; - case XTERM: - if (output != null) { - try { - output.close(); - } catch (IOException e) { - // SQUASH - } - output = null; + outputStream = null; + } + if (output != null) { + try { + output.close(); + } catch (IOException e) { + // SQUASH } - break; - default: - throw new IllegalArgumentException("Invalid device type: " - + type); + output = null; } - } // synchronized (this) + break; + default: + throw new IllegalArgumentException("Invalid device type: " + + type); + } } + /** + * The enclosing listening object. + */ + private DisplayListener displayListener; + /** * When true, the reader thread is expected to exit. */ @@ -389,7 +381,7 @@ public class ECMA48 implements Runnable { /** * The terminal's raw InputStream. This is used for type != XTERM. */ - private volatile InputStream inputStream; + private volatile TimeoutInputStream inputStream; /** * The terminal's output. For type == XTERM, this wraps an @@ -493,6 +485,36 @@ public class ECMA48 implements Runnable { G3_GL } + /** + * XTERM mouse reporting protocols. + */ + private enum MouseProtocol { + OFF, + X10, + NORMAL, + BUTTONEVENT, + ANYEVENT + } + + /** + * Which mouse protocol is active. + */ + private MouseProtocol mouseProtocol = MouseProtocol.OFF; + + /** + * XTERM mouse reporting encodings. + */ + private enum MouseEncoding { + X10, + UTF8, + SGR + } + + /** + * Which mouse encoding is active. + */ + private MouseEncoding mouseEncoding = MouseEncoding.X10; + /** * Physical display width. We start at 80x24, but the user can resize us * bigger/smaller. @@ -508,6 +530,22 @@ public class ECMA48 implements Runnable { return width; } + /** + * Set the display width. + * + * @param width the new width + */ + public final void setWidth(final int width) { + this.width = width; + rightMargin = width - 1; + if (currentState.cursorX >= width) { + currentState.cursorX = width - 1; + } + if (savedState.cursorX >= width) { + savedState.cursorX = width - 1; + } + } + /** * Physical display height. We start at 80x24, but the user can resize * us bigger/smaller. @@ -523,6 +561,37 @@ public class ECMA48 implements Runnable { return height; } + /** + * Set the display height. + * + * @param height the new height + */ + public final void setHeight(final int height) { + int delta = height - this.height; + this.height = height; + scrollRegionBottom += delta; + if (scrollRegionBottom < 0) { + scrollRegionBottom = height; + } + if (scrollRegionTop >= scrollRegionBottom) { + scrollRegionTop = 0; + } + if (currentState.cursorY >= height) { + currentState.cursorY = height - 1; + } + if (savedState.cursorY >= height) { + savedState.cursorY = height - 1; + } + while (display.size() < height) { + DisplayLine line = new DisplayLine(currentState.attr); + line.setReverseColor(reverseVideo); + display.add(line); + } + while (display.size() > height) { + scrollback.add(display.remove(0)); + } + } + /** * Top margin of the scrolling region. */ @@ -577,7 +646,7 @@ public class ECMA48 implements Runnable { * * @return if true, the cursor is visible */ - public final boolean visibleCursor() { + public final boolean isCursorVisible() { return cursorVisible; } @@ -598,12 +667,6 @@ public class ECMA48 implements Runnable { return screenTitle; } - /** - * Array of flags that have come in, e.g. '?' (DEC private mode), '=', - * '>' (<), ... - */ - private List csiFlags; - /** * Parameter characters being collected. */ @@ -612,7 +675,7 @@ public class ECMA48 implements Runnable { /** * Non-csi collect buffer. */ - private List collectBuffer; + private StringBuilder collectBuffer; /** * When true, use the G1 character set. @@ -651,6 +714,7 @@ public class ECMA48 implements Runnable { * Whether number pad keys send VT100 or VT52, application or numeric * sequences. */ + @SuppressWarnings("unused") private KeypadMode keypadMode; /** @@ -658,6 +722,15 @@ public class ECMA48 implements Runnable { */ private boolean columns132 = false; + /** + * Get 132 columns value. + * + * @return if true, the terminal is in 132 column mode + */ + public final boolean isColumns132() { + return columns132; + } + /** * true = reverse video. Set by DECSCNM. */ @@ -796,8 +869,7 @@ public class ECMA48 implements Runnable { */ private void toGround() { csiParams.clear(); - csiFlags.clear(); - collectBuffer.clear(); + collectBuffer = new StringBuilder(8); scanState = ScanState.GROUND; } @@ -828,6 +900,11 @@ public class ECMA48 implements Runnable { arrowKeyMode = ArrowKeyMode.ANSI; keypadMode = KeypadMode.Numeric; wrapLineFlag = false; + if (displayListener != null) { + width = displayListener.getDisplayWidth(); + height = displayListener.getDisplayHeight(); + rightMargin = width - 1; + } // Flags shiftOut = false; @@ -844,6 +921,10 @@ public class ECMA48 implements Runnable { s8c1t = false; printerControllerMode = false; + // XTERM + mouseProtocol = MouseProtocol.OFF; + mouseEncoding = MouseEncoding.X10; + // Tab stops resetTabStops(); @@ -857,37 +938,44 @@ public class ECMA48 implements Runnable { * @param type one of the DeviceType constants to select VT100, VT102, * VT220, or XTERM * @param inputStream an InputStream connected to the remote side. For - * type == XTERM, inputStrem is converted to a Reader with UTF-8 + * type == XTERM, inputStream is converted to a Reader with UTF-8 * encoding. * @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); - csiFlags = new ArrayList(); csiParams = new ArrayList(); - collectBuffer = new ArrayList(); tabStops = new ArrayList(); scrollback = new LinkedList(); display = new LinkedList(); this.type = type; - this.inputStream = inputStream; + if (inputStream instanceof TimeoutInputStream) { + this.inputStream = (TimeoutInputStream)inputStream; + } else { + this.inputStream = new TimeoutInputStream(inputStream, 2000); + } if (type == DeviceType.XTERM) { - this.input = new InputStreamReader(inputStream, "UTF-8"); - this.output = new OutputStreamWriter(outputStream, "UTF-8"); + this.input = new InputStreamReader(this.inputStream, "UTF-8"); + this.output = new OutputStreamWriter(new + BufferedOutputStream(outputStream), "UTF-8"); this.outputStream = null; } else { this.output = null; - this.outputStream = outputStream; + this.outputStream = new BufferedOutputStream(outputStream); } + this.displayListener = displayListener; reset(); for (int i = 0; i < height; i++) { @@ -946,7 +1034,6 @@ public class ECMA48 implements Runnable { * Handle a linefeed. */ private void linefeed() { - int i; if (currentState.cursorY < scrollRegionBottom) { // Increment screen y @@ -1057,6 +1144,154 @@ public class ECMA48 implements Runnable { } } + /** + * Translate the mouse event to a VT100, VT220, or XTERM sequence and + * send to the remote side. + * + * @param mouse mouse event received from the local user + */ + public void mouse(final TMouseEvent mouse) { + + /* + System.err.printf("mouse(): protocol %s encoding %s mouse %s\n", + mouseProtocol, mouseEncoding, mouse); + */ + + if (mouseEncoding == MouseEncoding.X10) { + // We will support X10 but only for (160,94) and smaller. + if ((mouse.getX() >= 160) || (mouse.getY() >= 94)) { + return; + } + } + + switch (mouseProtocol) { + + case OFF: + // Do nothing + return; + + case X10: + // Only report button presses + if (mouse.getType() != TMouseEvent.Type.MOUSE_DOWN) { + return; + } + break; + + case NORMAL: + // Only report button presses and releases + if ((mouse.getType() != TMouseEvent.Type.MOUSE_DOWN) + && (mouse.getType() != TMouseEvent.Type.MOUSE_UP) + ) { + return; + } + break; + + case BUTTONEVENT: + /* + * Only report button presses, button releases, and motions that + * have a button down (i.e. drag-and-drop). + */ + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + if (!mouse.isMouse1() + && !mouse.isMouse2() + && !mouse.isMouse3() + && !mouse.isMouseWheelUp() + && !mouse.isMouseWheelDown() + ) { + return; + } + } + break; + + case ANYEVENT: + // Report everything + break; + } + + // Now encode the event + StringBuilder sb = new StringBuilder(6); + if (mouseEncoding == MouseEncoding.SGR) { + sb.append((char) 0x1B); + sb.append("[<"); + + if (mouse.isMouse1()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append("32;"); + } else { + sb.append("0;"); + } + } else if (mouse.isMouse2()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append("33;"); + } else { + sb.append("1;"); + } + } else if (mouse.isMouse3()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append("34;"); + } else { + sb.append("2;"); + } + } else if (mouse.isMouseWheelUp()) { + sb.append("64;"); + } else if (mouse.isMouseWheelDown()) { + sb.append("65;"); + } else { + // This is motion with no buttons down. + sb.append("35;"); + } + + sb.append(String.format("%d;%d", mouse.getX() + 1, + mouse.getY() + 1)); + + if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) { + sb.append("m"); + } else { + sb.append("M"); + } + + } else { + // X10 and UTF8 encodings + sb.append((char) 0x1B); + sb.append('['); + sb.append('M'); + if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) { + sb.append((char) (0x03 + 32)); + } else if (mouse.isMouse1()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append((char) (0x00 + 32 + 32)); + } else { + sb.append((char) (0x00 + 32)); + } + } else if (mouse.isMouse2()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append((char) (0x01 + 32 + 32)); + } else { + sb.append((char) (0x01 + 32)); + } + } else if (mouse.isMouse3()) { + if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) { + sb.append((char) (0x02 + 32 + 32)); + } else { + sb.append((char) (0x02 + 32)); + } + } else if (mouse.isMouseWheelUp()) { + sb.append((char) (0x04 + 64)); + } else if (mouse.isMouseWheelDown()) { + sb.append((char) (0x05 + 64)); + } else { + // This is motion with no buttons down. + sb.append((char) (0x03 + 32)); + } + + sb.append((char) (mouse.getX() + 33)); + sb.append((char) (mouse.getY() + 33)); + } + + // System.err.printf("Would write: \'%s\'\n", sb.toString()); + writeRemote(sb.toString()); + } + /** * Translate the keyboard press to a VT100, VT220, or XTERM sequence and * send to the remote side. @@ -1067,6 +1302,46 @@ public class ECMA48 implements Runnable { writeRemote(keypressToString(keypress)); } + /** + * Build one of the complex xterm keystroke sequences, storing the result in + * xterm_keystroke_buffer. + * + * @param ss3 the prefix to use based on VT100 state. + * @param first the first character, usually a number. + * @param first the last character, one of the following: ~ A B C D F H + * @param ctrl whether or not ctrl is down + * @param alt whether or not alt is down + * @param shift whether or not shift is down + * @return the buffer with the full key sequence + */ + private String xtermBuildKeySequence(final String ss3, final char first, + final char last, boolean ctrl, boolean alt, boolean shift) { + + StringBuilder sb = new StringBuilder(ss3); + if ((last == '~') || (ctrl == true) || (alt == true) + || (shift == true) + ) { + sb.append(first); + if ( (ctrl == false) && (alt == false) && (shift == true)) { + sb.append(";2"); + } else if ((ctrl == false) && (alt == true) && (shift == false)) { + sb.append(";3"); + } else if ((ctrl == false) && (alt == true) && (shift == true)) { + sb.append(";4"); + } else if ((ctrl == true) && (alt == false) && (shift == false)) { + sb.append(";5"); + } else if ((ctrl == true) && (alt == false) && (shift == true)) { + sb.append(";6"); + } else if ((ctrl == true) && (alt == true) && (shift == false)) { + sb.append(";7"); + } else if ((ctrl == true) && (alt == true) && (shift == true)) { + sb.append(";8"); + } + } + sb.append(last); + return sb.toString(); + } + /** * Translate the keyboard press to a VT100, VT220, or XTERM sequence. * @@ -1075,16 +1350,16 @@ public class ECMA48 implements Runnable { */ private String keypressToString(final TKeypress keypress) { - if ((fullDuplex == false) && (!keypress.getIsKey())) { + if ((fullDuplex == false) && (!keypress.isFnKey())) { /* * If this is a control character, process it like it came from * the remote side. */ - if (keypress.getCh() < 0x20) { - handleControlChar(keypress.getCh()); + if (keypress.getChar() < 0x20) { + handleControlChar(keypress.getChar()); } else { // Local echo for everything else - printCharacter(keypress.getCh()); + printCharacter(keypress.getChar()); } } @@ -1094,18 +1369,18 @@ public class ECMA48 implements Runnable { } // Handle control characters - if ((keypress.getCtrl()) && (!keypress.getIsKey())) { + if ((keypress.isCtrl()) && (!keypress.isFnKey())) { StringBuilder sb = new StringBuilder(); - char ch = keypress.getCh(); + char ch = keypress.getChar(); ch -= 0x40; sb.append(ch); return sb.toString(); } // Handle alt characters - if ((keypress.getAlt()) && (!keypress.getIsKey())) { + if ((keypress.isAlt()) && (!keypress.isFnKey())) { StringBuilder sb = new StringBuilder("\033"); - char ch = keypress.getCh(); + char ch = keypress.getChar(); sb.append(ch); return sb.toString(); } @@ -1123,69 +1398,177 @@ public class ECMA48 implements Runnable { } } - if (keypress.equals(kbLeft)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[D"; - case VT52: - return "\033D"; - case VT100: - return "\033OD"; + if (keypress.equalsWithoutModifiers(kbLeft)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'D', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'D', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'D', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[D"; + case VT52: + return "\033D"; + case VT100: + return "\033OD"; + } } } - if (keypress.equals(kbRight)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[C"; - case VT52: - return "\033C"; - case VT100: - return "\033OC"; + if (keypress.equalsWithoutModifiers(kbRight)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'C', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'C', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'C', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[C"; + case VT52: + return "\033C"; + case VT100: + return "\033OC"; + } } } - if (keypress.equals(kbUp)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[A"; - case VT52: - return "\033A"; - case VT100: - return "\033OA"; + if (keypress.equalsWithoutModifiers(kbUp)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'A', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'A', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'A', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[A"; + case VT52: + return "\033A"; + case VT100: + return "\033OA"; + } } } - if (keypress.equals(kbDown)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[B"; - case VT52: - return "\033B"; - case VT100: - return "\033OB"; + if (keypress.equalsWithoutModifiers(kbDown)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'B', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'B', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'B', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[B"; + case VT52: + return "\033B"; + case VT100: + return "\033OB"; + } } } - if (keypress.equals(kbHome)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[H"; - case VT52: - return "\033H"; - case VT100: - return "\033OH"; + if (keypress.equalsWithoutModifiers(kbHome)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'H', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'H', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'H', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[H"; + case VT52: + return "\033H"; + case VT100: + return "\033OH"; + } } } - if (keypress.equals(kbEnd)) { - switch (arrowKeyMode) { - case ANSI: - return "\033[F"; - case VT52: - return "\033F"; - case VT100: - return "\033OF"; + if (keypress.equalsWithoutModifiers(kbEnd)) { + switch (type) { + case XTERM: + switch (arrowKeyMode) { + case ANSI: + return xtermBuildKeySequence("\033[", '1', 'F', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT52: + return xtermBuildKeySequence("\033", '1', 'F', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + case VT100: + return xtermBuildKeySequence("\033O", '1', 'F', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + } + default: + switch (arrowKeyMode) { + case ANSI: + return "\033[F"; + case VT52: + return "\033F"; + case VT100: + return "\033OF"; + } } } @@ -1312,6 +1695,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0332P"; } + if (type == DeviceType.XTERM) { + return "\0331;2P"; + } return "\033O2P"; } @@ -1320,6 +1706,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0332Q"; } + if (type == DeviceType.XTERM) { + return "\0331;2Q"; + } return "\033O2Q"; } @@ -1328,6 +1717,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0332R"; } + if (type == DeviceType.XTERM) { + return "\0331;2R"; + } return "\033O2R"; } @@ -1336,6 +1728,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0332S"; } + if (type == DeviceType.XTERM) { + return "\0331;2S"; + } return "\033O2S"; } @@ -1384,6 +1779,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0335P"; } + if (type == DeviceType.XTERM) { + return "\0331;5P"; + } return "\033O5P"; } @@ -1392,6 +1790,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0335Q"; } + if (type == DeviceType.XTERM) { + return "\0331;5Q"; + } return "\033O5Q"; } @@ -1400,6 +1801,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0335R"; } + if (type == DeviceType.XTERM) { + return "\0331;5R"; + } return "\033O5R"; } @@ -1408,6 +1812,9 @@ public class ECMA48 implements Runnable { if (vt52Mode) { return "\0335S"; } + if (type == DeviceType.XTERM) { + return "\0331;5S"; + } return "\033O5S"; } @@ -1451,39 +1858,49 @@ public class ECMA48 implements Runnable { return "\033[24;5~"; } - if (keypress.equals(kbPgUp)) { - // Page Up - return "\033[5~"; - } - - if (keypress.equals(kbPgDn)) { - // Page Down - return "\033[6~"; - } - - if (keypress.equals(kbIns)) { - // Ins - return "\033[2~"; + if (keypress.equalsWithoutModifiers(kbPgUp)) { + switch (type) { + case XTERM: + return xtermBuildKeySequence("\033[", '5', '~', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + default: + return "\033[5~"; + } } - if (keypress.equals(kbShiftIns)) { - // This is what xterm sends for SHIFT-INS - return "\033[2;2~"; - // This is what xterm sends for CTRL-INS - // return "\033[2;5~"; + if (keypress.equalsWithoutModifiers(kbPgDn)) { + switch (type) { + case XTERM: + return xtermBuildKeySequence("\033[", '6', '~', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + default: + return "\033[6~"; + } } - if (keypress.equals(kbShiftDel)) { - // This is what xterm sends for SHIFT-DEL - return "\033[3;2~"; - // This is what xterm sends for CTRL-DEL - // return "\033[3;5~"; + if (keypress.equalsWithoutModifiers(kbIns)) { + switch (type) { + case XTERM: + return xtermBuildKeySequence("\033[", '2', '~', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + default: + return "\033[2~"; + } } - if (keypress.equals(kbDel)) { - // Delete sends real delete for VTxxx - return "\177"; - // return "\033[3~"; + if (keypress.equalsWithoutModifiers(kbDel)) { + switch (type) { + case XTERM: + return xtermBuildKeySequence("\033[", '3', '~', + keypress.isCtrl(), keypress.isAlt(), + keypress.isShift()); + default: + // Delete sends real delete for VTxxx + return "\177"; + } } if (keypress.equals(kbEnter)) { @@ -1502,10 +1919,21 @@ public class ECMA48 implements Runnable { return "\011"; } + if ((keypress.equalsWithoutModifiers(kbBackTab)) || + (keypress.equals(kbShiftTab)) + ) { + switch (type) { + case XTERM: + return "\033[Z"; + default: + return "\011"; + } + } + // Non-alt, non-ctrl characters - if (!keypress.getIsKey()) { + if (!keypress.isFnKey()) { StringBuilder sb = new StringBuilder(); - sb.append(keypress.getCh()); + sb.append(keypress.getChar()); return sb.toString(); } return ""; @@ -1933,7 +2361,7 @@ public class ECMA48 implements Runnable { * @param ch character to save */ private void collect(final char ch) { - collectBuffer.add(new Character(ch)); + collectBuffer.append(ch); } /** @@ -1995,14 +2423,16 @@ public class ECMA48 implements Runnable { } /** - * Set or unset a toggle. value is 'true' for set ('h'), false for reset - * ('l'). + * Set or unset a toggle. + * + * @param value true for set ('h'), false for reset ('l') */ private void setToggle(final boolean value) { boolean decPrivateModeFlag = false; - for (Character ch: collectBuffer) { - if (ch == '?') { + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { decPrivateModeFlag = true; + break; } } @@ -2076,9 +2506,18 @@ public class ECMA48 implements Runnable { } 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); @@ -2256,6 +2695,71 @@ public class ECMA48 implements Runnable { break; + case 1000: + if ((type == DeviceType.XTERM) + && (decPrivateModeFlag == true) + ) { + // Mouse: normal tracking mode + if (value == true) { + mouseProtocol = MouseProtocol.NORMAL; + } else { + mouseProtocol = MouseProtocol.OFF; + } + } + break; + + case 1002: + if ((type == DeviceType.XTERM) + && (decPrivateModeFlag == true) + ) { + // Mouse: normal tracking mode + if (value == true) { + mouseProtocol = MouseProtocol.BUTTONEVENT; + } else { + mouseProtocol = MouseProtocol.OFF; + } + } + break; + + case 1003: + if ((type == DeviceType.XTERM) + && (decPrivateModeFlag == true) + ) { + // Mouse: Any-event tracking mode + if (value == true) { + mouseProtocol = MouseProtocol.ANYEVENT; + } else { + mouseProtocol = MouseProtocol.OFF; + } + } + break; + + case 1005: + if ((type == DeviceType.XTERM) + && (decPrivateModeFlag == true) + ) { + // Mouse: UTF-8 coordinates + if (value == true) { + mouseEncoding = MouseEncoding.UTF8; + } else { + mouseEncoding = MouseEncoding.X10; + } + } + break; + + case 1006: + if ((type == DeviceType.XTERM) + && (decPrivateModeFlag == true) + ) { + // Mouse: SGR coordinates + if (value == true) { + mouseEncoding = MouseEncoding.SGR; + } else { + mouseEncoding = MouseEncoding.X10; + } + } + break; + default: break; @@ -2677,9 +3181,10 @@ public class ECMA48 implements Runnable { boolean honorProtected = false; boolean decPrivateModeFlag = false; - for (Character ch: collectBuffer) { - if (ch == '?') { + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { decPrivateModeFlag = true; + break; } } @@ -2716,9 +3221,10 @@ public class ECMA48 implements Runnable { boolean honorProtected = false; boolean decPrivateModeFlag = false; - for (Character ch: collectBuffer) { - if (ch == '?') { + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { decPrivateModeFlag = true; + break; } } @@ -3000,9 +3506,41 @@ public class ECMA48 implements Runnable { currentState.attr.setForeColor(Color.WHITE); break; case 38: - // Underscore on, default foreground color - currentState.attr.setUnderline(true); - currentState.attr.setForeColor(Color.WHITE); + if (type == DeviceType.XTERM) { + /* + * Xterm supports T.416 / ISO-8613-3 codes to select + * either an indexed color or an RGB value. (It also + * permits these ISO-8613-3 SGR sequences to be separated + * by colons rather than semicolons.) + * + * We will not support any of these additional color + * codes at this time: + * + * 1. http://invisible-island.net/ncurses/ncurses.faq.html#xterm_16MegaColors + * has a detailed discussion of the current state of + * RGB in various terminals, the point of which is + * that none of them really do the same thing despite + * all appearing to be "xterm". + * + * 2. As seen in + * https://bugs.kde.org/show_bug.cgi?id=107487#c3, + * even supporting just the "indexed mode" of these + * sequences (which could align easily with existing + * SGR colors) is assumed to mean full support of + * 24-bit RGB. So it is all or nothing. + * + * Finally, these sequences break the assumptions of + * standard ECMA-48 style parsers as pointed out at + * https://bugs.kde.org/show_bug.cgi?id=107487#c11 . + * Therefore in order to keep a clean display, we cannot + * parse anything else in this sequence. + */ + return; + } else { + // Underscore on, default foreground color + currentState.attr.setUnderline(true); + currentState.attr.setForeColor(Color.WHITE); + } break; case 39: // Underscore off, default foreground color @@ -3041,6 +3579,21 @@ public class ECMA48 implements Runnable { // Set white background currentState.attr.setBackColor(Color.WHITE); break; + case 48: + if (type == DeviceType.XTERM) { + /* + * Xterm supports T.416 / ISO-8613-3 codes to select + * either an indexed color or an RGB value. (It also + * permits these ISO-8613-3 SGR sequences to be separated + * by colons rather than semicolons.) + * + * We will not support this at this time. Also, in order + * to keep a clean display, we cannot parse anything else + * in this sequence. + */ + return; + } + break; case 49: // Default background currentState.attr.setBackColor(Color.BLACK); @@ -3058,21 +3611,16 @@ public class ECMA48 implements Runnable { private void da() { int extendedFlag = 0; int i = 0; - Character [] chars = collectBuffer.toArray(new Character[0]); - StringBuilder args = new StringBuilder(); - for (int j = 1; j < chars.length; j++) { - args.append(chars[j]); - } - - if (chars.length > 0) { - if (chars[0] == '>') { + if (collectBuffer.length() > 0) { + String args = collectBuffer.substring(1); + if (collectBuffer.charAt(0) == '>') { extendedFlag = 1; - if (chars.length >= 2) { + if (collectBuffer.length() >= 2) { i = Integer.parseInt(args.toString()); } - } else if (chars[0] == '=') { + } else if (collectBuffer.charAt(0) == '=') { extendedFlag = 2; - if (chars.length >= 2) { + if (collectBuffer.length() >= 2) { i = Integer.parseInt(args.toString()); } } else { @@ -3133,17 +3681,31 @@ public class ECMA48 implements Runnable { * DECSTBM - Set top and bottom margins. */ private void decstbm() { - int top = getCsiParam(0, 1, 1, height) - 1; - int bottom = getCsiParam(1, height, 1, height) - 1; + boolean decPrivateModeFlag = false; - if (top > bottom) { - top = bottom; + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { + decPrivateModeFlag = true; + break; + } } - scrollRegionTop = top; - scrollRegionBottom = bottom; + if (decPrivateModeFlag) { + // This could be restore DEC private mode values. + // Ignore it. + } else { + // DECSTBM + int top = getCsiParam(0, 1, 1, height) - 1; + int bottom = getCsiParam(1, height, 1, height) - 1; - // Home cursor - cursorPosition(0, 0); + if (top > bottom) { + top = bottom; + } + scrollRegionTop = top; + scrollRegionBottom = bottom; + + // Home cursor + cursorPosition(0, 0); + } } /** @@ -3210,10 +3772,12 @@ public class ECMA48 implements Runnable { */ private void dsr() { boolean decPrivateModeFlag = false; + int row = currentState.cursorY; - for (Character ch: collectBuffer) { - if (ch == '?') { + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { decPrivateModeFlag = true; + break; } } @@ -3236,15 +3800,18 @@ public class ECMA48 implements Runnable { case 6: // Request cursor position. Respond with current position. + if (currentState.originMode == true) { + row -= scrollRegionTop; + } String str = ""; if (((type == DeviceType.VT220) || (type == DeviceType.XTERM)) && (s8c1t == true) ) { - str = String.format("\u009b%d;%dR", - currentState.cursorY + 1, currentState.cursorX + 1); + str = String.format("\u009b%d;%dR", row + 1, + currentState.cursorX + 1); } else { - str = String.format("\033[%d;%dR", - currentState.cursorY + 1, currentState.cursorX + 1); + str = String.format("\033[%d;%dR", row + 1, + currentState.cursorX + 1); } // Send string directly to remote side @@ -3349,7 +3916,7 @@ public class ECMA48 implements Runnable { for (int i = start; i <= end; i++) { DisplayLine line = display.get(currentState.cursorY); if ((!honorProtected) - || ((honorProtected) && (!line.charAt(i).getProtect()))) { + || ((honorProtected) && (!line.charAt(i).isProtect()))) { switch (type) { case VT100: @@ -3420,9 +3987,10 @@ public class ECMA48 implements Runnable { */ private void printerFunctions() { boolean decPrivateModeFlag = false; - for (Character ch: collectBuffer) { - if (ch == '?') { + for (int i = 0; i < collectBuffer.length(); i++) { + if (collectBuffer.charAt(i) == '?') { decPrivateModeFlag = true; + break; } } @@ -3480,15 +4048,12 @@ public class ECMA48 implements Runnable { */ private void oscPut(final char xtermChar) { // Collect first - collectBuffer.add(new Character(xtermChar)); + collectBuffer.append(xtermChar); // Xterm cases... if (xtermChar == 0x07) { - Character [] chars = collectBuffer.toArray(new Character[0]); - StringBuilder args = new StringBuilder(); - for (int j = 0; j < chars.length - 1; j++) { - args.append(chars[j]); - } + String args = collectBuffer.substring(0, + collectBuffer.length() - 1); String [] p = args.toString().split(";"); if (p.length > 0) { if ((p[0].equals("0")) || (p[0].equals("2"))) { @@ -3510,7 +4075,7 @@ public class ECMA48 implements Runnable { * * @param ch character from the remote side */ - public void consume(char ch) { + private void consume(char ch) { // DEBUG // System.err.printf("%c", ch); @@ -3960,150 +4525,150 @@ public class ECMA48 implements Runnable { if ((ch >= 0x30) && (ch <= 0x7E)) { switch (ch) { case '0': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> Special graphics currentState.g0Charset = CharacterSet.DRAWING; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> Special graphics currentState.g1Charset = CharacterSet.DRAWING; } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> Special graphics currentState.g2Charset = CharacterSet.DRAWING; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> Special graphics currentState.g3Charset = CharacterSet.DRAWING; } } break; case '1': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> Alternate character ROM standard character set currentState.g0Charset = CharacterSet.ROM; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> Alternate character ROM standard character set currentState.g1Charset = CharacterSet.ROM; } break; case '2': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> Alternate character ROM special graphics currentState.g0Charset = CharacterSet.ROM_SPECIAL; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> Alternate character ROM special graphics currentState.g1Charset = CharacterSet.ROM_SPECIAL; } break; case '3': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '#')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '#')) { // DECDHL - Double-height line (top half) dechdl(true); } break; case '4': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '#')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '#')) { // DECDHL - Double-height line (bottom half) dechdl(false); } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> DUTCH currentState.g0Charset = CharacterSet.NRC_DUTCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> DUTCH currentState.g1Charset = CharacterSet.NRC_DUTCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> DUTCH currentState.g2Charset = CharacterSet.NRC_DUTCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> DUTCH currentState.g3Charset = CharacterSet.NRC_DUTCH; } } break; case '5': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '#')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '#')) { // DECSWL - Single-width line decswl(); } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> FINNISH currentState.g0Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> FINNISH currentState.g1Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> FINNISH currentState.g2Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> FINNISH currentState.g3Charset = CharacterSet.NRC_FINNISH; } } break; case '6': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '#')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '#')) { // DECDWL - Double-width line decdwl(); } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> NORWEGIAN currentState.g0Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> NORWEGIAN currentState.g1Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> NORWEGIAN currentState.g2Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> NORWEGIAN currentState.g3Charset = CharacterSet.NRC_NORWEGIAN; } @@ -4113,31 +4678,31 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> SWEDISH currentState.g0Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> SWEDISH currentState.g1Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> SWEDISH currentState.g2Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> SWEDISH currentState.g3Charset = CharacterSet.NRC_SWEDISH; } } break; case '8': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '#')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '#')) { // DECALN - Screen alignment display decaln(); } @@ -4150,23 +4715,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> DEC_SUPPLEMENTAL currentState.g0Charset = CharacterSet.DEC_SUPPLEMENTAL; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> DEC_SUPPLEMENTAL currentState.g1Charset = CharacterSet.DEC_SUPPLEMENTAL; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> DEC_SUPPLEMENTAL currentState.g2Charset = CharacterSet.DEC_SUPPLEMENTAL; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> DEC_SUPPLEMENTAL currentState.g3Charset = CharacterSet.DEC_SUPPLEMENTAL; } @@ -4176,23 +4741,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> SWISS currentState.g0Charset = CharacterSet.NRC_SWISS; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> SWISS currentState.g1Charset = CharacterSet.NRC_SWISS; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> SWISS currentState.g2Charset = CharacterSet.NRC_SWISS; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> SWISS currentState.g3Charset = CharacterSet.NRC_SWISS; } @@ -4203,52 +4768,52 @@ public class ECMA48 implements Runnable { case '@': break; case 'A': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> United Kingdom set currentState.g0Charset = CharacterSet.UK; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> United Kingdom set currentState.g1Charset = CharacterSet.UK; } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> United Kingdom set currentState.g2Charset = CharacterSet.UK; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> United Kingdom set currentState.g3Charset = CharacterSet.UK; } } break; case 'B': - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> ASCII set currentState.g0Charset = CharacterSet.US; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> ASCII set currentState.g1Charset = CharacterSet.US; } if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> ASCII currentState.g2Charset = CharacterSet.US; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> ASCII currentState.g3Charset = CharacterSet.US; } @@ -4258,23 +4823,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> FINNISH currentState.g0Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> FINNISH currentState.g1Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> FINNISH currentState.g2Charset = CharacterSet.NRC_FINNISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> FINNISH currentState.g3Charset = CharacterSet.NRC_FINNISH; } @@ -4286,23 +4851,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> NORWEGIAN currentState.g0Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> NORWEGIAN currentState.g1Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> NORWEGIAN currentState.g2Charset = CharacterSet.NRC_NORWEGIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> NORWEGIAN currentState.g3Charset = CharacterSet.NRC_NORWEGIAN; } @@ -4312,8 +4877,8 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ' ')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ' ')) { // S7C1T s8c1t = false; } @@ -4323,8 +4888,8 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ' ')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ' ')) { // S8C1T s8c1t = true; } @@ -4334,23 +4899,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> SWEDISH currentState.g0Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> SWEDISH currentState.g1Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> SWEDISH currentState.g2Charset = CharacterSet.NRC_SWEDISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> SWEDISH currentState.g3Charset = CharacterSet.NRC_SWEDISH; } @@ -4363,23 +4928,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> GERMAN currentState.g0Charset = CharacterSet.NRC_GERMAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> GERMAN currentState.g1Charset = CharacterSet.NRC_GERMAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> GERMAN currentState.g2Charset = CharacterSet.NRC_GERMAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> GERMAN currentState.g3Charset = CharacterSet.NRC_GERMAN; } @@ -4395,23 +4960,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> FRENCH_CA currentState.g0Charset = CharacterSet.NRC_FRENCH_CA; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> FRENCH_CA currentState.g1Charset = CharacterSet.NRC_FRENCH_CA; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> FRENCH_CA currentState.g2Charset = CharacterSet.NRC_FRENCH_CA; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> FRENCH_CA currentState.g3Charset = CharacterSet.NRC_FRENCH_CA; } @@ -4421,23 +4986,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> FRENCH currentState.g0Charset = CharacterSet.NRC_FRENCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> FRENCH currentState.g1Charset = CharacterSet.NRC_FRENCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> FRENCH currentState.g2Charset = CharacterSet.NRC_FRENCH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> FRENCH currentState.g3Charset = CharacterSet.NRC_FRENCH; } @@ -4454,23 +5019,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> ITALIAN currentState.g0Charset = CharacterSet.NRC_ITALIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> ITALIAN currentState.g1Charset = CharacterSet.NRC_ITALIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> ITALIAN currentState.g2Charset = CharacterSet.NRC_ITALIAN; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> ITALIAN currentState.g3Charset = CharacterSet.NRC_ITALIAN; } @@ -4480,23 +5045,23 @@ public class ECMA48 implements Runnable { if ((type == DeviceType.VT220) || (type == DeviceType.XTERM)) { - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '(')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '(')) { // G0 --> SPANISH currentState.g0Charset = CharacterSet.NRC_SPANISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == ')')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == ')')) { // G1 --> SPANISH currentState.g1Charset = CharacterSet.NRC_SPANISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '*')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '*')) { // G2 --> SPANISH currentState.g2Charset = CharacterSet.NRC_SPANISH; } - if ((collectBuffer.size() == 1) - && (collectBuffer.get(0) == '+')) { + if ((collectBuffer.length() == 1) + && (collectBuffer.charAt(0) == '+')) { // G3 --> SPANISH currentState.g3Charset = CharacterSet.NRC_SPANISH; } @@ -5140,13 +5705,13 @@ public class ECMA48 implements Runnable { case 'p': if (((type == DeviceType.VT220) || (type == DeviceType.XTERM)) - && (collectBuffer.get(collectBuffer.size() - 1) == '\"') + && (collectBuffer.charAt(collectBuffer.length() - 1) == '\"') ) { // DECSCL - compatibility level decscl(); } if ((type == DeviceType.XTERM) - && (collectBuffer.get(collectBuffer.size() - 1) == '!') + && (collectBuffer.charAt(collectBuffer.length() - 1) == '!') ) { // DECSTR - Soft terminal reset decstr(); @@ -5155,7 +5720,7 @@ public class ECMA48 implements Runnable { case 'q': if (((type == DeviceType.VT220) || (type == DeviceType.XTERM)) - && (collectBuffer.get(collectBuffer.size() - 1) == '\"') + && (collectBuffer.charAt(collectBuffer.length() - 1) == '\"') ) { // DECSCA decsca(); @@ -5214,8 +5779,9 @@ public class ECMA48 implements Runnable { collect(ch); } if (ch == 0x5C) { - if ((collectBuffer.size() > 0) - && (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) { + if ((collectBuffer.length() > 0) + && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B) + ) { toGround(); } } @@ -5267,8 +5833,9 @@ public class ECMA48 implements Runnable { collect(ch); } if (ch == 0x5C) { - if ((collectBuffer.size() > 0) && - (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) { + if ((collectBuffer.length() > 0) + && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B) + ) { toGround(); } } @@ -5298,8 +5865,9 @@ public class ECMA48 implements Runnable { collect(ch); } if (ch == 0x5C) { - if ((collectBuffer.size() > 0) && - (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) { + if ((collectBuffer.length() > 0) + && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B) + ) { toGround(); } } @@ -5345,8 +5913,8 @@ public class ECMA48 implements Runnable { collect(ch); } if (ch == 0x5C) { - if ((collectBuffer.size() > 0) - && (collectBuffer.get(collectBuffer.size() - 1) == 0x1B) + if ((collectBuffer.length() > 0) + && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B) ) { toGround(); } @@ -5413,12 +5981,12 @@ public class ECMA48 implements Runnable { case VT52_DIRECT_CURSOR_ADDRESS: // This is a special case for the VT52 sequence "ESC Y l c" - if (collectBuffer.size() == 0) { + if (collectBuffer.length() == 0) { collect(ch); - } else if (collectBuffer.size() == 1) { + } else if (collectBuffer.length() == 1) { // We've got the two characters, one in the buffer and the // other in ch. - cursorPosition(collectBuffer.get(0) - '\040', ch - '\040'); + cursorPosition(collectBuffer.charAt(0) - '\040', ch - '\040'); toGround(); } return; @@ -5432,6 +6000,9 @@ public class ECMA48 implements Runnable { * @return current cursor X */ public final int getCursorX() { + if (display.get(currentState.cursorY).isDoubleWidth()) { + return currentState.cursorX * 2; + } return currentState.cursorX; } @@ -5447,7 +6018,7 @@ public class ECMA48 implements Runnable { /** * Read function runs on a separate thread. */ - public void run() { + public final void run() { boolean utf8 = false; boolean done = false; @@ -5468,11 +6039,13 @@ public class ECMA48 implements Runnable { while (!done && !stopReaderThread) { try { int n = inputStream.available(); + // System.err.printf("available() %d\n", n); System.err.flush(); if (utf8) { if (readBufferUTF8.length < n) { // The buffer wasn't big enough, make it huger - int newSizeHalf = Math.max(readBufferUTF8.length, n); + int newSizeHalf = Math.max(readBufferUTF8.length, + n); readBufferUTF8 = new char[newSizeHalf * 2]; } @@ -5483,15 +6056,28 @@ public class ECMA48 implements Runnable { readBuffer = new byte[newSizeHalf * 2]; } } + if (n == 0) { + try { + Thread.sleep(2); + } catch (InterruptedException e) { + // SQUASH + } + continue; + } int rc = -1; - if (utf8) { - rc = input.read(readBufferUTF8, 0, - readBufferUTF8.length); - } else { - rc = inputStream.read(readBuffer, 0, - readBuffer.length); + try { + if (utf8) { + rc = input.read(readBufferUTF8, 0, + readBufferUTF8.length); + } else { + rc = inputStream.read(readBuffer, 0, + readBuffer.length); + } + } catch (ReadTimeoutException e) { + rc = 0; } + // System.err.printf("read() %d\n", rc); System.err.flush(); if (rc == -1) { // This is EOF @@ -5504,22 +6090,42 @@ public class ECMA48 implements Runnable { } else { ch = readBuffer[i]; } - // Don't step on UI events + synchronized (this) { + // Don't step on UI events consume((char)ch); } } + // Permit my enclosing UI to know that I updated. + if (displayListener != null) { + displayListener.displayChanged(); + } } // System.err.println("end while loop"); System.err.flush(); } catch (IOException e) { e.printStackTrace(); done = true; } + } // while ((done == false) && (stopReaderThread == false)) // Let the rest of the world know that I am done. stopReaderThread = true; + try { + inputStream.cancelRead(); + inputStream.close(); + inputStream = null; + } catch (IOException e) { + // SQUASH + } + try { + input.close(); + input = null; + } catch (IOException e) { + // SQUASH + } + // System.err.println("*** run() exiting..."); System.err.flush(); }