aboutsummaryrefslogtreecommitdiff
path: root/lib/stitched_article.ml
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-05-15 11:17:48 -0500
committerMarc Coquand <marc@mccd.space>2024-05-15 11:17:48 -0500
commitdb4e445ee0f29c1179b5d0746217e5b5525ff3e2 (patch)
tree1f30d6f7d3305d7f8becbed3297b033899d9251f /lib/stitched_article.ml
parent47be0ea3eeb774102f02b5f85ee974afe6a8170e (diff)
downloadstitch-db4e445ee0f29c1179b5d0746217e5b5525ff3e2.tar.gz
stitch-db4e445ee0f29c1179b5d0746217e5b5525ff3e2.tar.bz2
stitch-db4e445ee0f29c1179b5d0746217e5b5525ff3e2.zip
State handling done
Diffstat (limited to '')
-rw-r--r--lib/stitched_article.ml41
1 files changed, 23 insertions, 18 deletions
diff --git a/lib/stitched_article.ml b/lib/stitched_article.ml
index ceedc46..c71ca14 100644
--- a/lib/stitched_article.ml
+++ b/lib/stitched_article.ml
@@ -10,32 +10,17 @@ type state =
; content : (string * int * string * int) array
; go_back : unit -> unit
; content_pretty : Grep.display_type array
+ ; todo_state : Todos.state option
}
-let render_line size_x y scroll (el : Grep.display_type) i =
- match el with
- | Bold el ->
- if i == y - scroll
- then (
- let fill = String.make (max (size_x - String.length el) 0) ' ' in
- I.strf "%s%s" ~attr:A.(st bold ++ st reverse) el fill |> I.pad ~l:0 ~t:i)
- else I.strf "%s" ~attr:A.(st bold) el |> I.pad ~l:0 ~t:i
- | Normal el ->
- if i == y - scroll
- then (
- let fill = String.make (max (size_x - String.length el) 0) ' ' in
- I.strf "%s%s" ~attr:A.(st reverse) el fill |> I.pad ~l:0 ~t:i)
- else I.strf "%s" el |> I.pad ~l:0 ~t:i
-
-
(* TODO: Use grep -l to filter notes by regexp and rerender those files*)
-let rec render t ({ pos; scroll; content_pretty; go_back; content } as state) =
+let rec render t ({ pos; scroll; content_pretty; go_back; content; todo_state } as state) =
let size_x, size_y = Common.Term.size t in
let x, y = pos in
let img =
let elements =
Array.mapi
- (fun i el -> render_line size_x y scroll el i)
+ (fun i el -> Compontent.current_line size_x y scroll el i)
(* TODO: Fix this ugly slow conversion *)
(Array.to_seq content_pretty |> Seq.drop scroll |> Array.of_seq)
in
@@ -65,6 +50,26 @@ let rec render t ({ pos; scroll; content_pretty; go_back; content } as state) =
| `Key (`ASCII 'j', []) | `Key (`ASCII 'N', [ `Ctrl ]) -> scroll_down ()
| `Key (`ASCII 'k', []) | `Key (`ASCII 'P', [ `Ctrl ]) -> scroll_up ()
| `Key (`ASCII '?', []) -> Help_screen.render t { go_back = (fun () -> render t state) }
+ | `Key (`ASCII '2', []) ->
+ (match todo_state with
+ | Some todo_state ->
+ Todos.render
+ t
+ { todo_state with
+ goto_headlines =
+ (fun new_state -> render t { state with todo_state = Some new_state })
+ }
+ | None ->
+ let todo_content = Grep.get_todos () |> Grep.parse_todo_string in
+ let todo_pretty = Grep.pretty_format_todo todo_content in
+ let todo_state =
+ Todos.init
+ ~goto_headlines:(fun new_state ->
+ render t { state with todo_state = Some new_state })
+ ~content:(todo_content |> Array.of_list)
+ ~content_pretty:(todo_pretty |> Array.of_list)
+ in
+ Todos.render t todo_state)
| `Key (`ASCII 'e', []) | `Key (`Enter, []) ->
(* Editor might be set with extra args, in that case we need to separate these *)
let[@warning "-8"] (editor :: args) =