pull in new version of brolib-sml so that we can get bug fixes for LineGap.getLineNumberOfIdx, delete the TextWindow structure (which was previously used to get the start line to draw from), and replace previous usages of TextWindow with TextScroll.getStartLine. This enables us to scroll in a way tailored to the reimplemented TextBuilder (which do not wrap lines or characters)

2025-09-13 05:12:17 +01:00
parent a3b00e09d8
commit 668dd07699
8 changed files with 76 additions and 580 deletions
--- a/fcore/normal-mode/normal-finish.sml
+++ b/fcore/normal-mode/normal-finish.sml
@@ -12,20 +12,24 @@ struct
  fun buildTextAndClear
    (app: app_type, buffer, cursorIdx, searchList, msgs, bufferModifyTime) =
    let
-      val {windowWidth, windowHeight, startLine, searchString,
-      visualScrollColumn = prevScrollColumn, ...} = app
+      val
+        { windowWidth
+        , windowHeight
+        , searchString
+        , visualScrollColumn = prevScrollColumn
+        , startLine = prevLineNumber
+        , ...
+        } = app

-      (* calculate scroll column *)
+      (* calculate new scroll column and start line, if there are any changes *)
      val buffer = LineGap.goToIdx (cursorIdx, buffer)
      val visualScrollColumn =
-        TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn)
+        TextScroll.getScrollColumn
+          (buffer, cursorIdx, windowWidth, prevScrollColumn)

-      (* 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)
+      val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+      val startLine =
+        TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight)

      (* move buffer to new startLine as required by TextBuilder.build *)
      val buffer = LineGap.goToLine (startLine, buffer)
@@ -93,7 +97,8 @@ struct

      val newBuffer = LineGap.goToIdx (cursorIdx, buffer)
      val visualScrollColumn =
-        TextScroll.getScrollColumn (buffer, cursorIdx, newWidth, prevScrollColumn)
+        TextScroll.getScrollColumn
+          (buffer, cursorIdx, newWidth, prevScrollColumn)
      val newBuffer = LineGap.goToLine (startLine, newBuffer)
      val lineIdx = TextBuilderUtils.getLineAbsIdxFromBuffer (startLine, buffer)

@@ -123,69 +128,14 @@ struct
        )
    end

-  (* Difference between this and buildTextAndClear is that 
-   * this is meant to be called after a chr movement, 
-   * where the cursor may possibly jump off window by a wide marigin.
-   * Since the cursor may move away a lot, it is best to recenter.
-   * *)
-  fun buildTextAndClearAfterChr
-    (app: app_type, buffer, cursorIdx, searchList, initialMsg, bufferModifyTime) :
-    AppType.app_type =
-    let
-      val {windowWidth, windowHeight, startLine, searchString, visualScrollColumn
-      = prevScrollColumn, ...} = app
-
-      val buffer = LineGap.goToIdx (cursorIdx, buffer)
-      val visualScrollColumn =
-        TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn)
-
-      (* 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 
-       * and move searchList to idx where line starts as well *)
-      val buffer = LineGap.goToLine (startLine, buffer)
-
-      val drawMsg = NormalModeTextBuilder.build
-        ( startLine
-        , cursorIdx
-        , buffer
-        , windowWidth
-        , windowHeight
-        , searchList
-        , searchString
-        , visualScrollColumn
-        )
-      val drawMsg = Vector.concat drawMsg
-      val drawMsg = DRAW_TEXT drawMsg
-      val msgs = DRAW drawMsg :: initialMsg
-
-      val mode = NORMAL_MODE ""
-    in
-      NormalModeWith.bufferAndCursorIdx
-        ( app
-        , buffer
-        , cursorIdx
-        , mode
-        , startLine
-        , searchList
-        , msgs
-        , bufferModifyTime
-        , visualScrollColumn
-        )
-    end
-
+  (* todo: check; the way we get the startLine is almost certainly wrong *)
  fun centreToCursor (app: app_type) =
    let
      val
        { buffer
        , windowWidth
        , windowHeight
-        , startLine = origLine
+        , startLine = prevLineNumber
        , cursorIdx
        , searchList
        , searchString
@@ -193,10 +143,11 @@ struct
        , visualScrollColumn
        , ...
        } = app
