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

edit.js: scrolling is hard... vert scroll is honest-to-god working as it should

Browse Source
This commit is contained in:
minjaesong
2021-04-21 17:34:34 +09:00
parent d85b1a99dc
commit d348e56766
1 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ const COL_LNUMFORE = 253;
const COL_CARET_ROW = 81; const COL_CARET_ROW = 81;
const PAINT_START_X = 5; const PAINT_START_X = 5;
const PAINT_START_Y = 2; const PAINT_START_Y = 2;
const BIG_STRIDE = 32; const BIG_STRIDE = 10000;
let filename = undefined; let filename = undefined;
@@ -286,18 +286,15 @@ function backspaceOnce() {
// this one actually cares about the current scrolling stats // this one actually cares about the current scrolling stats
function cursorMoveRelative(odx, ody) { function cursorMoveRelative(odx, ody) {
//gotoText(); // update cursor pos //gotoText(); // update cursor pos
let cursorPos = con.getyx();
let dx = odx + (cursoringCol - cursorCol); let dx = odx;// + (cursoringCol - cursorCol);
let dy = ody; let dy = ody;
let px = cursorPos[1] - PAINT_START_X; let py = cursorPos[0] - PAINT_START_Y;
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 (cursorRow + dy > textbuffer.length - 1) if (cursorRow + dy > textbuffer.length - 1)
dy = textbuffer.length - cursorRow; dy = (textbuffer.length - 1) - cursorRow;
else if (cursorRow + dy < 0) else if (cursorRow + dy < 0)
dy = -cursorRow; dy = -cursorRow;
@@ -307,60 +304,48 @@ function cursorMoveRelative(odx, ody) {
else if (cursorCol + dx < 0) else if (cursorCol + dx < 0)
dx = -cursorCol; dx = -cursorCol;
// move editor cursor
cursorRow += dy;
if (cursorRow < 0) cursorRow = 0;
else if (cursorRow >= textbuffer.length) cursorRow = textbuffer.length - 1;
let tlen = textbuffer[cursorRow].length;
cursorCol += dx; cursoringCol = cursorCol;
if (cursorCol < 0) cursorCol = 0;
else if (cursorCol >= tlen + 1) cursorCol = tlen + 1;
// update horizontal scroll stats // update horizontal scroll stats
let nextCol = cursorCol + dx;
if (dx != 0) { if (dx != 0) {
let stride = paintWidth - 1 - scrollHorPeek; let visible = paintWidth - 1 - scrollHorPeek;
if (nx > stride) { if (nextCol - scrollHor > visible) {
scrollHor += nx - stride; scrollHor = nextCol - visible;
nx = stride;
} }
else if (nx < 0 + scrollHorPeek) { else if (nextCol - scrollHor < 0 + scrollHorPeek) {
scrollHor += nx - scrollHorPeek; // nx is less than zero scrollHor = nextCol - scrollHorPeek; // nextCol is less than zero
nx = 1;
// scroll to the left? // scroll to the left?
if (scrollHor <= -1) { if (scrollHor <= -1) {
scrollHor = 0; scrollHor = 0;
nx = 0;
} }
} }
} }
// update vertical scroll stats // update vertical scroll stats
let nextRow = cursorRow + dy;
if (dy != 0) { if (dy != 0) {
let stride = paintHeight - 1 - scrollPeek; let visible = paintHeight - 1 - scrollPeek;
if (ny > stride) { if (nextRow - scroll > visible) {
scroll += ny - stride; scroll = nextRow - visible;
ny = stride;
} }
else if (ny < 0 + scrollPeek) { else if (nextRow - scroll < 0 + scrollPeek) {
scroll += ny - scrollPeek; // ny is less than zero scroll = nextRow - scrollPeek; // nextRow is less than zero
ny = 1;
// 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 of -1 would result to show "Line 0" on screen
scroll = 0; scroll = 0;
ny = 0;
} }
} }
} }
serial.println(`dY:${dy} nY:${ny} scrY:${scroll} row:${cursorRow} | wDim:${paintHeight}R ${paintWidth}C peek:${scrollPeek}`);
// move editor cursor
cursoringCol += dx;
cursorRow = nextRow;
cursorCol = nextCol;
serial.println(`d ${dx} ${dy}; n ${nextCol} ${nextRow}; scr ${scrollHor} ${scroll}; R ${cursorRow} C ${cursorCol} | wDim:${paintHeight}R ${paintWidth}C peek:${scrollPeek}`);
// update screendraw // update screendraw
if (oldScroll != scroll) { if (oldScroll != scroll) {
@@ -426,10 +411,10 @@ while (!exit) {
cursorMoveRelative(1,0); cursorMoveRelative(1,0);
} }
else if (key == con.KEY_UP) { else if (key == con.KEY_UP) {
cursorMoveRelative(0,-1); cursorMoveRelative(-BIG_STRIDE,-1);
} }
else if (key == con.KEY_DOWN) { else if (key == con.KEY_DOWN) {
cursorMoveRelative(0,1); cursorMoveRelative(-BIG_STRIDE,1);
} }
else if (key == con.KEY_PAGE_UP) { else if (key == con.KEY_PAGE_UP) {
cursorMoveRelative(0, -paintHeight + 1); cursorMoveRelative(0, -paintHeight + 1);