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

* Word wrapping functional with tabs in the mix (at least when adding chars!)

This commit is contained in:
Bryan Ashby 2015-06-11 21:05:52 -06:00
parent 251a4777f6
commit b24cbd9436
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/multi_line_edit_text_view2.js
View File

@ -278,19 +278,17 @@ function MultiLineEditTextView2(options) {
// //
// Nice info here: http://c-for-dummies.com/blog/?p=424 // Nice info here: http://c-for-dummies.com/blog/?p=424
// //
word += self.expandTab(results.wrapped[i].length + word.length, '\t'); word += self.expandTab(results.wrapped[i].length + word.length, '\t') + '\t'
break; break;
} }
addWord(); addWord();
wordStart = re.lastIndex + m[0].length - 1; wordStart = re.lastIndex + m[0].length - 1;
} }
// //
// Remainder // Remainder
// //
console.log(wordStart + ' / ' + s.length)
word = s.substring(wordStart); word = s.substring(wordStart);
addWord(); addWord();
@ -368,7 +366,7 @@ function MultiLineEditTextView2(options) {
// * A lot of this can be used for backspacing also // * A lot of this can be used for backspacing also
// * See how Sublime treats tabs in *non* overtype mode... just overwrite them? // * See how Sublime treats tabs in *non* overtype mode... just overwrite them?
// //
// * Wrapping/etc. breaks with tabs!!! //
if(self.overtypeMode) { if(self.overtypeMode) {
// :TODO: special handing for insert over eol mark? // :TODO: special handing for insert over eol mark?
@ -379,7 +377,6 @@ function MultiLineEditTextView2(options) {
self.insertCharacterInText(c, index, self.cursorPos.col); self.insertCharacterInText(c, index, self.cursorPos.col);
self.cursorPos.col++; self.cursorPos.col++;
var text = self.getText(index);
var cursorOffset; var cursorOffset;
var absPos; var absPos;
@ -393,8 +390,10 @@ function MultiLineEditTextView2(options) {
var wrapped = self.wordWrapSingleLine(self.getOutputText(index, nextEolIndex)); var wrapped = self.wordWrapSingleLine(self.getOutputText(index, nextEolIndex));
var newLines = wrapped.wrapped; var newLines = wrapped.wrapped;
console.log('--------------Newlines') /*console.log('--------------Newlines')
console.log(newLines) console.log(newLines)
console.log('--------------getText')
console.log( [ self.getText(index) ] )*/
// //
// If our cursor was within the bounds of the last wrapped word // If our cursor was within the bounds of the last wrapped word
@ -402,14 +401,10 @@ function MultiLineEditTextView2(options) {
// on the next line. // on the next line.
// //
var lastCol = self.cursorPos.col - 1; var lastCol = self.cursorPos.col - 1;
console.log('lastCol=' + lastCol + ' / firstWrapRange=' + JSON.stringify(wrapped.firstWrapRange))
if(lastCol >= wrapped.firstWrapRange.start && lastCol <= wrapped.firstWrapRange.end) { if(lastCol >= wrapped.firstWrapRange.start && lastCol <= wrapped.firstWrapRange.end) {
cursorOffset = self.cursorPos.col - wrapped.firstWrapRange.start; cursorOffset = self.cursorPos.col - wrapped.firstWrapRange.start;
console.log('cursorOffset=' + cursorOffset)
} }
console.log('getOutputText="' + self.getOutputText(index, nextEolIndex) + '"')
for(var i = 0; i < newLines.length; ++i) { for(var i = 0; i < newLines.length; ++i) {
newLines[i] = { text : newLines[i] }; newLines[i] = { text : newLines[i] };
} }
@ -419,9 +414,6 @@ function MultiLineEditTextView2(options) {
self.textLines, self.textLines,
[ index, (nextEolIndex - index) + 1 ].concat(newLines)); [ index, (nextEolIndex - index) + 1 ].concat(newLines));
console.log('----textLines:')
console.log(self.textLines)
console.log('--------------')
absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col); absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
@ -436,11 +428,9 @@ function MultiLineEditTextView2(options) {
self.client.term.write(ansi.goto(absPos.row, absPos.col)); self.client.term.write(ansi.goto(absPos.row, absPos.col));
} }
} else { } else {
//console.log('redraw col+\n' + self.getRenderText(index).slice(self.cursorPos.col - 1) )
// //
// We must only redraw from col -> end of current visible line // We must only redraw from col -> end of current visible line
// //
absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col); absPos = self.getAbsolutePosition(self.cursorPos.row, self.cursorPos.col);
self.client.term.write( self.client.term.write(
ansi.hideCursor() + ansi.hideCursor() +
@ -451,11 +441,11 @@ function MultiLineEditTextView2(options) {
); );
} }
if(self.cursorPos.col >= self.dimens.width) { /*if(self.cursorPos.col >= self.dimens.width) {
console.log('next line') console.log('next line')
self.cursorBeginOfNextLine(); self.cursorBeginOfNextLine();
//self.client.term.write(ansi.right(cursorOffset)) //self.client.term.write(ansi.right(cursorOffset))
} }*/
} }
}; };
@ -574,7 +564,7 @@ function MultiLineEditTextView2(options) {
// A few observations: // A few observations:
// 1) Right/left should probably allow to land on a tab // 1) Right/left should probably allow to land on a tab
// and only jump once another arrow is hit -- this lets the user edit @ that position // and only jump once another arrow is hit -- this lets the user edit @ that position
var move = self.getRemainingTabWidth() - 1; var move = self.getRemainingTabWidth();
self.cursorPos.col += move; self.cursorPos.col += move;
self.client.term.write(ansi.right(move)); self.client.term.write(ansi.right(move));
} }
@ -671,14 +661,10 @@ MultiLineEditTextView2.prototype.setFocus = function(focused) {
MultiLineEditTextView2.prototype.setText = function(text) { MultiLineEditTextView2.prototype.setText = function(text) {
this.textLines = [ ]; this.textLines = [ ];
//text = "Tab:\r\n\tA\tB\tC\tD\tE\tF\tG\r\n reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally long word!!!"; //text = "Tab:\r\n\tA\tB\tC\tD\tE\tF\tG\r\n reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally long word!!!";
text = require('fs').readFileSync('/home/bashby/Downloads/test_text.txt', { encoding : 'utf-8'}); text = require('fs').readFileSync('/home/nuskooler/Downloads/test_text.txt', { encoding : 'utf-8'});
//text = 'An excerpt from A Clockwork Orange:'
this.insertText(text);//, 0, 0); this.insertText(text);//, 0, 0);
this.cursorEndOfDocument(); this.cursorEndOfDocument();
// console.log(this.textLines)
}; };
var HANDLED_SPECIAL_KEYS = [ var HANDLED_SPECIAL_KEYS = [