humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

100fcore/app-update.sml done with functionality of getting screen to move (if needed) when cursor moves, including getting screen to move when moving to a new chr (in this commit)

Browse Source
This commit is contained in:
Humza Shahid
2024-10-28 23:06:32 +00:00
parent 5e1e39ca69
commit c7570707ab
2 changed files with 53 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
fcore/app-update.sml
View File

@@ -19,7 +19,7 @@ struct
(newApp, drawMsg) (newApp, drawMsg)
end end
fun helpMoveBackward (app: app_type, buffer, cursorIdx, count, fMove) = fun helpMove (app: app_type, buffer, cursorIdx, count, fMove) =
if count = 0 then if count = 0 then
let let
val {windowWidth, windowHeight, startLine, ...} = app val {windowWidth, windowHeight, startLine, ...} = app
@@ -50,50 +50,12 @@ struct
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val cursorIdx = fMove (buffer, cursorIdx) val cursorIdx = fMove (buffer, cursorIdx)
in in
helpMoveBackward (app, buffer, cursorIdx, count - 1, fMove) helpMove (app, buffer, cursorIdx, count - 1, fMove)
end end
fun moveBackward (app: app_type, count, fMove) = fun move (app: app_type, count, fMove) =
let val {cursorIdx, buffer, ...} = app let val {cursorIdx, buffer, ...} = app
in helpMoveBackward (app, buffer, cursorIdx, count, fMove) in helpMove (app, buffer, cursorIdx, count, fMove)
end
fun helpMoveForwards (app: app_type, buffer, cursorIdx, count, fMove) =
if count = 0 then
let
val {windowWidth, windowHeight, startLine, ...} = app
(* move LineGap to first line displayed on screen *)
val buffer = LineGap.goToLine (startLine, buffer)
(* get new startLine which may move screen depending on cursor movements *)
val startLine = TextWindow.getStartLine
(buffer, startLine, cursorIdx, windowWidth, windowHeight)
(* move buffer to new startLine as required by TextBuilder.build *)
val buffer = LineGap.goToLine (startLine, buffer)
val drawMsg = TextBuilder.build
(startLine, cursorIdx, buffer, windowWidth, windowHeight)
val mode = NORMAL_MODE ""
val newApp = AppWith.bufferAndCursorIdx
(app, buffer, cursorIdx, mode, startLine)
in
(newApp, drawMsg)
end
else
let
(* move LineGap to cursorIdx, which is necessary for finding newCursorIdx *)
val buffer = LineGap.goToIdx (cursorIdx, buffer)
val cursorIdx = fMove (buffer, cursorIdx)
in
helpMoveForwards (app, buffer, cursorIdx, count - 1, fMove)
end
fun moveForwards (app: app_type, count, fMove) =
let val {cursorIdx, buffer, ...} = app
in helpMoveForwards (app, buffer, cursorIdx, count, fMove)
end end
fun firstNonSpaceChr (app: app_type) = fun firstNonSpaceChr (app: app_type) =
@@ -108,8 +70,6 @@ struct
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val cursorIdx = Cursor.firstNonSpaceChr (buffer, cursorIdx) val cursorIdx = Cursor.firstNonSpaceChr (buffer, cursorIdx)
(* todo: get new startLine if cursor has moved out of screen *)
(* move LineGap to first line displayed on screen, and build new text *) (* move LineGap to first line displayed on screen, and build new text *)
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
@@ -140,35 +100,18 @@ struct
(newApp, []) (newApp, [])
end end
fun moveLine (app: app_type, f) =
let
val {cursorIdx, buffer, windowWidth, windowHeight, startLine, ...} = app
val startLine = f (startLine, 1)
val buffer = LineGap.goToLine (startLine, buffer)
val newApp = AppWith.startLine (app, startLine, buffer)
val drawMsg = TextBuilder.build
(startLine, cursorIdx, buffer, windowWidth, windowHeight)
in
(newApp, drawMsg)
end
fun handleChr (app: app_type, count, chr, str) = fun handleChr (app: app_type, count, chr, str) =
case chr of case chr of
#"h" => moveBackward (app, count, Cursor.viH) #"h" => move (app, count, Cursor.viH)
| #"j" => moveForwards (app, count, Cursor.viJ) | #"j" => move (app, count, Cursor.viJ)
| #"k" => moveBackward (app, count, Cursor.viK) | #"k" => move (app, count, Cursor.viK)
| #"l" => moveForwards (app, count, Cursor.viL) | #"l" => move (app, count, Cursor.viL)
| #"w" => moveForwards (app, count, Cursor.nextWord) | #"w" => move (app, count, Cursor.nextWord)
| #"W" => moveForwards (app, count, Cursor.nextWORD) | #"W" => move (app, count, Cursor.nextWORD)
| #"b" => moveBackward (app, count, Cursor.prevWord) | #"b" => move (app, count, Cursor.prevWord)
| #"B" => moveBackward (app, count, Cursor.prevWORD) | #"B" => move (app, count, Cursor.prevWORD)
| #"e" => moveForwards (app, count, Cursor.endOfWord) | #"e" => move (app, count, Cursor.endOfWord)
| #"E" => moveForwards (app, count, Cursor.endOfWORD) | #"E" => move (app, count, Cursor.endOfWORD)
(* PLACEHOLDER *)
| #"," => moveLine (app, op+)
| #"." => moveLine (app, op-)
(* can only move to start or end of line once (* can only move to start or end of line once
* so hardcode count as 1 *) * so hardcode count as 1 *)
| #"0" => | #"0" =>
@@ -192,11 +135,11 @@ struct
(newApp, []) (newApp, [])
end end
else else
moveBackward (app, 1, Cursor.vi0) move (app, 1, Cursor.vi0)
end end
else else
moveBackward (app, 1, Cursor.vi0) move (app, 1, Cursor.vi0)
| #"$" => moveForwards (app, 1, Cursor.viDlr) | #"$" => move (app, 1, Cursor.viDlr)
| #"^" => firstNonSpaceChr app | #"^" => firstNonSpaceChr app
(* multi-char commands which can be appended *) (* multi-char commands which can be appended *)
| #"t" => appendChr (app, chr, str) | #"t" => appendChr (app, chr, str)
@@ -219,16 +162,24 @@ struct
(newApp, []) (newApp, [])
end end
fun helpMoveToChrNext (app: app_type, buffer, cursorIdx, count, fMove, chr) = fun helpMoveToChr (app: app_type, buffer, cursorIdx, count, fMove, chr) =
if count = 0 then if count = 0 then
let let
val {windowWidth, windowHeight, startLine, ...} = app val {windowWidth, windowHeight, startLine, ...} = app
(* todo: get new startLine if cursor has moved out of screen *)
(* move LineGap to first line displayed on screen, and build new text *) (* move LineGap to first line displayed on screen *)
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val drawMsg = TextBuilder.build
(startLine, cursorIdx, buffer, windowWidth, windowHeight) (* get new startLine which may move screen depending on cursor movements *)
val startLine = TextWindow.getStartLine
(buffer, startLine, cursorIdx, windowWidth, windowHeight)
(* move buffer to new startLine as required by TextBuilder.build *)
val buffer = LineGap.goToLine (startLine, buffer)
val drawMsg =
TextBuilder.build
(startLine, cursorIdx, buffer, windowWidth, windowHeight)
val mode = NORMAL_MODE "" val mode = NORMAL_MODE ""
val newApp = AppWith.bufferAndCursorIdx val newApp = AppWith.bufferAndCursorIdx
@@ -242,12 +193,12 @@ struct
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val cursorIdx = fMove (buffer, cursorIdx, chr) val cursorIdx = fMove (buffer, cursorIdx, chr)
in in
helpMoveToChrNext (app, buffer, cursorIdx, count - 1, fMove, chr) helpMoveToChr (app, buffer, cursorIdx, count - 1, fMove, chr)
end end
fun moveToChrNext (app: app_type, count, fMove, chr) = fun moveToChr (app: app_type, count, fMove, chr) =
let val {cursorIdx, buffer, ...} = app let val {cursorIdx, buffer, ...} = app
in helpMoveToChrNext (app, buffer, cursorIdx, count, fMove, chr) in helpMoveToChr (app, buffer, cursorIdx, count, fMove, chr)
end end
(* temp placeholder function *) (* temp placeholder function *)
@@ -259,17 +210,17 @@ struct
(newApp, []) (newApp, [])
end end
fun handleNextChr (count, app, fMove, newCmd) = fun handleMoveToChr (count, app, fMove, newCmd) =
case newCmd of case newCmd of
CHAR_EVENT chr => moveToChrNext (app, count, fMove, chr) CHAR_EVENT chr => moveToChr (app, count, fMove, chr)
| RESIZE_EVENT (width, height) => resizeText (app, width, height) | RESIZE_EVENT (width, height) => resizeText (app, width, height)
fun handleGo (count, app, newCmd) = fun handleGo (count, app, newCmd) =
case newCmd of case newCmd of
CHAR_EVENT chr => CHAR_EVENT chr =>
(case chr of (case chr of
#"e" => moveBackward (app, count, Cursor.endOfPrevWord) #"e" => move (app, count, Cursor.endOfPrevWord)
| #"E" => moveBackward (app, count, Cursor.endOfPrevWORD) | #"E" => move (app, count, Cursor.endOfPrevWORD)
| _ => clearMode app) | _ => clearMode app)
| RESIZE_EVENT (width, height) => resizeText (app, width, height) | RESIZE_EVENT (width, height) => resizeText (app, width, height)
@@ -288,20 +239,28 @@ struct
* tillNextChr with count of 1 has same effect * tillNextChr with count of 1 has same effect
* as tillNextChr with any count above 1 * as tillNextChr with any count above 1
* so just hardcode 1 *) * so just hardcode 1 *)
handleNextChr (1, app, Cursor.tillNextChr, newCmd) handleMoveToChr (1, app, Cursor.tillNextChr, newCmd)
| #"T" => | #"T" =>
(* to just before chr, backward *) (* to just before chr, backward *)
handleNextChr (1, app, Cursor.tillPrevChr, newCmd) handleMoveToChr (1, app, Cursor.tillPrevChr, newCmd)
| #"y" => (* yank *) clearMode app | #"y" =>
| #"d" => (* delete *) clearMode app (* yank *)
clearMode app
| #"d" =>
(* delete *)
clearMode app
| #"f" => | #"f" =>
(* to chr, forward *) (* to chr, forward *)
handleNextChr (count, app, Cursor.toNextChr, newCmd) handleMoveToChr (count, app, Cursor.toNextChr, newCmd)
| #"F" => | #"F" =>
(* to chr, backward *) (* to chr, backward *)
handleNextChr (count, app, Cursor.toPrevChr, newCmd) handleMoveToChr (count, app, Cursor.toPrevChr, newCmd)
| #"g" => (* go *) handleGo (count, app, newCmd) | #"g" =>
| #"c" => (* change *) clearMode app (* go *)
handleGo (count, app, newCmd)
| #"c" =>
(* change *)
clearMode app
| _ => | _ =>
(* isn't a non-terminal cmd (* isn't a non-terminal cmd
* this case should never happen*) * this case should never happen*)

BIN
shf
View File

Binary file not shown.