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

* Quite a few movement improvements

This commit is contained in:
Bryan Ashby 2015-05-30 22:03:33 -06:00
parent b3848b4dca
commit 69bb7e6302
1 changed files with 90 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
core/multi_line_edit_text_view.js
View File

@ -207,26 +207,46 @@ function MultiLineEditTextView(options) {
return self.renderBuffer[row].replace(/\n/g, '').length; return self.renderBuffer[row].replace(/\n/g, '').length;
}; };
// :TODO: this name makes no sense...
this.getLineTextLengthToColumn = function(row, col) { this.getLineTextLengthToColumn = function(row, col) {
return self.renderBuffer[row].replace(self.getReplaceTabsRegExp(), '\t').replace(/\n/g, '').slice(0, col).length; return self.renderBuffer[row].replace(self.getReplaceTabsRegExp(), '\t').replace(/\n/g, '').slice(0, col).length;
}; };
this.getEndOfLinePosition = function(row) { this.getEndOfLineColumn = function(row) {
row = row || self.cursorPos.row; if(!_.isNumber(row)) {
return self.position.col + self.getLineTextLength(row); row = self.cursorPos.row;
}
return self.getLineTextLength(row);
}; };
this.getAbsolutePosition = function(row, col) { this.getAbsolutePosition = function(row, col) {
row = row || self.cursorPos.row; if(!_.isNumber(row)) {
col = col || self.cursorPos.col; row = self.cursorPos.row;
}
if(!_.isNumber(col)) {
col = self.cursorPos.col;
}
return { row : self.position.row + row, col : self.position.col + col }; return { row : self.position.row + row, col : self.position.col + col };
}; };
// :TODO: rename this to show it is the *buffer*
this.getCharAtCursorPosition = function() { this.getCharAtCursorPosition = function() {
var pos = self.getTextBufferPosition(self.cursorPos.row, self.cursorPos.col); var pos = self.getTextBufferPosition(self.cursorPos.row, self.cursorPos.col);
return self.textBuffer.get(pos); return self.textBuffer.get(pos);
}; };
this.getRenderCharAtRowAndColumn = function(row, col) {
return self.renderBuffer[row][col];
};
this.getRenderCharAtCursorPosition = function() {
return self.getRenderCharAtRowAndColumn(self.cursorPos.row, self.cursorPos.col);
};
this.getRemainingRowsFromCurrent = function() {
return Math.min(self.dimens.height, self.renderBuffer.length) - (self.cursorPos.row + 1);
};
this.moveCursorTo = function(row, col) { this.moveCursorTo = function(row, col) {
var absPos = self.getAbsolutePosition(row, col); var absPos = self.getAbsolutePosition(row, col);
self.client.term.write(ansi.goto(absPos.row, absPos.col)); self.client.term.write(ansi.goto(absPos.row, absPos.col));
@ -240,35 +260,16 @@ function MultiLineEditTextView(options) {
}; };
this.cursorUp = function() {
if(self.cursorPos.row > 0) {
self.cursorPos.col = self.getLineTextLengthToColumn(self.cursorPos.row, self.cursorPos.col);
self.cursorPos.row--;
self.client.term.write(ansi.up());
} else if(self.topLineIndex > 0) {
// :TODO: scroll up if possible to do so
}
var endOfLinePos = self.getEndOfLinePosition();
//console.log('col=' + self.cursorPos.col + ' / eolPos=' + endOfLinePos)
if(self.cursorPos.col > endOfLinePos) {
self.client.term.write(ansi.right(self.cursorPos.col - endOfLinePos));
self.cursorPos.col = endOfLinePos;
}
// :TODO: if there is text @ cursor y position we're ok, otherwise,
// jump to the end of the line
};
this.cursorMoveJumpTab = function(cursorDir) { this.cursorMoveJumpTab = function(cursorDir) {
assert('\t' === self.getCharAtCursorPosition()); if('\t' !== self.getRenderCharAtCursorPosition()) {
return; // nothing to do
}
// //
// A few scenarios: // A few scenarios:
// * Cursor just moved up or down and we got dumped in the middle of a tab sequence. Always jump right here. // * Cursor just moved up or down and we got dumped in the middle of a tab sequence.
// :TODO: document: Jump to nearest tab right/left. This needs some more research
// * Cursor moved left or right: We should be on the first \t in either direction & need to jump // * Cursor moved left or right: We should be on the first \t in either direction & need to jump
// * Tabs may expand to start/end of line -- in this case we should move to the next line // * Tabs may expand to start/end of line -- in this case we should move to the next line
// //
@ -302,22 +303,68 @@ function MultiLineEditTextView(options) {
// We're going to move right, but we need to know where we're at in // We're going to move right, but we need to know where we're at in
// in the render buffer expanded tabs // in the render buffer expanded tabs
// //
var pos = self.cursorPos.col; // :TODO: This is not right -- we need to move to *nearest*. Research how
// sublime/etc. treat this
var col = self.cursorPos.col;
var prevTabs = 0; var prevTabs = 0;
while('\t' === self.renderBuffer[pos--]) { while('\t' === self.getRenderCharAtRowAndColumn(self.cursorPos.row, col--)) {
prevTabs++; prevTabs++;
} }
console.log(prevTabs)
//console.log('prevTabs: ' + prevTabs)
var adjust = self.tabWidth - prevTabs;
self.cursorPos.col += adjust;
self.client.term.write(ansi.right(adjust));
break; break;
} }
}; };
this.adjustColumnToEndOfLine = function() {
var eolColumn = self.getEndOfLineColumn();
if(self.cursorPos.col > eolColumn) {
self.cursorPos.col = eolColumn;
var absPos = self.getAbsolutePosition(self.cursorPos.row, eolColumn);
self.client.term.write(ansi.goto(absPos.row, absPos.col));
}
};
this.cursorUp = function() {
if(self.cursorPos.row > 0) {
self.cursorPos.row--;
self.client.term.write(ansi.up());
self.cursorMoveJumpTab('up');
} else if(self.topLineIndex > 0) {
// :TODO: scroll up if possible to do so
}
// adjust to EOL position if needed
self.adjustColumnToEndOfLine();
};
this.cursorDown = function() { this.cursorDown = function() {
var lastRow = self.dimens.height - self.position.row; // :TODO: should be calculated elsewhere if(self.getRemainingRowsFromCurrent() > 0) {
if(self.cursorPos.row > lastRow) {
self.cursorPos.col = self.getLineTextLengthToColumn(self.cursorPos.row, self.cursorPos.col);
self.cursorPos.row++; self.cursorPos.row++;
self.client.term.write(ansi.down()); self.client.term.write(ansi.down());
self.cursorMoveJumpTab('down');
} else {
// :TODO: scroll if possible
}
// adjust to EOL position if needed
self.adjustColumnToEndOfLine();
};
this.cursorLeft = function() {
if(self.cursorPos.col > 0) {
self.cursorPos.col--;
self.client.term.write(ansi.left());
self.cursorMoveJumpTab('left');
} else {
self.cursorToEndOfPreviousLine();
} }
}; };
@ -330,28 +377,9 @@ function MultiLineEditTextView(options) {
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()) { self.cursorMoveJumpTab('right');
self.cursorMoveJumpTab('right');
//self.cursorPos.col += (self.tabWidth - 1);
//self.client.term.write(ansi.right(self.tabWidth - 1));
}
} else { } else {
// :TODO: completely backwards -- should go down self.cursorToStartOfNextLine();
if(self.cursorPos.row > 0) {
self.cursorPos.row--;
self.cursorPos.col = 0;
self.moveCursorTo(self.cursorPos.row, self.cursorPos.col);
}
}
};
this.cursorToStartOfPreviousLine = function() {
if(self.cursorPos.row > 0) {
self.cursorPos.row--;
self.cursorPos.col = 0;
self.moveCursorTo(self.cursorPos.row, self.cursorPos.col);
} else {
// can we scroll up?
} }
}; };
@ -366,26 +394,16 @@ function MultiLineEditTextView(options) {
}; };
this.cursorToStartOfNextLine = function() { this.cursorToStartOfNextLine = function() {
}; if(self.getRemainingRowsFromCurrent() > 0) {
self.cursorPos.row++;
this.cursorLeft = function() { self.cursorPos.col = 0;
if(self.cursorPos.col > 0) { self.moveCursorTo(self.cursorPos.row, self.cursorPos.col);
self.cursorPos.col--;
self.client.term.write(ansi.left());
if('\t' === self.getCharAtCursorPosition()) {
self.cursorMoveJumpTab('left');
}
} else { } else {
self.cursorToEndOfPreviousLine(); // :TODO: can we scroll??
/*if(self.cursorPos.row > 0) {
self.cursorPos.row--;
self.cursorPos.col = self.renderBuffer[self.cursorPos.row].length;
}
*/
} }
}; };
this.getLineIndex = function() { this.getLineIndex = function() {
return self.topLineIndex + self.cursorPos.row; return self.topLineIndex + self.cursorPos.row;
}; };