embarklabs
/
neo-blessed
mirror of https://github.com/embarklabs/neo-blessed.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve charWidth and strWidth.

This commit is contained in:
Christopher Jeffrey 2015-04-30 23:09:09 -07:00
parent 4ce0df57da
commit 23567a75ab
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/unicode.js
View File

@ -118,6 +118,21 @@ exports.charWidth = function(str, i) {
// nul
if (point === 0) return 0;
// tab
if (point === 0x09) {
if (!exports.blessed) {
exports.blessed = require('../');
}
return exports.blessed.screen.global
? exports.blessed.screen.global.tabc.length
: 8;
}
// 8-bit control characters (2-width according to unicode??)
if (point < 32 || (point >= 0x7f && point < 0xa0)) {
return 0;
}
// search table of non-spacing characters
// is ucs combining or C0/C1 control character
if (exports.combining[point]) {

6
lib/widget.js
View File

@ -5972,9 +5972,9 @@ Textarea.prototype._updateCursor = function(get) {
};
Textarea.prototype._strWidth = function(str) {
if (!this.screen.fullUnicode) return str.length;
str = str.replace(/\x03/g, '');
return unicode.strWidth(str, 0);
return this.screen.fullUnicode
? unicode.strWidth(str)
: str.length;
};
Textarea.prototype.input =