* moved all terminal logic into a Service backend. connections are held in place by a TerminalBridge, which keeps the connection alive and renders the screen to a

bitmap if provided.  a Console creates TerminalViews for each bridge while it is active, and handles panning back/forth between them.

* volume up/down controls will change console font size
* extended trilead library to support resizePTY() command
* left/right screen gestures will pan between various open consoles
* up/down screen gestures on right-half will look through scrollback buffer
* up/down screen gestures on left-half will trigger pageup/down keys

* broke ctrl+ keyboard mapping, will need to bring back over from older code

1 files changed, 25 insertions, 4 deletions

diff --git a/src/org/theb/ssh/HostDbProvider.java b/src/org/theb/ssh/HostDbProvider.java
index ecb0eed..f3bdbd5 100644
--- a/src/org/theb/ssh/HostDbProvider.java
+++ b/src/org/theb/ssh/HostDbProvider.java
@@ -43,7 +43,7 @@ public class HostDbProvider extends ContentProvider {
 	
 	private static final String TAG = "HostDbProvider";
 	private static final String DATABASE_NAME = "ssh_hosts.db";
-	private static final int DATABASE_VERSION = 2;
+	private static final int DATABASE_VERSION = 3;
 	
 	private static HashMap<String, String> HOSTS_LIST_PROJECTION_MAP;
 	
@@ -61,9 +61,15 @@ public class HostDbProvider extends ContentProvider {
 
 		@Override
 		public void onCreate(SQLiteDatabase db) {
-			db.execSQL("CREATE TABLE hosts (_id INTEGER PRIMARY KEY,"
-					+ "hostname TEXT," + "username TEXT," + "port INTEGER,"
-					+ "hostkey TEXT" + ")");
+			db.execSQL("CREATE TABLE hosts (_id INTEGER PRIMARY KEY," +
+					"nickname TEXT," +
+					"hostname TEXT," +
+					"username TEXT," +
+					"port INTEGER," +
+					"emulation TEXT," +
+					"scrollback INTEGER," +
+					"hostkey TEXT" +
+					")");
 		}
 
 		@Override
@@ -127,6 +133,10 @@ public class HostDbProvider extends ContentProvider {
 			throw new IllegalArgumentException("Unknown Insert " + uri);
 		}
 		*/
+		if (values.containsKey(HostDb.Hosts.NICKNAME) == false) {
+			values.put(HostDb.Hosts.NICKNAME, "");
+		}
+
 		if (values.containsKey(HostDb.Hosts.HOSTNAME) == false) {
 			values.put(HostDb.Hosts.HOSTNAME, "");
 		}
@@ -143,6 +153,14 @@ public class HostDbProvider extends ContentProvider {
 			values.put(HostDb.Hosts.HOSTKEY, "");
 		}
 		
+		if (values.containsKey(HostDb.Hosts.EMULATION) == false) {
+			values.put(HostDb.Hosts.EMULATION, "");
+		}
+
+		if (values.containsKey(HostDb.Hosts.SCROLLBACK) == false) {
+			values.put(HostDb.Hosts.SCROLLBACK, "");
+		}
+		
 		rowID = mDB.insert("hosts", "host", values);
 		if (rowID > 0) {
 			Uri newUri = ContentUris.withAppendedId(HostDb.Hosts.CONTENT_URI, rowID);
@@ -228,9 +246,12 @@ public class HostDbProvider extends ContentProvider {
 		
 		HOSTS_LIST_PROJECTION_MAP = new HashMap<String, String>();
 		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts._ID, "_id");
+		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.NICKNAME, "nickname");
 		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.HOSTNAME, "hostname");
 		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.USERNAME, "username");
 		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.PORT, "port");
 		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.HOSTKEY, "hostkey");
+		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.EMULATION, "emulation");
+		HOSTS_LIST_PROJECTION_MAP.put(HostDb.Hosts.SCROLLBACK, "scrollback");
 	}
 }