-      val buffer = LineGap.goToIdx (cursorIdx, buffer)

-      val startLine = TextWindow.getStartLineWithCursorCentered
-        (buffer, cursorIdx, origLine, windowWidth, windowHeight div 2)
+      val buffer = LineGap.goToIdx (cursorIdx, buffer)
+      val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+      val startLine =
+        TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight div 2)

      val buffer = LineGap.goToLine (startLine, buffer)
      val drawMsg = NormalModeTextBuilder.build
@@ -213,20 +164,16 @@ struct
      val drawMsg = DRAW_TEXT drawMsg
      val drawMsg = [DRAW drawMsg]
    in
-      let
-        val _ = raise Fail "centering to line is unimplemented\n"
-      in
-        NormalModeWith.bufferAndCursorIdx
-          ( app
-          , buffer
-          , cursorIdx
-          , NORMAL_MODE ""
-          , startLine
-          , searchList
-          , drawMsg
-          , bufferModifyTime
-          , #visualScrollColumn app
-          )
-      end
+      NormalModeWith.bufferAndCursorIdx
+        ( app
+        , buffer
+        , cursorIdx
+        , NORMAL_MODE ""
+        , startLine
+        , searchList
+        , drawMsg
+        , bufferModifyTime
+        , #visualScrollColumn app
+        )
    end
 end
--- a/fcore/normal-mode/normal-move.sml
+++ b/fcore/normal-mode/normal-move.sml
@@ -70,18 +70,11 @@ struct

      val buffer = LineGap.goToIdx (bufferIdx, buffer)
      val visualScrollColumn =
-        TextScroll.getScrollColumn (buffer, bufferIdx, windowWidth, prevScrollColumn)
-      val bufferLine =
-        let
-          val maxHeight = windowHeight - TextConstants.ySpace
-        in
-          TextWindow.getStartLineWithCursorCentered
-            (buffer, bufferIdx, bufferLine, windowWidth, maxHeight)
-        end
+        TextScroll.getScrollColumn
+          (buffer, bufferIdx, windowWidth, prevScrollColumn)
+      val bufferLine = let in raise Fail "todo: fix" end

      val buffer = LineGap.goToLine (bufferLine, buffer)
-      val lineIdx =
-        TextBuilderUtils.getLineAbsIdxFromBuffer (bufferLine, buffer)

      val drawMsg = NormalModeTextBuilder.build
        ( bufferLine
@@ -121,7 +114,7 @@ struct
          { windowWidth
          , windowHeight
          , buffer
-          , startLine = origLine
+          , startLine = prevLineNumber
          , searchList
          , searchString
          , bufferModifyTime
@@ -135,9 +128,12 @@ struct

        val buffer = LineGap.goToIdx (cursorIdx, buffer)
        val visualScrollColumn =
-          TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn)
-        val startLine = TextWindow.getStartLineWithCursorCentered
-          (buffer, cursorIdx, origLine, windowWidth, windowHeight div 2)
+          TextScroll.getScrollColumn
+            (buffer, cursorIdx, windowWidth, prevScrollColumn)
+
+        val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+        val startLine =
+          TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight)

        val buffer = LineGap.goToLine (startLine, buffer)

@@ -177,7 +173,7 @@ struct
        , cursorIdx
        , windowWidth
        , windowHeight
-        , startLine
+        , startLine = prevLineNumber
        , searchList
        , searchString
        , bufferModifyTime
@@ -188,16 +184,16 @@ struct
      (* move LineGap and buffer to start of line *)
      val buffer = LineGap.goToIdx (cursorIdx, buffer)
      val cursorIdx = Cursor.matchPair (buffer, cursorIdx)
