*
* The MIT License (MIT)
*
- * Copyright (C) 2017 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
import java.util.List;
import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
/**
* A Line represents a single line of text on the screen, as a collection of
* @return the number of cells needed to display this line
*/
public int getDisplayLength() {
- int n = rawText.length();
+ int n = StringUtils.width(rawText.toString());
// For now just return the raw text length.
if (n > 0) {
words.clear();
Word word = new Word(this.defaultColor, this.highlighter);
words.add(word);
- for (int i = 0; i < rawText.length(); i++) {
- char ch = rawText.charAt(i);
+ for (int i = 0; i < rawText.length();) {
+ int ch = rawText.codePointAt(i);
+ i += Character.charCount(ch);
Word newWord = word.addChar(ch);
if (newWord != word) {
words.add(newWord);
if (cursor == 0) {
return false;
}
- cursor--;
+ cursor -= StringUtils.width(rawText.codePointAt(cursor - 1));
return true;
}
if (cursor == getDisplayLength() - 1) {
return false;
}
- cursor++;
+ if (cursor < getDisplayLength()) {
+ cursor += StringUtils.width(rawText.codePointAt(cursor));
+ } else {
+ cursor++;
+ }
return true;
}
assert (words.size() > 0);
if (cursor < getDisplayLength()) {
- rawText.deleteCharAt(cursor);
+ for (int i = 0; i < Character.charCount(rawText.charAt(cursor)); i++) {
+ rawText.deleteCharAt(cursor);
+ }
}
// Re-scan the line to determine the new word boundaries.
*
* @param ch the character to insert
*/
- public void addChar(final char ch) {
+ public void addChar(final int ch) {
if (cursor < getDisplayLength() - 1) {
- rawText.insert(cursor, ch);
+ rawText.insert(cursor, Character.toChars(ch));
} else {
- rawText.append(ch);
+ rawText.append(Character.toChars(ch));
}
scanLine();
cursor++;
*
* @param ch the character to replace
*/
- public void replaceChar(final char ch) {
+ public void replaceChar(final int ch) {
if (cursor < getDisplayLength() - 1) {
- rawText.setCharAt(cursor, ch);
+ for (int i = 0; i < Character.charCount(rawText.charAt(cursor)); i++) {
+ rawText.deleteCharAt(cursor);
+ }
+ rawText.insert(cursor, Character.toChars(ch));
} else {
- rawText.append(ch);
+ rawText.append(Character.toChars(ch));
}
scanLine();
cursor++;