moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixes to some cursor movement... starting to come together a little

This commit is contained in:
Bryan Ashby 2015-05-28 11:03:20 -06:00
parent 5a6b283923
commit 59e7c661a7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/multi_line_edit_text_view.js
View File

@ -182,10 +182,12 @@ function MultiLineEditTextView(options) {
pos += 1; pos += 1;
} }
} }
pos += self.renderBuffer[row] pos += self.renderBuffer[row]
.replace(replaceTabsRe, '\t')
.slice(0, Math.min(col, self.dimens.width)) .slice(0, Math.min(col, self.dimens.width))
.replace(replaceTabsRe, '\t')
.length; .length;
return pos; return pos;
}; };
@ -237,7 +239,7 @@ function MultiLineEditTextView(options) {
} }
var endOfLinePos = self.getEndOfLinePosition(); var endOfLinePos = self.getEndOfLinePosition();
console.log('col=' + self.cursorPos.col + ' / eolPos=' + endOfLinePos) //console.log('col=' + self.cursorPos.col + ' / eolPos=' + endOfLinePos)
if(self.cursorPos.col > endOfLinePos) { if(self.cursorPos.col > endOfLinePos) {
self.client.term.write(ansi.right(self.cursorPos.col - endOfLinePos)); self.client.term.write(ansi.right(self.cursorPos.col - endOfLinePos));
self.cursorPos.col = endOfLinePos; self.cursorPos.col = endOfLinePos;
@ -251,14 +253,17 @@ function MultiLineEditTextView(options) {
}; };
this.cursorRight = function() { this.cursorRight = function() {
var max = Math.min(self.dimens.width, self.getLineTextLength(self.cursorPos.row) - 1); var rowVisibleLen = self.renderBuffer[self.cursorPos.row].replace(/\n/g, '').length;
var max = Math.min(self.dimens.width, rowVisibleLen - 1);//selfself.getLineTextLength(self.cursorPos.row) - 1);
console.log('self.dimens.width: ' + self.dimens.width + ' / lineLength: ' + (self.getLineTextLength(self.cursorPos.row) - 1))
if(self.cursorPos.col < max) { if(self.cursorPos.col < max) {
self.cursorPos.col++; self.cursorPos.col++;
self.client.term.write(ansi.right()); self.client.term.write(ansi.right());
// make tab adjustment if necessary // make tab adjustment if necessary
if('\t' === self.getCharAtCursorPosition()) { if('\t' === self.getCharAtCursorPosition()) {
self.cursorPos.col++; //self.cursorPos.col++;
self.cursorPos.col += (self.tabWidth - 1);
self.client.term.write(ansi.right(self.tabWidth - 1)); self.client.term.write(ansi.right(self.tabWidth - 1));
} }
} else { } else {