diff options
| -rw-r--r-- | package-lock.json | 21 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | util/ansi.js | 19 |
3 files changed, 38 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index d020d44..aa06ee1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,27 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "^1.0.2" + } + }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "requires": { + "defaults": "^1.0.3" + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/package.json b/package.json index 2d55077..da401ed 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "author": "Florrie <towerofnix@gmail.com>", "license": "GPL-3.0", "dependencies": { + "wcwidth": "^1.0.1", "word-wrap": "^1.2.3" } } diff --git a/util/ansi.js b/util/ansi.js index 04722c0..f0d7bf7 100644 --- a/util/ansi.js +++ b/util/ansi.js @@ -1,3 +1,5 @@ +const wcwidth = require('wcwidth') + const ESC = '\x1b' const isDigit = char => '0123456789'.indexOf(char) >= 0 @@ -138,6 +140,7 @@ const ansi = { for (let charI = 0; charI < text.length; charI++) { const cursorIndex = (cursorRow - 1) * scrCols + (cursorCol - 1) + if (text[charI] === ESC) { charI++ @@ -170,8 +173,8 @@ const ansi = { // CUP - Cursor Position (moveCursor) if (text[charI] === 'H') { - cursorRow = args[0] - cursorCol = args[1] + cursorRow = parseInt(args[0]) + cursorCol = parseInt(args[1]) } // SM - Set Mode @@ -264,7 +267,17 @@ const ansi = { char: text[charI], attributes } - cursorCol++ + // Some characters take up multiple columns, e.g. Japanese text. Take + // this into consideration when drawing. + const charColumns = wcwidth(text[charI]) + cursorCol += charColumns + + // If the character takes up 2+ columns, treat columns past the first + // one (where the character is) as empty. (Note this is different from + // "blank", which represents an empty space character ' '.) + for (let i = 1; i < charColumns; i++) { + chars[cursorIndex + i] = {char: '', attributes: []} + } if (cursorCol > scrCols) { cursorCol = 1 |