progress towards supporting arrow input

functional-core/app/app-update.sml

@@ -13,17 +13,19 @@ struct
   open InputMessage
   open UpdateMessage
 
+  fun getDotVecFromIndices (model, hIdx, vIdx) =
+    let
+      val xpos = Vector.sub (#xClickPoints model, hIdx)
+      val ypos = Vector.sub (#yClickPoints model, vIdx)
+    in
+      ClickPoints.getDrawDot (xpos, ypos, 1.0, 0.0, 0.0, model)
+    end
+
   fun mouseMoveOrRelease (model: app_type) =
     let
       val drawVec =
         case ClickPoints.getClickPositionFromMouse model of
-          SOME (hIdx, vIdx) =>
+          SOME (hIdx, vIdx) => getDotVecFromIndices (model, hIdx, vIdx)
-            let
-              val xpos = Vector.sub (#xClickPoints model, hIdx)
-              val ypos = Vector.sub (#yClickPoints model, vIdx)
-            in
-              ClickPoints.getDrawDot (xpos, ypos, 1.0, 0.0, 0.0, model)
-            end
         | NONE => Vector.fromList []
       val drawVec = TriangleStage.toVector (model, drawVec)
 
@@ -32,61 +34,154 @@ struct
       (model, DRAW drawMsg)
     end
 
-  fun mouseLeftClick (model: app_type) =
+  fun getDrawDotMsgWhenArrowIsAtBoundary model =
-    case ClickPoints.getClickPositionFromMouse model of
+    let
-      SOME (hIdx, vIdx) =>
+      val {arrowX, arrowY, ...} = model
+      val dotVec = getDotVecFromIndices (model, arrowX, arrowY)
+      val dotVec = TriangleStage.toVector (model, dotVec)
+      val drawMsg = DRAW_DOT dotVec
+    in
+      (model, DRAW drawMsg)
+    end
+
+  fun moveArrowUp (model: app_type) =
+    let
+      val {arrowX, arrowY, ...} = model
+    in
+      if arrowY > 0 then
         let
-          val {windowWidth, windowHeight, xClickPoints, yClickPoints, ...} =
+          val newArrowY = arrowY - 1
-            model
+          val model = AppWith.arrowY (model, newArrowY)
 
-          val xpos = Vector.sub (xClickPoints, hIdx)
+          val dotVec = getDotVecFromIndices (model, arrowX, newArrowY)
-          val ypos = Vector.sub (yClickPoints, vIdx)
+          val dotVec = TriangleStage.toVector (model, dotVec)
-          val dotVec = ClickPoints.getDrawDot (xpos, ypos, 0.0, 0.0, 1.0, model)
+          val drawMsg = DRAW_DOT dotVec
-
-          val halfWidth = Real32.fromInt (windowWidth div 2)
-          val halfHeight = Real32.fromInt (windowHeight div 2)
-          val hpos =
-            ClickPoints.xposToNdc (xpos, windowWidth, windowHeight, halfWidth)
-          val vpos =
-            ClickPoints.yposToNdc (ypos, windowWidth, windowHeight, halfHeight)
-
-          val newUndoTuple = (hpos, vpos)
         in
-          (case #triangleStage model of
+          (model, DRAW drawMsg)
-             NO_TRIANGLE =>
-               let
-                 val drawVec = TriangleStage.toVector (model, dotVec)
-                 val drawMsg = DRAW_DOT drawVec
-
-                 val newTriangleStage = FIRST {x1 = hpos, y1 = vpos}
-                 val model = AppWith.addTriangleStage
-                   (model, newTriangleStage, newUndoTuple, hIdx, vIdx)
-               in
-                 (model, DRAW drawMsg)
-               end
-           | FIRST {x1, y1} =>
-               let
-                 val drawVec =
-                   TriangleStage.firstToVector (x1, y1, dotVec, model)
-                 val drawMsg = DRAW_DOT drawVec
-
-                 val newTriangleStage = SECOND
-                   {x1 = x1, y1 = y1, x2 = hpos, y2 = vpos}
-                 val model = AppWith.addTriangleStage
-                   (model, newTriangleStage, newUndoTuple, hIdx, vIdx)
-               in
-                 (model, DRAW drawMsg)
-               end
-           | SECOND {x1, y1, x2, y2} =>
-               let
-                 val model = AppWith.addTriangle
-                   (model, x1, y1, x2, y2, hpos, vpos, newUndoTuple, hIdx, vIdx)
-                 val drawVec = Triangles.toVector model
-                 val drawMsg = DRAW_TRIANGLES_AND_RESET_DOTS drawVec
-               in
-                 (model, DRAW drawMsg)
-               end)
         end
+      else
+        getDrawDotMsgWhenArrowIsAtBoundary model
+    end
+
+  fun moveArrowLeft (model: app_type) =
+    let
+      val {arrowX, arrowY, ...} = model
+    in
+      if arrowX > 0 then
+        let
+          val newArrowX = arrowX - 1
+          val model = AppWith.arrowX (model, newArrowX)
+
+          val dotVec = getDotVecFromIndices (model, newArrowX, arrowY)
+          val dotVec = TriangleStage.toVector (model, dotVec)
+          val drawMsg = DRAW_DOT dotVec
+        in
+          (model, DRAW drawMsg)
+        end
+      else
+        getDrawDotMsgWhenArrowIsAtBoundary model
+    end
+
+  fun moveArrowRight (model: app_type) =
+    let
+      val {arrowX, arrowY, xClickPoints, ...} = model
+    in
+      if arrowX < Vector.length xClickPoints - 1 then
+        let
+          val newArrowX = arrowX + 1
+          val model = AppWith.arrowX (model, newArrowX)
+
+          val dotVec = getDotVecFromIndices (model, newArrowX, arrowY)
+          val dotVec = TriangleStage.toVector (model, dotVec)
+          val drawMsg = DRAW_DOT dotVec
+        in
+          (model, DRAW drawMsg)
+        end
+      else
+        getDrawDotMsgWhenArrowIsAtBoundary model
+    end
+
+  fun moveArrowDown (model: app_type) =
+    let
+      val {arrowX, arrowY, yClickPoints, ...} = model
+    in
+      if arrowY < Vector.length yClickPoints - 1 then
+        let
+          val newArrowY = arrowY + 1
+          val model = AppWith.arrowY (model, newArrowY)
+
+          val dotVec = getDotVecFromIndices (model, arrowX, newArrowY)
+          val dotVec = TriangleStage.toVector (model, dotVec)
+          val drawMsg = DRAW_DOT dotVec
+        in
+          (model, DRAW drawMsg)
+        end
+      else
+        getDrawDotMsgWhenArrowIsAtBoundary model
+    end
+
+  fun addCoordinates (model: app_type, hIdx, vIdx) =
+    let
+      val
+        { windowWidth
+        , windowHeight
+        , xClickPoints
+        , yClickPoints
+        , triangleStage
+        , ...
+        } = model
+
+      val xpos = Vector.sub (xClickPoints, hIdx)
+      val ypos = Vector.sub (yClickPoints, vIdx)
+      val dotVec = ClickPoints.getDrawDot (xpos, ypos, 0.0, 0.0, 1.0, model)
+
+      val halfWidth = Real32.fromInt (windowWidth div 2)
+      val halfHeight = Real32.fromInt (windowHeight div 2)
+      val hpos =
+        ClickPoints.xposToNdc (xpos, windowWidth, windowHeight, halfWidth)
+      val vpos =
+        ClickPoints.yposToNdc (ypos, windowWidth, windowHeight, halfHeight)
+
+      val newUndoTuple = (hpos, vpos)
+    in
+      case triangleStage of
+        NO_TRIANGLE =>
+          let
+            val drawVec = TriangleStage.toVector (model, dotVec)
+            val drawMsg = DRAW_DOT drawVec
+
+            val newTriangleStage = FIRST {x1 = hpos, y1 = vpos}
+            val model = AppWith.addTriangleStage
+              (model, newTriangleStage, newUndoTuple, hIdx, vIdx)
+          in
+            (model, DRAW drawMsg)
+          end
+      | FIRST {x1, y1} =>
+          let
+            val drawVec = TriangleStage.firstToVector (x1, y1, dotVec, model)
+            val drawMsg = DRAW_DOT drawVec
+
+            val newTriangleStage = SECOND
+              {x1 = x1, y1 = y1, x2 = hpos, y2 = vpos}
+            val model = AppWith.addTriangleStage
+              (model, newTriangleStage, newUndoTuple, hIdx, vIdx)
+          in
+            (model, DRAW drawMsg)
+          end
+      | SECOND {x1, y1, x2, y2} =>
+          let
+            val model = AppWith.addTriangle
+              (model, x1, y1, x2, y2, hpos, vpos, newUndoTuple, hIdx, vIdx)
+            val drawVec = Triangles.toVector model
+            val drawMsg = DRAW_TRIANGLES_AND_RESET_DOTS drawVec
+          in
+            (model, DRAW drawMsg)
+          end
+    end
+
+  fun mouseLeftClick model =
+    case ClickPoints.getClickPositionFromMouse model of
+      SOME (hIdx, vIdx) => addCoordinates (model, hIdx, vIdx)
     | NONE => (model, NO_MAILBOX)
 
   fun resizeWindow (model, width, height) =
@@ -267,6 +362,10 @@ struct
     | KEY_CTRL_S => getSaveTrianglesMsg model
     | KEY_CTRL_L => getLoadTrianglesMsg model
     | KEY_CTRL_E => getExportTrianglesMsg model
+    | ARROW_UP => moveArrowUp model
+    | ARROW_LEFT => moveArrowLeft model
+    | ARROW_RIGHT => moveArrowRight model
+    | ARROW_DOWN => moveArrowDown model
     | USE_TRIANGLES triangles => useTriangles (model, triangles)
     | TRIANGLES_LOAD_ERROR => trianglesLoadError model
 end

functional-core/app/app-with.sml

@@ -7,6 +7,9 @@ sig
   val mousePosition: AppType.app_type * Real32.real * Real32.real
                      -> AppType.app_type
 
+  val arrowX: AppType.app_type * int -> AppType.app_type
+  val arrowY: AppType.app_type * int -> AppType.app_type
+
   val undo:
     AppType.app_type
     * AppType.triangle_stage
@@ -133,6 +136,74 @@ struct
       }
     end
 
+  fun arrowX (app: app_type, arrowX) =
+    let
+      val
+        { xClickPoints
+        , yClickPoints
+        , windowWidth
+        , windowHeight
+        , triangles
+        , triangleStage
+        , undo
+        , redo
+        , showGraph
+        , mouseX
+        , mouseY
+        , arrowX = _
+        , arrowY
+        } = app
+    in
+      { xClickPoints = xClickPoints
+      , yClickPoints = yClickPoints
+      , triangles = triangles
+      , triangleStage = triangleStage
+      , windowWidth = windowWidth
+      , windowHeight = windowHeight
+      , undo = undo
+      , redo = redo
+      , showGraph = showGraph
+      , mouseX = mouseX
+      , mouseY = mouseY
+      , arrowX = arrowX
+      , arrowY = arrowY
+      }
+    end
+
+  fun arrowY (app: app_type, arrowY) =
+    let
+      val
+        { xClickPoints
+        , yClickPoints
+        , windowWidth
+        , windowHeight
+        , triangles
+        , triangleStage
+        , undo
+        , redo
+        , showGraph
+        , mouseX
+        , mouseY
+        , arrowX
+        , arrowY = _
+        } = app
+    in
+      { xClickPoints = xClickPoints
+      , yClickPoints = yClickPoints
+      , triangles = triangles
+      , triangleStage = triangleStage
+      , windowWidth = windowWidth
+      , windowHeight = windowHeight
+      , undo = undo
+      , redo = redo
+      , showGraph = showGraph
+      , mouseX = mouseX
+      , mouseY = mouseY
+      , arrowX = arrowX
+      , arrowY = arrowY
+      }
+    end
+
   fun helpWindowResize
     (app: app_type, windowWidth, windowHeight, wStart, wFinish, hStart, hFinish) :
     app_type =

message-types/input-msg.sml

@@ -11,6 +11,10 @@ sig
   | KEY_CTRL_S
   | KEY_CTRL_L
   | KEY_CTRL_E
+  | ARROW_UP
+  | ARROW_LEFT
+  | ARROW_RIGHT
+  | ARROW_DOWN
   | USE_TRIANGLES of AppType.triangle list
   | TRIANGLES_LOAD_ERROR
 end
@@ -28,6 +32,10 @@ struct
   | KEY_CTRL_S
   | KEY_CTRL_L
   | KEY_CTRL_E
+  | ARROW_UP
+  | ARROW_LEFT
+  | ARROW_RIGHT
+  | ARROW_DOWN
   | USE_TRIANGLES of AppType.triangle list
   | TRIANGLES_LOAD_ERROR
 end