refactor TextBuilder and inner functions to handle highlighting searched characters

This commit is contained in:
2024-11-15 08:13:32 +00:00
parent 91688441cf
commit 35de4582e9

View File

@@ -1,7 +1,7 @@
signature TEXT_BUILDER = signature TEXT_BUILDER =
sig sig
(* Prerequisite: LineGap is moved to requested line first. *) (* Prerequisites: LineGap is moved to requested line first. *)
val build: int * int * LineGap.t * int * int val build: int * int * LineGap.t * int * int * SearchList.t * string
-> MailboxType.t list -> MailboxType.t list
end end
@@ -223,8 +223,7 @@ struct
end end
end end
else else
(* we have built cursor now, so can call after-cursor function (* change to searching in string's tl *)
* to build rest of text *)
case tl of case tl of
hd :: tl => hd :: tl =>
buildTextString buildTextString
@@ -235,8 +234,228 @@ struct
| [] => | [] =>
accToDrawMsg (acc, cursorAcc) accToDrawMsg (acc, cursorAcc)
fun isInSearchRange (absIdx, searchPos, searchHd, searchLen) =
let
val searchIdx = Vector.sub (searchHd, searchPos)
in
absIdx >= searchIdx andalso absIdx < searchIdx + searchLen
end
fun isAfterSearchRange (absIdx, searchPos, searchHd, searchLen) =
let
val searchIdx = Vector.sub (searchHd, searchPos)
in
absIdx >= searchIdx + searchLen
end
fun buildTextStringSearch
( pos, str, acc, posX, posY, startX
, tl, absIdx, cursorPos, cursorAcc
, windowData: window_data, colourData: colour_data
, searchHd, searchTl, searchPos, searchLen
) =
if searchPos = Vector.length searchHd then
case searchTl of
searchHd :: searchTl =>
(* go to next search hd/tl *)
buildTextStringSearch
( pos, str, acc, posX, posY, startX
, tl, absIdx, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, 0, searchLen
)
| [] =>
(* exhausted search hd/tl so calll normal build function *)
buildTextString
( pos, str, acc, posX, posY, startX
, tl, absIdx, cursorPos, cursorAcc
, windowData, colourData
)
else if pos < String.size str then
case String.sub (str, pos) of
#" " =>
(* if inside cursor, then create cursorAcc;
* else, just skip as usual *)
if absIdx <> cursorPos then
(* not in cursur *)
buildTextStringSearch
( pos + 1, str, acc, posX + xSpace, posY, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
else
(* in cursor *)
let
val {fw, fh, ...} = windowData
val {r, g, b, ...} = colourData
val cursorAcc = buildCursor (posX, posY, fw, fh, r, g ,b)
in
buildTextStringSearch
( pos + 1, str, acc, posX + xSpace, posY, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
| #"\n" =>
if posY + ySpace < #h windowData then
if absIdx <> cursorPos then
(* not in cursor position, so iterate like normal *)
buildTextStringSearch
( pos + 1, str, acc, startX, posY + ySpace, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
else
(* in cursor position, so build cursorAcc *)
let
val {fw, fh, ...} = windowData
val {r, g, b, ...} = colourData
val cursorAcc = buildCursor (posX, posY, fw, fh, r, g ,b)
in
buildTextStringSearch
( pos + 1, str, acc, startX, posY + ySpace, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else
accToDrawMsg (acc, cursorAcc)
| chr =>
let
val chrFun = Vector.sub (CozetteAscii.asciiTable, Char.ord chr)
in
if absIdx <> cursorPos then
(* not equal to cursor *)
if posX + xSpace < #w windowData then
if isInSearchRange (absIdx, searchPos, searchHd, searchLen) then
let
val {fw, fh, ...} = windowData
(* todo: temp colours *)
val r: Real32.real = 0.5
val g: Real32.real = 0.5
val b: Real32.real = 0.5
val chrVec =
chrFun (posX, posY, fontSize, fontSize, fw, fh, r, g, b)
val acc = chrVec :: acc
in
buildTextStringSearch
( pos + 1, str, acc, posX + xSpace, posY, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else
let
val {fw, fh, ...} = windowData
val {r, g, b, ...} = colourData
val chrVec =
chrFun (posX, posY, fontSize, fontSize, fw, fh, r, g, b)
val acc = chrVec :: acc
val searchPos =
if isAfterSearchRange (absIdx, searchPos, searchHd, searchLen)
then searchPos + 1
else searchPos
in
buildTextStringSearch
( pos + 1, str, acc, posX + xSpace, posY, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else if posY + ySpace < #h windowData then
let
val {fw, fh, ...} = windowData
val {r, g, b, ...} = colourData
val chrVec = chrFun
( startX, posY + ySpace, fontSize, fontSize
, fw, fh, r, g, b
)
val acc = chrVec :: acc
in
buildTextStringSearch
( pos + 1, str, acc, startX + xSpace, posY + ySpace, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else
accToDrawMsg (acc, cursorAcc)
else
(* equal to cursor *)
let
val {fw, fh, ...} = windowData
val {r, g, b, hr, hg, hb} = colourData
val cursorAcc = buildCursor (posX, posY, fw, fh, r, g ,b)
in
if posX + xSpace < #w windowData then
let
val chrVec = chrFun
( posX, posY, fontSize, fontSize
, fw, fh , hr, hg, hb
)
val acc = chrVec :: acc
in
(* can start building after cursor now,
* since cursor was built *)
buildTextStringSearch
( pos + 1, str, acc, posX + xSpace, posY, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else if posY + ySpace < #h windowData then
let
val chrVec = chrFun
( startX, posY + ySpace, fontSize, fontSize
, fw, fh, hr, hg, hb
)
val acc = chrVec :: acc
in
(* can start building after cursor now,
* since cursor was built *)
buildTextStringSearch
( pos + 1, str, acc, startX + xSpace, posY + ySpace, startX
, tl, absIdx + 1, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
end
else
accToDrawMsg (acc, cursorAcc)
end
end
else
(* change to searching in string's tl *)
case tl of
hd :: tl =>
buildTextStringSearch
( 0, hd, acc, posX, posY, startX
, tl, absIdx, cursorPos, cursorAcc
, windowData, colourData
, searchHd, searchTl, searchPos, searchLen
)
| [] =>
accToDrawMsg (acc, cursorAcc)
fun build fun build
(startLine, cursorPos, lineGap: LineGap.t, windowWidth, windowHeight) = ( startLine, cursorPos, lineGap: LineGap.t
, windowWidth, windowHeight
, searchList: SearchList.t, searchString
) =
let let
val {rightStrings, rightLines, line = curLine, idx = curIdx, ...} = lineGap val {rightStrings, rightLines, line = curLine, idx = curIdx, ...} = lineGap
in in
@@ -262,6 +481,7 @@ struct
else else
0 0
val absIdx = curIdx + startIdx val absIdx = curIdx + startIdx
val searchList = SearchList.goToNum (absIdx, searchList)
val windowData = val windowData =
{ w = windowWidth { w = windowWidth
@@ -279,11 +499,24 @@ struct
, hb = 0.25 , hb = 0.25
} }
in in
(case #right searchList of
searchHd :: searchTl =>
let
val searchPos = BinSearch.equalOrMore (absIdx, searchHd)
in
buildTextStringSearch
( startIdx, rStrHd, [], 5, 5, 5
, rStrTl, absIdx, cursorPos, []
, windowData, colourData
, searchHd, searchTl, searchPos, String.size searchString
)
end
| [] =>
buildTextString buildTextString
( startIdx, rStrHd, [], 5, 5, 5 ( startIdx, rStrHd, [], 5, 5, 5
, rStrTl, absIdx, cursorPos, [] , rStrTl, absIdx, cursorPos, []
, windowData, colourData , windowData, colourData
) ))
end end
| (_, _) => | (_, _) =>
(* requested line goes beyond the buffer, (* requested line goes beyond the buffer,