curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-11 23:34:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

edit.js: horz scroll kinda works; vert scroll works flawlessly as long as COL is 1

Browse Source
This commit is contained in:
minjaesong
2021-04-19 22:38:39 +09:00
parent 1668211782
commit 95c33f7d5e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,6 @@ function appendText(code) {
let s = textbuffer[cursorRow].substring(0); let s = textbuffer[cursorRow].substring(0);
textbuffer[cursorRow] = s.substring(0, cursorCol) + String.fromCharCode(code) + s.substring(cursorCol); textbuffer[cursorRow] = s.substring(0, cursorCol) + String.fromCharCode(code) + s.substring(cursorCol);
} }
cursorMoveRelative(1,0);
} }
function appendLine() { function appendLine() {
@@ -290,23 +288,25 @@ function cursorMoveRelative(odx, ody) {
//gotoText(); // update cursor pos //gotoText(); // update cursor pos
let cursorPos = con.getyx(); let cursorPos = con.getyx();
let dx = odx; let dy = ody; let dx = odx + (cursoringCol - cursorCol);
let dy = ody;
let px = cursorPos[1] - PAINT_START_X; let py = cursorPos[0] - PAINT_START_Y; let px = cursorPos[1] - PAINT_START_X; let py = cursorPos[0] - PAINT_START_Y;
let nx = px + dx; let ny = py + dy; let nx = px + dx; let ny = py + dy;
let oldScroll = scroll; let oldScroll = scroll;
let oldScrollHor = scrollHor; let oldScrollHor = scrollHor;
// clamp dx/dy // clamp dx/dy
if (cursorCol + dx > Math.min(cursoringCol, textbuffer[cursorRow].length))
dx = Math.min(cursoringCol, textbuffer[cursorRow].length) - cursorCol + 1;
else if (cursorCol + dx < 0)
dx = -cursorCol;
if (cursorRow + dy > textbuffer.length - 1) if (cursorRow + dy > textbuffer.length - 1)
dy = textbuffer.length - cursorRow; dy = textbuffer.length - cursorRow;
else if (cursorRow + dy < 0) else if (cursorRow + dy < 0)
dy = -cursorRow; dy = -cursorRow;
// set new dx if destination col is outside of the line
if (cursorCol + dx > textbuffer[cursorRow + dy].length)
dx -= (cursorCol + dx) - textbuffer[cursorRow].length + 1
else if (cursorCol + dx < 0)
dx = -cursorCol;
// move editor cursor // move editor cursor
cursorRow += dy; cursorRow += dy;
@@ -322,7 +322,7 @@ function cursorMoveRelative(odx, ody) {
// update horizontal scroll stats // update horizontal scroll stats
if (dx != 0) { if (dx != 0) {
let stride = paintWidth - 1; let stride = paintWidth - 1 - scrollHorPeek;
if (nx > stride) { if (nx > stride) {
scrollHor += nx - stride; scrollHor += nx - stride;
@@ -444,7 +444,7 @@ 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); drawLnCol(); gotoText(); appendText(key); cursorMoveRelative(1,0); drawTextLine(cursorRow - scroll);
} }
} }