Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932266AbWBSXUs (ORCPT ); Sun, 19 Feb 2006 18:20:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932283AbWBSXUs (ORCPT ); Sun, 19 Feb 2006 18:20:48 -0500 Received: from sunrise.pg.gda.pl ([153.19.40.230]:15807 "EHLO sunrise.pg.gda.pl") by vger.kernel.org with ESMTP id S932266AbWBSXUr (ORCPT ); Sun, 19 Feb 2006 18:20:47 -0500 Date: Mon, 20 Feb 2006 00:19:35 +0100 From: Adam Tla/lka To: "Alexander E. Patrakov" Cc: torvalds@osdl.org, LKML Subject: [PATCH]console:UTF-8 mode compatibility fixes - new version Message-ID: <20060219231934.GB15459@sunrise.pg.gda.pl> References: <20060217233333.GA5208@sunrise.pg.gda.pl> <43F72C7A.8010709@ums.usu.ru> <43F8054E.1000805@ums.usu.ru> <20060219101512.GB862@sunrise.pg.gda.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060219101512.GB862@sunrise.pg.gda.pl> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5666 Lines: 160 Corrected and optimized version of the first patch - continuation bytes and the first byte of the scanned UTF-8 sequence are not memorized because with current console design this information is unsable. Description: Fixed UTF-8 mode so alternate charset modes always work according to control sequences interpreted in do_con_trol function: smacs = '\x0e', rmacs = '\x0f' if vt100 translation map for alternate charset is active which means enacs = '\e)0' preserving backward US-ASCII and VT100 semigraphics compatibility. Malformed UTF sequences are represented as sequences of replacement glyphs, original codes or '?' as a last resort if replacement glyph is undefined which is a bad console state but something should be displayed if UCS-2 code represents displayable char. Signed-off-by: Adam Tla/lka --- drivers/char/vt_orig.c 2006-02-13 11:33:54.000000000 +0100 +++ drivers/char/vt.c 2006-02-19 23:50:00.000000000 +0100 @@ -63,6 +63,15 @@ * * Removed console_lock, enabled interrupts across all console operations * 13 March 2001, Andrew Morton + * + * Fixed UTF-8 mode so alternate charset modes always work according + * to control sequences interpreted in do_con_trol function: + * smacs = '\x0e', rmacs = '\x0f' if vt100 translation map for alternate + * charset is active which means enacs = '\e)0' + * preserving backward US-ASCII and VT100 semigraphics compatibility, + * malformed UTF sequences represented as sequences of replacement glyphs, + * original codes or '?' as a last resort if replacement glyph is undefined + * by Adam Tla/lka , Feb 2006 */ #include @@ -1991,17 +2000,23 @@ static int do_con_write(struct tty_struc /* Do no translation at all in control states */ if (vc->vc_state != ESnormal) { tc = c; - } else if (vc->vc_utf) { + } else if (vc->vc_utf && !vc->vc_disp_ctrl) { /* Combine UTF-8 into Unicode */ - /* Incomplete characters silently ignored */ + /* Malformed sequence represented as replacement glyphs */ +rescan_last_byte: if(c > 0x7f) { - if (vc->vc_utf_count > 0 && (c & 0xc0) == 0x80) { - vc->vc_utf_char = (vc->vc_utf_char << 6) | (c & 0x3f); - vc->vc_utf_count--; - if (vc->vc_utf_count == 0) - tc = c = vc->vc_utf_char; - else continue; + if (vc->vc_utf_count) { + if ((c & 0xc0) == 0x80) { + vc->vc_utf_char = (vc->vc_utf_char << 6) | (c & 0x3f); + if (--vc->vc_utf_count) { + vc->vc_npar++; + continue; + } + tc = c = vc->vc_utf_char; + } else + goto insert_replacement_glyph; } else { + vc->vc_npar = 0; if ((c & 0xe0) == 0xc0) { vc->vc_utf_count = 1; vc->vc_utf_char = (c & 0x1f); @@ -2018,12 +2033,13 @@ static int do_con_write(struct tty_struc vc->vc_utf_count = 5; vc->vc_utf_char = (c & 0x01); } else - vc->vc_utf_count = 0; + goto insert_replacement_glyph; continue; } } else { + if (vc->vc_utf_count) + goto insert_replacement_glyph; tc = c; - vc->vc_utf_count = 0; } } else { /* no utf */ tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c]; @@ -2040,31 +2056,41 @@ static int do_con_write(struct tty_struc * direct-to-font zone in UTF-8 mode. */ ok = tc && (c >= 32 || - (!vc->vc_utf && !(((vc->vc_disp_ctrl ? CTRL_ALWAYS - : CTRL_ACTION) >> c) & 1))) + !(vc->vc_disp_ctrl ? (CTRL_ALWAYS >> c) & 1 : + vc->vc_utf || ((CTRL_ACTION >> c) & 1))) && (c != 127 || vc->vc_disp_ctrl) && (c != 128+27); if (vc->vc_state == ESnormal && ok) { /* Now try to find out how to display it */ tc = conv_uni_to_pc(vc, tc); - if ( tc == -4 ) { + if ( tc & ~charmask ) { + if ( tc == -4 ) { /* If we got -4 (not found) then see if we have defined a replacement character (U+FFFD) */ - tc = conv_uni_to_pc(vc, 0xfffd); +insert_replacement_glyph: + tc = conv_uni_to_pc(vc, 0xfffd); /* One reason for the -4 can be that we just did a clear_unimap(); try at least to show something. */ - if (tc == -4) - tc = c; - } else if ( tc == -3 ) { + if (tc & ~charmask) { + if (c & ~charmask) + tc = '?'; + else + tc = c; + } + } else if ( tc == -3 ) { /* Bad hash table -- hope for the best */ - tc = c; + if (c & ~charmask) + tc = '?'; + else + tc = c; + } else + continue; /* Conversion failed */ } - if (tc & ~charmask) - continue; /* Conversion failed */ +repeat_replacement_glyph: if (vc->vc_need_wrap || vc->vc_decim) FLUSH if (vc->vc_need_wrap) { @@ -2088,6 +2114,15 @@ static int do_con_write(struct tty_struc vc->vc_x++; draw_to = (vc->vc_pos += 2); } + if (vc->vc_utf_count) { + if (vc->vc_npar) { + vc->vc_npar--; + goto repeat_replacement_glyph; + } + vc->vc_utf_count = 0; + c = orig; + goto rescan_last_byte; + } continue; } FLUSH - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/