add functionality to centre text window to cursor
This commit is contained in:
@@ -19,6 +19,26 @@ struct
|
|||||||
(newApp, drawMsg)
|
(newApp, drawMsg)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
fun centreToCursor (app: app_type) =
|
||||||
|
let
|
||||||
|
val {buffer, windowWidth, windowHeight, startLine = origLine, cursorIdx, ...} = app
|
||||||
|
val buffer = LineGap.goToIdx (cursorIdx, buffer)
|
||||||
|
|
||||||
|
val startLine = TextWindow.getStartLineWithCursorCentered
|
||||||
|
(buffer, cursorIdx, origLine, windowWidth, windowHeight)
|
||||||
|
|
||||||
|
val buffer = LineGap.goToLine (startLine, buffer)
|
||||||
|
|
||||||
|
val newApp = AppWith.bufferAndCursorIdx
|
||||||
|
(app, buffer, cursorIdx, NORMAL_MODE "", startLine)
|
||||||
|
|
||||||
|
val drawMsg =
|
||||||
|
TextBuilder.build
|
||||||
|
(startLine, cursorIdx, buffer, windowWidth, windowHeight)
|
||||||
|
in
|
||||||
|
(newApp, drawMsg)
|
||||||
|
end
|
||||||
|
|
||||||
fun moveToStart (app: app_type) =
|
fun moveToStart (app: app_type) =
|
||||||
let
|
let
|
||||||
val {buffer, windowWidth, windowHeight, startLine, ...} = app
|
val {buffer, windowWidth, windowHeight, startLine, ...} = app
|
||||||
@@ -131,6 +151,7 @@ struct
|
|||||||
| #"B" => move (app, count, Cursor.prevWORD)
|
| #"B" => move (app, count, Cursor.prevWORD)
|
||||||
| #"e" => move (app, count, Cursor.endOfWord)
|
| #"e" => move (app, count, Cursor.endOfWord)
|
||||||
| #"E" => move (app, count, Cursor.endOfWORD)
|
| #"E" => move (app, count, Cursor.endOfWORD)
|
||||||
|
| #"z" => centreToCursor app
|
||||||
(* 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" =>
|
||||||
|
|||||||
@@ -144,4 +144,121 @@ struct
|
|||||||
| (_, _) =>
|
| (_, _) =>
|
||||||
oldLine
|
oldLine
|
||||||
end
|
end
|
||||||
|
|
||||||
|
fun helpCentreCursor (strPos, str, lineNum, stl, maxW, halfH, curW, curH) =
|
||||||
|
if strPos < 0 then
|
||||||
|
case stl of
|
||||||
|
hd :: tl =>
|
||||||
|
helpCentreCursor
|
||||||
|
(String.size hd - 1, hd, lineNum, tl, maxW, halfH, curW, curH)
|
||||||
|
| [] =>
|
||||||
|
(* return 0 for start of buffer *)
|
||||||
|
0
|
||||||
|
else
|
||||||
|
let
|
||||||
|
val chr = String.sub (str, strPos)
|
||||||
|
in
|
||||||
|
if chr = #"\n" then
|
||||||
|
if curH + (ySpace * 3) >= halfH then
|
||||||
|
(* if we exceeded half the screen *)
|
||||||
|
lineNum
|
||||||
|
else
|
||||||
|
helpCentreCursor
|
||||||
|
( strPos - 1, str, lineNum - 1, stl, maxW, halfH
|
||||||
|
, 0, curH + ySpace
|
||||||
|
)
|
||||||
|
else
|
||||||
|
if curW + xSpace <= maxW then
|
||||||
|
let
|
||||||
|
val curW = curW + xSpace
|
||||||
|
in
|
||||||
|
helpCentreCursor
|
||||||
|
( strPos - 1, str, lineNum, stl, maxW, halfH
|
||||||
|
, curW + xSpace, curH
|
||||||
|
)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
(* have to create visual line break *)
|
||||||
|
if curH + (ySpace * 3) >= halfH then
|
||||||
|
(* if at limit, return current line lineNum *)
|
||||||
|
lineNum
|
||||||
|
else
|
||||||
|
helpCentreCursor
|
||||||
|
( strPos - 1, str, lineNum - 1, stl, maxW, halfH
|
||||||
|
, 0, curH + ySpace
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
(* search for prev \n, and once found,
|
||||||
|
* call function to return startLine where cursor is centered *)
|
||||||
|
fun getCursorStartLine (strPos, str, lineNum, stl, maxW, halfH) =
|
||||||
|
if strPos < 0 then
|
||||||
|
case stl of
|
||||||
|
hd :: tl =>
|
||||||
|
getCursorStartLine
|
||||||
|
(String.size hd - 1, str, lineNum, tl, maxW, halfH)
|
||||||
|
| [] =>
|
||||||
|
0
|
||||||
|
else
|
||||||
|
let
|
||||||
|
val chr = String.sub (str, strPos)
|
||||||
|
in
|
||||||
|
if chr = #"\n" then
|
||||||
|
(* \n found *)
|
||||||
|
helpCentreCursor
|
||||||
|
(strPos - 1, str, lineNum - 1, stl, maxW, halfH, xSpace, ySpace)
|
||||||
|
else
|
||||||
|
getCursorStartLine
|
||||||
|
(strPos - 1, str, lineNum, stl, maxW, halfH)
|
||||||
|
end
|
||||||
|
|
||||||
|
(* Prerequisite: LineGap is moved to cursor *)
|
||||||
|
fun getStartLineWithCursorCentered
|
||||||
|
(lineGap: LineGap.t, cursorIdx, origLine, maxWidth, maxHeight) =
|
||||||
|
let
|
||||||
|
val {rightStrings, rightLines, idx = bufferIdx, line = bufferLine, leftStrings, ...} = lineGap
|
||||||
|
in
|
||||||
|
case (rightStrings, rightLines) of
|
||||||
|
(shd :: stl, lhd :: ltl) =>
|
||||||
|
let
|
||||||
|
(* convert absolute cursorIdx to idx relative to hd string *)
|
||||||
|
val strIdx = cursorIdx - bufferIdx
|
||||||
|
in
|
||||||
|
if strIdx < String.size shd then
|
||||||
|
(* strIdx is in hd *)
|
||||||
|
let
|
||||||
|
val lineNum =
|
||||||
|
if Vector.length lhd = 0 then
|
||||||
|
bufferLine
|
||||||
|
else if Vector.length lhd = 1 then
|
||||||
|
let
|
||||||
|
val lineIdx = Vector.sub (lhd, 0)
|
||||||
|
in
|
||||||
|
if lineIdx < strIdx then
|
||||||
|
bufferLine + 1
|
||||||
|
else
|
||||||
|
bufferLine
|
||||||
|
end
|
||||||
|
else
|
||||||
|
let
|
||||||
|
val firstLineIdx = Vector.sub (lhd, 0)
|
||||||
|
in
|
||||||
|
if firstLineIdx > strIdx then
|
||||||
|
bufferLine
|
||||||
|
else if firstLineIdx < strIdx then
|
||||||
|
Cursor.binSearch (strIdx - 1, lhd) + bufferLine
|
||||||
|
else
|
||||||
|
bufferLine + 1
|
||||||
|
end
|
||||||
|
in
|
||||||
|
getCursorStartLine
|
||||||
|
(strIdx, shd, lineNum, leftStrings, maxWidth, maxHeight div 2)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
(* todo: strIdx is in tl *)
|
||||||
|
raise Match
|
||||||
|
end
|
||||||
|
| (_, _) =>
|
||||||
|
origLine
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user