Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0b79882 authored by Samuel Thibault's avatar Samuel Thibault Committed by Linus Torvalds
Browse files

Revert "console ASCII glyph 1:1 mapping" 



This reverts commit 1c55f187.

Ingo Brueckl was assuming that reverting to 1:1 mapping for chars >= 128
was not useful, but it happens to be: due to the limitations of the
Linux console, when a blind user wants to read BIG5 on it, he has no
other way than loading a font without SFM and let the 1:1 mapping permit
the screen reader to get the BIG5 encoding.

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42a17ad2

drivers/char/vt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2274,7 +2274,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co 
				    continue; /* nothing to display */

				    continue; /* nothing to display */

				}

				}

				/* Glyph not found */

				/* Glyph not found */

				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {

				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {

				    /* In legacy mode use the glyph we get by a 1:1 mapping.

				    /* In legacy mode use the glyph we get by a 1:1 mapping.

				       This would make absolutely no sense with Unicode in mind,

				       This would make absolutely no sense with Unicode in mind,

				       but do this for ASCII characters since a font may lack

				       but do this for ASCII characters since a font may lack