-
-      val buffer = LineGap.goToLine (startLine, buffer)
-      val lineIdx = TextBuilderUtils.getLineAbsIdxFromBuffer (startLine, buffer)
    in
      let
        val buffer = LineGap.goToIdx (cursorIdx, buffer)
        val visualScrollColumn =
-          TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn)
-        val startLine = TextWindow.getStartLineWithCursorCentered
-          (buffer, cursorIdx, startLine, windowWidth, windowHeight div 2)
+          TextScroll.getScrollColumn
+            (buffer, cursorIdx, windowWidth, prevScrollColumn)
+
+        val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+        val startLine =
+          TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight)

        val buffer = LineGap.goToLine (startLine, buffer)

@@ -256,7 +252,7 @@ struct

  fun helpMoveToChr (app: app_type, buffer, cursorIdx, count, fMove, chr) =
    if count = 0 then
-      NormalFinish.buildTextAndClearAfterChr
+      NormalFinish.buildTextAndClear
        (app, buffer, cursorIdx, #searchList app, [], #bufferModifyTime app)
    else
      let
@@ -288,7 +284,7 @@ struct
      if newCursorIdx = ~1 then
        NormalFinish.clearMode app
      else
-        NormalFinish.buildTextAndClearAfterChr
+        NormalFinish.buildTextAndClear
          (app, buffer, newCursorIdx, searchList, [], bufferModifyTime)
    end

@@ -300,7 +296,7 @@ struct
      if newCursorIdx = ~1 then
        NormalFinish.clearMode app
      else
-        NormalFinish.buildTextAndClearAfterChr
+        NormalFinish.buildTextAndClear
          (app, buffer, newCursorIdx, searchList, [], bufferModifyTime)
    end
 end
--- a/fcore/normal-mode/normal-search-finish.sml
+++ b/fcore/normal-mode/normal-search-finish.sml
@@ -9,12 +9,13 @@ struct
      val
        { buffer
        , cursorIdx
-        , startLine
+        , startLine = prevLineNumber
        , windowWidth
        , windowHeight
        , visualScrollColumn
        , ...
        } = app
+
      val mode = NORMAL_SEARCH_MODE
        { searchString = searchString
        , tempSearchList = tempSearchList
@@ -57,9 +58,11 @@ struct
            )
        end

+      val buffer = LineGap.goToIdx (cursorIdx, buffer)
+      val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+      val startLine =
+        TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight)
      val buffer = LineGap.goToLine (startLine, buffer)
-      val startLine = TextWindow.getStartLine
-        (buffer, startLine, cursorIdx, windowWidth, windowHeight)

      val remainingWindowHeight = windowHeight - (TextConstants.ySpace * 2)

@@ -92,8 +95,14 @@ struct
    , tempSearchList
    ) =
    let
-      val {buffer, cursorIdx, startLine, searchString, visualScrollColumn, ...} =
-        app
+      val
+        { buffer
+        , cursorIdx
+        , startLine = prevLineNumber
+        , searchString
+        , visualScrollColumn
+        , ...
+        } = app

      val floatWindowWidth = Real32.fromInt newWindowWidth
      val floatWindowHeight = Real32.fromInt newWindowHeight
@@ -131,9 +140,11 @@ struct
            )
        end

+      val buffer = LineGap.goToIdx (cursorIdx, buffer)
+      val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer)
+      val startLine =
+        TextScroll.getStartLine (prevLineNumber, cursorLine, newWindowHeight)
      val buffer = LineGap.goToLine (startLine, buffer)
-      val startLine = TextWindow.getStartLine
-        (buffer, startLine, cursorIdx, newWindowWidth, newWindowHeight)

      val remainingWindowHeight = newWindowHeight - (TextConstants.ySpace * 2)

--- a/fcore/normal-mode/normal-search-mode.sml
+++ b/fcore/normal-mode/normal-search-mode.sml
@@ -64,10 +64,6 @@ struct
      (* 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)