Mercurial > 510Connectbot

changeset 65:9a6335a203b2 tn5250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow host override terminal type
author Carl Byington <carl@five-ten-sg.com>
date Fri, 13 Jun 2014 16:14:01 -0700
parents c8f45608d94c
children cb99bc2964c5
files res/xml/preferences.xml src/com/five_ten_sg/connectbot/service/TerminalBridge.java
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/res/xml/preferences.xml	Fri Jun 13 16:00:12 2014 -0700
+++ b/res/xml/preferences.xml	Fri Jun 13 16:14:01 2014 -0700
@@ -52,7 +52,7 @@
 			android:summary="@string/pref_emulation_summary"
 			android:entries="@array/list_emulation_modes"
 			android:entryValues="@array/list_emulation_modes"
-			android:defaultValue="xterm"
+			android:defaultValue="xterm-256color"
 			/>
 
 		<EditTextPreference
--- a/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Fri Jun 13 16:00:12 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Fri Jun 13 16:14:01 2014 -0700
@@ -95,7 +95,7 @@
 
     private Relay relay;
 
-    private final String emulation;
+    private final String emulation;     // aka answerback string, aka terminal type
 
     public Bitmap bitmap = null;
     public vt320  buffer = null;
@@ -172,7 +172,8 @@
         float hostFontSize;
         this.manager = manager;
         this.host = host;
-        emulation = manager.getEmulation();
+        emulation = host.gethostEmulation();
+        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