From c4130492937a578ed1028c5ced31c45ec0c1030e Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Fri, 8 Oct 2010 01:18:35 -0500
Subject: Update terminal to use new width measurements

---
 AndroidManifest.xml            | 2 +-
 src/de/mud/terminal/vt320.java | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1732952..193f3f7 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.7.1"
-	android:versionCode="326"
+	android:versionCode="327"
 	android:installLocation="auto">
 
 	<application
diff --git a/src/de/mud/terminal/vt320.java b/src/de/mud/terminal/vt320.java
index fd41a06..80f3856 100644
--- a/src/de/mud/terminal/vt320.java
+++ b/src/de/mud/terminal/vt320.java
@@ -25,6 +25,8 @@
 
 package de.mud.terminal;
 
+import android.text.AndroidCharacter;
+
 import java.util.Properties;
 
 /**
@@ -111,8 +113,11 @@ public abstract class vt320 extends VDUBuffer implements VDUInput {
             if (lastChar != -1)
               putChar((char) lastChar, isWide, false);
             lastChar = c;
-            if (fullwidths != null)
-                isWide = fullwidths[i] == 1;
+            if (fullwidths != null) {
+                final byte width = fullwidths[i];
+                isWide = (width == AndroidCharacter.EAST_ASIAN_WIDTH_WIDE)
+                    || (width == AndroidCharacter.EAST_ASIAN_WIDTH_FULL_WIDTH);
+            }
           }
         }
       }
-- 
cgit v1.2.3