the ACS is finally correct.

This commit is contained in:
Christopher Jeffrey 2015-01-29 21:53:06 -08:00
parent 547812928e
commit 0386f8b5d6
1 changed files with 12 additions and 16 deletions

View File

@ -1080,21 +1080,18 @@ Screen.prototype.draw = function(start, end) {
// supports UTF8, but I imagine it's unlikely. // supports UTF8, but I imagine it's unlikely.
// Maybe remove !this.tput.unicode check, however, // Maybe remove !this.tput.unicode check, however,
// this seems to be the way ncurses does it. // this seems to be the way ncurses does it.
// if (this.tput.strings.enter_alt_charset_mode && !this.tput.brokenACS) { if (this.tput.strings.enter_alt_charset_mode && !this.tput.brokenACS) {
if (this.tput.strings.enter_alt_charset_mode) { if (this.tput.acscr[ch]) {
if (!this.tput.brokenACS) { if (acs) {
if (this.tput.acscr[ch]) { ch = this.tput.acscr[ch];
if (acs) { } else {
ch = this.tput.acscr[ch]; ch = this.tput.smacs()
} else { + this.tput.acscr[ch];
ch = this.tput.smacs() acs = true;
+ this.tput.acscr[ch];
acs = true;
}
} else if (acs) {
ch = this.tput.rmacs() + ch;
acs = false;
} }
} else if (acs) {
ch = this.tput.rmacs() + ch;
acs = false;
} }
} else { } else {
// U8 is not consistently correct. Some terminfo's // U8 is not consistently correct. Some terminfo's
@ -1104,8 +1101,7 @@ Screen.prototype.draw = function(start, end) {
// are it does not support UTF8. This is probably // are it does not support UTF8. This is probably
// the "safest" way to do this. Should fix things // the "safest" way to do this. Should fix things
// like sun-color. // like sun-color.
// if ((!this.unicode || this.tput.numbers.U8 !== 1) && ch > '~') { if ((!this.tput.unicode || this.tput.numbers.U8 !== 1) && ch > '~') {
if ((!this.unicode || this.tput.numbers.U8 !== 1) && this.tput.utoa[ch]) {
ch = this.tput.utoa[ch] || '?'; ch = this.tput.utoa[ch] || '?';
} }
} }