Consider ambiguous-width chars if VTE_CJK_WIDTH env var is set and we are

2007-04-17  Behdad Esfahbod  <behdad@gnome.org>

        * src/iso2022.c (_vte_iso2022_ambiguous_width): Consider
        ambiguous-width chars if VTE_CJK_WIDTH env var is set and we are
        under a CJK locale.


svn path=/trunk/; revision=1873

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d4da39..a9c757e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-17  Behdad Esfahbod  <behdad@gnome.org>
+
+	* src/iso2022.c (_vte_iso2022_ambiguous_width): Consider
+	ambiguous-width chars if VTE_CJK_WIDTH env var is set and we are
+	under a CJK locale.
+
 2007-03-12  Behdad Esfahbod  <behdad@gnome.org>
 
 	Released vte-0.16.1.
diff --git a/src/iso2022.c b/src/iso2022.c
index c9ae28e..3f2b095 100644
--- a/src/iso2022.c
+++ b/src/iso2022.c
@@ -399,6 +399,13 @@ _vte_iso2022_ambiguous_width(struct _vte_iso2022_state *state)
 		}
 	}
 
+	/*
+	 * Decide the ambiguous width according to the default region if 
+	 * current locale is UTF-8.
+	 */
+	if (strcmp (codeset, "utf8") == 0 && g_getenv("VTE_CJK_WIDTH") != NULL)
+	  return _vte_iso2022_ambiguous_width_guess ();
+
 	/* Not in the list => not wide. */
 	return 1;
 }