510Connectbot: src/com/five_ten_sg/connectbot/service/TerminalBridge.java comparison

comparison src/com/five_ten_sg/connectbot/service/TerminalBridge.java @ 79:01d939969b10

merge tn5250 branch into default

author	Carl Byington <carl@five-ten-sg.com>
date	Mon, 16 Jun 2014 08:24:00 -0700
parents	1588e359a972 99d5b02ad90c
children	33eb63352be5

comparison

equal deleted inserted replaced

-:b3d0d806cbe2
+:01d939969b10
 final Paint defaultPaint;
 private Relay relay;
-private final String emulation;
+private String emulation;   // aka answerback string, aka terminal type
-private final int scrollback;
 public Bitmap bitmap = null;
 public vt320  buffer = null;
-private TerminalView parent = null;
+public  TerminalView parent = null;
 private final Canvas canvas = new Canvas();
 private boolean disconnected = false;
 private boolean awaitingClose = false;
 private final SelectionArea selectionArea;
 // TODO add support for the new clipboard API
 private ClipboardManager clipboard;
-public int charWidth = -1;
+public  int   charWidth  = -1;
-public int charHeight = -1;
+public  int   charHeight = -1;
-private int charTop = -1;
+private int   charTop    = -1;
+private float fontSize   = -1;
-private float fontSize = -1;
 private final List<FontSizeChangedListener> fontSizeChangedListeners;
 private final List<String> localOutput;
 };
 emulation = null;
 manager = null;
 defaultPaint = new Paint();
 selectionArea = new SelectionArea();
