fix: show cursor on exit

leostera · Jan 11, 2024 · 3ebe778 · 3ebe778
1 parent 5d0f5c9
commit 3ebe778
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 11 deletions.
diff --git a/examples/altscreen-toggle/demo.gif b/examples/altscreen-toggle/demo.gif
diff --git a/examples/basic/demo.gif b/examples/basic/demo.gif
diff --git a/examples/counter/demo.gif b/examples/counter/demo.gif
diff --git a/examples/emoji/demo.gif b/examples/emoji/demo.gif
diff --git a/examples/fps/demo.gif b/examples/fps/demo.gif
diff --git a/examples/fullscreen/demo.gif b/examples/fullscreen/demo.gif
diff --git a/examples/progress/demo.gif b/examples/progress/demo.gif
diff --git a/examples/progress/main.ml b/examples/progress/main.ml
@@ -12,7 12,7 @@ type model = {
 let initial_model =
  let width = 50 in
  {
- gray_bar = Progress.make ~width ~color:(`Plain (Spices.color "#3f22a3")) ();
  gray_bar = Progress.make ~width ~color:(`Plain (Spices.color "#3fa2a3")) ();
  color_bar =
  Progress.make ~width
  ~color:(`Gradient (Spices.color "#b14fff", Spices.color "#00ffa3"))
@@ -27,9 27,9 @@ let update event m =
  match event with
  | Event.KeyDown (Key "q" | Escape) -> (m, Command.Quit)
  | Event.Frame _now ->
- let gray_bar = Progress.increment m.gray_bar 0.01 in
- let color_bar = Progress.increment m.color_bar (Random.float 0.01) in
- let emoji_bar = Progress.increment m.emoji_bar 0.005 in
  let gray_bar = Progress.increment m.gray_bar 0.001 in
  let color_bar = Progress.increment m.color_bar (Random.float 0.0001) in
  let emoji_bar = Progress.increment m.emoji_bar 0.00005 in
  ({ gray_bar; color_bar; emoji_bar }, Command.Noop)
  | _ -> (m, Command.Noop)
 

diff --git a/examples/spinner/demo.gif b/examples/spinner/demo.gif
diff --git a/examples/spinner/main.ml b/examples/spinner/main.ml
@@ -25,7 25,7 @@ let initial_model =
  ];
  }
 
-let init _ = Command.Noop
 let init _ = Command.Hide_cursor
 
 let update event model =
  match event with

diff --git a/examples/stopwatch/demo.gif b/examples/stopwatch/demo.gif
diff --git a/examples/text-input/demo.gif b/examples/text-input/demo.gif
diff --git a/examples/views/demo.gif b/examples/views/demo.gif
diff --git a/minttea/program.ml b/minttea/program.ml
@@ -22,6 22,7 @@ and handle_input renderer app model event =
  match handle_cmd cmd renderer with
  | exception Exit ->
  Renderer.render renderer view;
  Renderer.show_cursor renderer;
  Renderer.exit_alt_screen renderer;
  Renderer.shutdown renderer;
  wait_pids [ renderer ]
@@ -57,7 58,8 @@ let run ({ fps; _ } as t) initial_model =
  let renderer =
  spawn (fun () ->
  process_flag (Priority High);
- Renderer.run ~fps)
  let runner = Process.await_name "Minttea.runner" in
  Renderer.run ~fps ~runner)
  in
  let runner =
  spawn (fun () ->

diff --git a/minttea/renderer.ml b/minttea/renderer.ml
@@ -10,6 10,7 @@ type Message.t =
  | Set_cursor_visibility of [ `hidden | `visible ]
 
 type t = {
  runner : Pid.t;
  ticker : Timer.timer;
  width : int;
  height : int;
@@ -53,7 54,7 @@ and restore t =
 and tick t =
  let now = Ptime_clock.now () in
  if is_empty t || same_as_last_flush t then () else flush t;
- send_by_name ~name:"Minttea.runner" (Io_loop.Input (Event.Frame now))
  send t.runner (Io_loop.Input (Event.Frame now))
 
 and flush t =
  let new_lines = lines t in
@@ -77,7 78,7 @@ and flush t =
  t.lines_rendered <- new_lines_this_flush;
  t.buffer <- ""
 
-and handle_render t output = t.buffer <- output
 and handle_render t output = t.buffer <- output ^ "\n"
 
 and handle_enter_alt_screen t =
  if t.is_altscreen_active then ()
@@ -106,14 107,14 @@ let max_fps = 120
 let cap fps = Int.max 1 (Int.min fps max_fps) |> Int.to_float
 let fps_to_float fps = 1. /. cap fps *. 1_000. |> Int64.of_float
 
-let run ~fps =
- let _ = Process.await_name "Minttea.runner" in
 let run ~fps ~runner =
  let ticker =
  Riot.Timer.send_interval ~every:(fps_to_float fps) (self ()) Tick
  |> Result.get_ok
  in
  loop
  {
  runner;
  ticker;
  buffer = "";
  width = 0;

diff --git a/minttea/renderer.mli b/minttea/renderer.mli
@@ -1,6 1,6 @@
 open Riot
 
-val run : fps:int -> unit
 val run : fps:int -> runner:Pid.t -> unit
 val render : Pid.t -> string -> unit
 val enter_alt_screen : Pid.t -> unit
 val exit_alt_screen : Pid.t -> unit