curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 19:51:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

edit.js: adding a character anywhere on the line works, but not the bksp

Browse Source
This commit is contained in:
minjaesong
2021-04-22 10:40:41 +09:00
parent 4066ddd7a5
commit 77ff22f968
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
assets/disk0/tvdos/bin/edit.js
View File

@@ -236,12 +236,12 @@ function hitAny() {
return sys.peek(-41) != 0; return sys.peek(-41) != 0;
} }
function appendText(code) { function insertChar(code, row, col) {
if (textbuffer[cursorRow] === undefined) if (textbuffer[row] === undefined)
textbuffer[cursorRow] = String.fromCharCode(code); textbuffer[row] = String.fromCharCode(code);
else { else {
let s = textbuffer[cursorRow].substring(0); let s = textbuffer[row].substring(0);
textbuffer[cursorRow] = s.substring(0, cursorCol) + String.fromCharCode(code) + s.substring(cursorCol); textbuffer[row] = s.substring(0, col) + String.fromCharCode(code) + s.substring(col);
} }
} }
@@ -322,13 +322,18 @@ function cursorMoveRelative(odx, ody) {
if (nextCol - scrollHor > visible) { if (nextCol - scrollHor > visible) {
scrollHor = nextCol - visible; scrollHor = nextCol - visible;
// scroll to the right?
if (scrollHor > textbuffer[nextRow].length - paintWidth + scrollHorPeek)
// to prevent overscrolling that might happen after some complex navigation, AND
// to make sure text cursor to be placed at the right end of the screen where "more line arrow"
// goes which also makes editing field 1 character wider
scrollHor = textbuffer[nextRow].length - paintWidth + scrollHorPeek;
} }
else if (nextCol - scrollHor < 0 + scrollHorPeek) { else if (nextCol - scrollHor < 0 + scrollHorPeek) {
scrollHor = nextCol - scrollHorPeek; // nextCol is less than zero scrollHor = nextCol - scrollHorPeek; // nextCol is less than zero
// scroll to the left? // scroll to the left?
if (scrollHor <= -1) { if (scrollHor <= -1)
scrollHor = 0; scrollHor = 0;
}
} }
} }
@@ -338,13 +343,16 @@ function cursorMoveRelative(odx, ody) {
if (nextRow - scroll > visible) { if (nextRow - scroll > visible) {
scroll = nextRow - visible; scroll = nextRow - visible;
// scroll to the bottom?
if (scroll > textbuffer.length - paintHeight)
// to make sure not show buncha empty lines
scroll = textbuffer.length - paintHeight;
} }
else if (nextRow - scroll < 0 + scrollPeek) { else if (nextRow - scroll < 0 + scrollPeek) {
scroll = nextRow - scrollPeek; // nextRow is less than zero scroll = nextRow - scrollPeek; // nextRow is less than zero
// scroll to the top? // scroll to the top?
if (scroll <= -1) { // scroll of -1 would result to show "Line 0" on screen if (scroll <= -1)
scroll = 0; scroll = 0; // scroll of -1 would result to show "Line 0" on screen
}
} }
} }
@@ -441,7 +449,13 @@ while (!exit) {
cursorMoveRelative(BIG_STRIDE, 0); cursorMoveRelative(BIG_STRIDE, 0);
} }
else if (key >= 32 && key < 128) { // printables (excludes \n) else if (key >= 32 && key < 128) { // printables (excludes \n)
appendText(key); cursorMoveRelative(1,0); drawTextLineAbsolute(cursorRow, scrollHor); insertChar(key, cursorRow, cursorCol);
// identical to con.KEY_RIGHT
cursoringCol = cursorCol + 1;
if (cursoringCol > textbuffer[cursorRow].length) cursoringCol = textbuffer[cursorRow].length;
cursorMoveRelative(1,0);
// end of con.KEY_RIGHT
drawTextLineAbsolute(cursorRow, scrollHor); drawLnCol(); gotoText();
} }
} }