-scrollback = 1;
 localOutput = new LinkedList<String>();
 fontSizeChangedListeners = new LinkedList<FontSizeChangedListener>();
 transport   = null;
 keyListener = new TerminalKeyListener(manager, this, buffer, null);
 monitor     = null;
 }
 /**
-* Create new terminal bridge with following parameters. We will immediately
+* Create new terminal bridge with following parameters.
-* launch thread to start SSH connection and handle any hostkey verification
-* and password authentication.
 */
 public TerminalBridge(final TerminalManager manager, final HostBean host) throws IOException {
 float hostFontSize;
 this.manager = manager;
 this.host = host;
-emulation = manager.getEmulation();
+emulation = host.getHostEmulation();
-scrollback = manager.getScrollback();
+if ((emulation == null) || (emulation.length() == 0)) emulation = manager.getEmulation();
 // create prompt helper to relay password and hostkey requests up to gui
 promptHelper = new PromptHelper(this);
 // create our default paint
 defaultPaint = new Paint();
 defaultPaint.setAntiAlias(true);
 localOutput = new LinkedList<String>();
 fontSizeChangedListeners = new LinkedList<FontSizeChangedListener>();
 Integer defaultFontSize = Integer.parseInt(manager.prefs.getString(PreferenceConstants.DEFAULT_FONT_SIZE, "-1"));
 Log.i(TAG, "fontSize: " + this.fontSize + ", defaultFontSize: " + defaultFontSize);
-if (this.fontSize == -1) {
+if (fontSize == -1) {
 if (defaultFontSize > 0 && host.getFontSize() == -1)
 hostFontSize = defaultFontSize;
 else
 hostFontSize = host.getFontSize();
 }
 else
-hostFontSize = this.fontSize;
+hostFontSize = fontSize;
-if (hostFontSize <= 0)
+if (hostFontSize <= 0) hostFontSize = DEFAULT_FONT_SIZE;
-hostFontSize = DEFAULT_FONT_SIZE;
 setFontSize(hostFontSize);
-// create terminal buffer and handle outgoing data
-// this is probably status reply information
-buffer = new vt320() {
-@Override
-public void debug(String s) {
-Log.d(TAG, s);
-}
-@Override
-public void write(byte[] b) {
-try {
-if (b != null && transport != null) {
-if (monitor != null) monitor.hostData(b);
-transport.write(b);
-}
-}
-catch (IOException e) {
-Log.e(TAG, "Problem writing outgoing data in vt320() thread", e);
-}
-}
-@Override
-public void write(int b) {
-try {
-if (transport != null) {
-if (monitor != null) monitor.hostData(b);
-transport.write(b);
-}
-}
-catch (IOException e) {
-Log.e(TAG, "Problem writing outgoing data in vt320() thread", e);
-}
-}
-// We don't use telnet sequences.
-@Override
-public void sendTelnetCommand(byte cmd) {
-}
-// We don't want remote to resize our window.
-@Override
-public void setWindowSize(int c, int r) {
-}
-// test for changed screen contents
-@Override
-public void testChanged() {
-if (monitor != null) monitor.testChanged();
-}
-// play beep noise
-@Override
-public void beep() {
-if (parent.isShown())
-manager.playBeep();
-else
-manager.sendActivityNotification(host);
-}
-// monitor placement of new characters
-@Override
-public void putChar(int c, int l, char ch, int attributes) {
-if (monitor != null) monitor.screenChanged(l, c);
-super.putChar(c, l, ch, attributes);
-}
-@Override
-public void insertChar(int c, int l, char ch, int attributes) {
-if (monitor != null) monitor.screenChanged(l, l, c, width - 1);
-super.insertChar(c, l, ch, attributes);
-}
-@Override
-public void insertLine(int l, int n, boolean scrollDown) {
-if (monitor != null) {
-if (scrollDown) monitor.screenChanged(l, height - 1, 0, width - 1);
-else            monitor.screenChanged(0, l, 0, width - 1);
-}
-super.insertLine(l, n, scrollDown);
-}
-@Override
-public void deleteLine(int l) {
-if (monitor != null) monitor.screenChanged(l, height - 1, 0, width - 1);
-super.deleteLine(l);
-}
-@Override
-public void deleteChar(int c, int l) {
-if (monitor != null) monitor.screenChanged(l, l, c, width - 1);
-super.deleteChar(c, l);
-}
-@Override
-public void setCursorPosition(int c, int l) {
-if (monitor != null) monitor.cursorMove(l, c);
-super.setCursorPosition(c, l);
-}
-};
-// Don't keep any scrollback if a session is not being opened.
-if (host.getWantSession())
-buffer.setBufferSize(scrollback);
-else
-buffer.setBufferSize(0);
 resetColors();
-buffer.setDisplay(this);
 selectionArea = new SelectionArea();
-keyListener   = new TerminalKeyListener(manager, this, buffer, host.getEncoding());
+}
+public PromptHelper getPromptHelper() {
+return promptHelper;
+}
+/**
+* Spawn thread to open connection and start login process.
+*/
+protected void startConnection() {
+transport   = TransportFactory.getTransport(host.getProtocol());
+transport.setLinks(manager, this, host, emulation);
+buffer      = transport.getTransportBuffer();
+keyListener = transport.getTerminalKeyListener();
 String monitor_init = host.getMonitor();
 if ((monitor_init != null) && (monitor_init.length() > 0)) {
 monitor = new TerminalMonitor(manager, buffer, keyListener, parent, monitor_init);
 }
-}
-public PromptHelper getPromptHelper() {
-return promptHelper;
-}
-/**
-* Spawn thread to open connection and start login process.
-*/
-protected void startConnection() {
-transport = TransportFactory.getTransport(host.getProtocol());
-transport.setBridge(this);
-transport.setManager(manager);
-transport.setHost(host);
-// TODO make this more abstract so we don't litter on AbsTransport
 transport.setCompression(host.getCompression());
 transport.setHttpproxy(host.getHttpproxy());
 transport.setUseAuthAgent(host.getUseAuthAgent());
-transport.setEmulation(emulation);
 if (transport.canForwardPorts()) {
 for (PortForwardBean portForward : manager.hostdb.getPortForwardsForHost(host))
 transport.addPortForward(portForward);
 }
 /**
 * @return charset in use by bridge
 */
 public Charset getCharset() {
-return relay.getCharset();
+if (relay != null) return relay.getCharset();
+return keyListener.getCharset();
 }
 /**
 * Sets the encoding used by the terminal. If the connection is live,
 * then the character set is changed for the next read.
 * @param encoding the canonical name of the character encoding
 */
 public void setCharset(String encoding) {
-if (relay != null)
+if (relay != null) relay.setCharset(encoding);
-relay.setCharset(encoding);
 keyListener.setCharset(encoding);
 }
 /**
 * Convenience method for writing a line into the underlying MUD buffer.
 * authentication. If called before authenticated, it will just fail.
 */
 public void onConnected() {
 disconnected = false;
 buffer.reset();
-// We no longer need our local output.
-localOutput.clear();
-// previously tried vt100 and xterm for emulation modes
-// "screen" works the best for color and escape codes
 buffer.setAnswerBack(emulation);
+localOutput.clear();    // We no longer need our local output.
 if (HostDatabase.DELKEY_BACKSPACE.equals(host.getDelKey()))
 buffer.setBackspace(vt320.DELETE_IS_BACKSPACE);
 else
 buffer.setBackspace(vt320.DELETE_IS_DEL);
 // create thread to relay incoming connection data to buffer
-relay = new Relay(this, transport, buffer, host.getEncoding());
+// only if needed by the transport
-Thread relayThread = new Thread(relay);
+if (transport.needsRelay()) {
-relayThread.setDaemon(true);
+relay = new Relay(this, transport, buffer, host.getEncoding());
-relayThread.setName("Relay");
+Thread relayThread = new Thread(relay);
-relayThread.start();
+relayThread.setDaemon(true);
+relayThread.setName("Relay");
+relayThread.start();
+}
 // force font-size to make sure we resizePTY as needed
 setFontSize(fontSize);
 // finally send any post-login string, if requested
 injectString(host.getPostLogin());
 }
 defaultPaint.getTextWidths("X", widths);
 charWidth = (int)FloatMath.ceil(widths[0]);
 charHeight = (int)FloatMath.ceil(fm.descent - fm.top);
 // refresh any bitmap with new font size
-if (parent != null)
+if (parent != null) parentChanged(parent);
-parentChanged(parent);
 for (FontSizeChangedListener ofscl : fontSizeChangedListeners)
 ofscl.onFontSizeChanged(size);
 host.setFontSize((int) fontSize);
 canvas.drawLine(0, borderY, borderX + 1, borderY, defaultPaint);
 }
 try {
 // request a terminal pty resize
-synchronized (buffer) {
+if (buffer != null) {
-buffer.setScreenSize(columns, rows, true);
+synchronized (buffer) {
+buffer.setScreenSize(columns, rows, true);
+}
 }
 if (transport != null)
 transport.setDimensions(columns, rows, width, height);
 }
 catch (Exception e) {
 Log.e(TAG, "Problem while trying to resize screen or PTY", e);
 }
-// redraw local output if we don't have a sesson to receive our resize request
+// redraw local output if we don't have a session to receive our resize request
 if (transport == null) {
 synchronized (localOutput) {
 buffer.reset();
 for (String line : localOutput)
 buffer.keyPressed(vt320.KEY_RIGHT, ' ', 0);
 else if (result.equals("↑"))
 buffer.keyPressed(vt320.KEY_UP, ' ', 0);
 else if (result.equals("↓"))
 buffer.keyPressed(vt320.KEY_DOWN, ' ', 0);
+else if (result.equals("T"))
+buffer.keyPressed(vt320.KEY_TAB, ' ', 0);
 else if (result.equals("I"))
 buffer.keyPressed(vt320.KEY_INSERT, ' ', 0);
 else if (result.equals("D"))
 buffer.keyPressed(vt320.KEY_DELETE, ' ', 0);
 else if (result.equals("E"))
-buffer.keyTyped(vt320.KEY_ENTER, ' ', 0);
+buffer.keyPressed(vt320.KEY_ENTER, ' ', 0);
-else if (result.equals("T")) {
-try {
-transport.write(0x09);
-}
-catch (IOException e) {
-Log.e(TAG, "Problem with the arrowsDialog", e);
-}
-}
 }
 @Override
 public void onItemClick(AdapterView p, View v, int pos, long id) {
 final String result = String.valueOf(pickerString.charAt(pos));
 buttonPressed(result);
 else if (result.equals("9"))
 key = vt320.KEY_F9;
 else if (result.equals("0"))
 key = vt320.KEY_F10;
-if (key != 0)
+if (key != 0) buffer.keyPressed(key, ' ', 0);
-buffer.keyPressed(key, ' ', 0);
 dismiss();
 }
 @Override
 public void onItemClick(AdapterView p, View v, int pos, long id) {
 if (keyListener.isSymKey(keyCode) ||
 keyCode == KeyEvent.KEYCODE_BACK) {
 dismiss();
 return true;
 }
+}
-//                  return keyListener.onKey(parent, event.getKeyCode(), event);
-}
 return super.dispatchKeyEvent(event);
 }
 };
 cpd.show();
 return true;

Mercurial > 510Connectbot

comparison src/com/five_ten_sg/connectbot/service/TerminalBridge.java @ 79:01d939969b10