aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2009-07-10 08:18:17 +0000
committerKenny Root <kenny@the-b.org>2009-07-10 08:18:17 +0000
commit20a8d25fa23fc70ebbc09be5e3c6e995503be5da (patch)
tree526190420331fbd7bf7d3f81c58c0f003b78c194
parent0c34ade7797da3f8a912220c0cd04f3ea1e69bf0 (diff)
downloadconnectbot-20a8d25fa23fc70ebbc09be5e3c6e995503be5da.tar.gz
connectbot-20a8d25fa23fc70ebbc09be5e3c6e995503be5da.tar.bz2
connectbot-20a8d25fa23fc70ebbc09be5e3c6e995503be5da.zip
Fix some tabs that snuck into vt320
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@368 df292f66-193f-0410-a5fc-6d59da041ff2
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/de/mud/terminal/vt320.java19
2 files changed, 10 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 11933a0..c26d35e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.connectbot"
android:versionName="1.6-dev"
- android:versionCode="173">
+ android:versionCode="174">
<application
android:icon="@drawable/icon"
diff --git a/src/de/mud/terminal/vt320.java b/src/de/mud/terminal/vt320.java
index bdafefd..f628cd4 100644
--- a/src/de/mud/terminal/vt320.java
+++ b/src/de/mud/terminal/vt320.java
@@ -92,13 +92,13 @@ public abstract class vt320 extends VDUBuffer implements VDUInput {
char c;
for (int i = 0; i < len; i++) {
- c = s[start + i];
- // Shortcut for my favorite ASCII
- if (c <= 0x7F) {
- if (lastChar != -1)
- putChar((char) lastChar, false);
- lastChar = c;
- } else if (!Character.isLowSurrogate(c) && !Character.isHighSurrogate(c)) {
+ c = s[start + i];
+ // Shortcut for my favorite ASCII
+ if (c <= 0x7F) {
+ if (lastChar != -1)
+ putChar((char) lastChar, false);
+ lastChar = c;
+ } else if (!Character.isLowSurrogate(c) && !Character.isHighSurrogate(c)) {
if (Character.getType(c) == Character.NON_SPACING_MARK) {
if (lastChar != -1) {
char nc = Precomposer.precompose((char) lastChar, c);
@@ -106,11 +106,11 @@ public abstract class vt320 extends VDUBuffer implements VDUInput {
lastChar = -1;
}
} else {
- if (lastChar != -1)
+ if (lastChar != -1)
putChar((char) lastChar, false);
lastChar = c;
}
- }
+ }
}
if (lastChar != -1)
@@ -1525,7 +1525,6 @@ public void setScreenSize(int c, int r, boolean broadcast) {
// //return;
// }
-
switch (term_state) {
case TSTATE_DATA:
/* FIXME: we shouldn't use chars with bit 8 set if ibmcharset.