special case the rest of the graphic characters in the way we already dovte_0_10_24

* src/iso2022.c: special case the rest of the graphic characters in the way we
	already do for the 0x2500-0x257f range.  It's still wrong, but at least
	now it's consistent (Red Hat #84783).

3 files changed, 75 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a4e103b4..8efdadaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,22 @@
-2003-02-20
+2003-02-21 nalin
+	* src/iso2022.c: special case the rest of the graphic characters in
+	the way we already do for the 0x2500-0x257f range.  It's still wrong,
+	but at least now it's consistent (Red Hat #84783).
+	
+2003-02-20 nalin
 	* src/keymap.c: pull up from HEAD to get proper fix for Ctrl+digit
 	keys, which shouldn't break Meta+digit keys (#106667).
 
-2003-02-20
+2003-02-20 nalin
 	* src/vte.c: fix gratuitous IM resetting, don't mess with the IM when
 	we're not realized and it's a NULL pointer.  From HEAD.
 
-2003-02-20
+2003-02-20 nalin
 	* src/vte.c(vte_terminal_draw_row): fix "jittering" when the left edge
 	of the row we're drawing is the right half of a multicolumn character.
 	From HEAD.
 
-2003-02-20
+2003-02-20 nalin
 	* src/vte.c(vte_terminal_feed_child): don't reset the input method
 	here -- it may be in the middle of something (Red Hat #81542).  From
 	HEAD.
diff --git a/src/iso2022.c b/src/iso2022.c
index 28be2f35..9a8274fc 100644
--- a/src/iso2022.c
+++ b/src/iso2022.c
@@ -474,6 +474,37 @@ _vte_iso2022_substitute_single(gunichar mapname, gunichar c)
 	if (mapname == '0') {
 		if ((result >= 0x2500) && (result <= 0x257f)) {
 			width = 1;
+		} else
+		switch (c) {
+		case 0x00a3: /* british pound */
+		case 0x00b0: /* degree */
+		case 0x00b1: /* plus/minus */
+		case 0x00b7: /* bullet */
+		case 0x03c0: /* pi */
+		case 0x2190: /* left arrow */
+		case 0x2191: /* up arrow */
+		case 0x2192: /* right arrow */
+		case 0x2193: /* down arrow */
+		case 0x2260: /* != */
+		case 0x2264: /* <= */
+		case 0x2265: /* >= */
+		case 0x23ba: /* scanline 1/9 */
+		case 0x23bb: /* scanline 3/9 */
+		case 0x23bc: /* scanline 7/9 */
+		case 0x23bd: /* scanline 9/9 */
+		case 0x2409: /* HT symbol */
+		case 0x240a: /* LF symbol */
+		case 0x240b: /* VT symbol */
+		case 0x240c: /* FF symbol */
+		case 0x240d: /* CR symbol */
+		case 0x2424: /* NL symbol */
+		case 0x2592: /* checkerboard */
+		case 0x25ae: /* solid rectangle */
+		case 0x25c6: /* diamond */
+			width = 1;
+			break;
+		default:
+			break;
 		}
 	}
 	/* Save the width if one was set. */
@@ -881,6 +912,37 @@ _vte_iso2022_substitute(struct _vte_iso2022 *outside_state,
 			if (current_map == '0') {
 				if ((result >= 0x2500) && (result <= 0x257f)) {
 					width = 1;
+				} else
+				switch (result) {
+				case 0x00a3: /* british pound */
+				case 0x00b0: /* degree */
+				case 0x00b1: /* plus/minus */
+				case 0x00b7: /* bullet */
+				case 0x03c0: /* pi */
+				case 0x2190: /* left arrow */
+				case 0x2191: /* up arrow */
+				case 0x2192: /* right arrow */
+				case 0x2193: /* down arrow */
+				case 0x2260: /* != */
+				case 0x2264: /* <= */
+				case 0x2265: /* >= */
+				case 0x23ba: /* scanline 1/9 */
+				case 0x23bb: /* scanline 3/9 */
+				case 0x23bc: /* scanline 7/9 */
+				case 0x23bd: /* scanline 9/9 */
+				case 0x2409: /* HT symbol */
+				case 0x240a: /* LF symbol */
+				case 0x240b: /* VT symbol */
+				case 0x240c: /* FF symbol */
+				case 0x240d: /* CR symbol */
+				case 0x2424: /* NL symbol */
+				case 0x2592: /* checkerboard */
+				case 0x25ae: /* solid rectangle */
+				case 0x25c6: /* diamond */
+					width = 1;
+					break;
+				default:
+					break;
 				}
 			}
 			/* Save the width if one was set. */
diff --git a/vte.spec b/vte.spec
index be4a7ab5..cfbd15e6 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.10.23
+Version: 0.10.24
 Release: 1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -96,6 +96,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/*.a
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 21 2003 Nalin Dahyabhai <nalin@redhat.com> 0.10.24-1
+- be consistently wrong about the width of ACS characters (#84783)
+
 * Fri Feb 21 2003 Nalin Dahyabhai <nalin@redhat.com> 0.10.23-1
 - update to 0.10.23
 - don't always perform character centering