提交: d166d2264b343b337c4f21c69d2773e56b03dbeb - flitter-nix (git)

A Nix-friendly SQLite-enhanced fork of Flitter, a speedrunning split timer for Unix-style terminals

Commit MetaInfo

• 修订版: d166d2264b343b337c4f21c69d2773e56b03dbeb (tree)
• 时间: 2023-05-31 04:03:33
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Remove two more gettimeofday().

更改概述

• modified: src/event_loop.ml
• modified: src/event_loop.mli

差异

--- a/src/event_loop.ml
+++ b/src/event_loop.ml
@@ -1,10 +1,11 @@
 open Core
 open Timer_types
 
-type t = {
-  timer : Timer_types.timer;
+type 'a t = {
+  timer : 'a;
   display : Display.t;
   last_draw : float;
+  now : float;
   hotkeys_stream : Hotkeys.t;
 }
 
@@ -13,16 +14,16 @@ type event = Draw_tick | Key of Hotkeys.keypress
 let draw_rate = 60.
 let period = 1. /. draw_rate
 
-let draw_event flitter =
-  let deadline = flitter.last_draw +. period in
-  let delay = deadline -. Core_unix.gettimeofday () in
+let draw_event l =
+  let deadline = l.last_draw +. period in
+  let delay = deadline -. l.now in
   let%lwt () =
     if Float.(delay > 0.) then Lwt_unix.sleep delay else Lwt.return_unit
   in
   Lwt.return Draw_tick
 
-let keyboard_event flitter =
-  match%lwt Lwt_stream.get flitter.hotkeys_stream with
+let keyboard_event l =
+  match%lwt Lwt_stream.get l.hotkeys_stream with
   | Some keypress -> Lwt.return (Key keypress)
   | None -> failwith "Hotkeys stream exited unexpectedly"
 
@@ -31,10 +32,10 @@ let array_replace arr i value =
   copy.(i) <- value;
   copy
 
-let handle_key flitter (t, key_str) =
-  let timer = flitter.timer in
+let handle_key l (t, key_str) =
+  let timer = l.timer in
   let new_timer =
-    match flitter.timer.state with
+    match timer.state with
     | Idle -> (
         match key_str with
         | "space" | "j" ->
@@ -126,45 +127,44 @@ let handle_key flitter (t, key_str) =
         | "q" -> raise Stdlib.Exit
         | _ -> timer)
   in
-  { flitter with timer = new_timer }
+  { l with timer = new_timer }
 
-let handle_draw flitter =
-  let now = Core_unix.gettimeofday () in
-  let timer =
-    { flitter.timer with state = update_now flitter.timer.state now }
-  in
-  Display.draw flitter.display timer;
-  { flitter with timer; last_draw = now }
+let handle_draw l =
+  let timer = { l.timer with state = update_now l.timer.state l.now } in
+  Display.draw l.display timer;
+  { l with timer; last_draw = l.now }
 
-let rec handle_events flitter events =
+let rec handle_events l events =
   match events with
   | evt :: remaining_evts ->
       let new_flitter =
         match evt with
-        | Draw_tick -> handle_draw flitter
-        | Key keypress -> handle_key flitter keypress
+        | Draw_tick -> handle_draw l
+        | Key keypress -> handle_key l keypress
       in
       handle_events new_flitter remaining_evts
-  | [] -> flitter
+  | [] -> l
 
 let make timer =
   let%lwt hotkeys_stream = Hotkeys.make_stream () in
+  let now = Core_unix.gettimeofday () in
   Lwt.return
     {
       timer;
       display = Display.make ();
       (* Make sure we're due for a draw *)
-      last_draw = Core_unix.gettimeofday () -. period;
+      last_draw = now -. period;
+      now;
       hotkeys_stream;
     }
 
-let loop flitter =
-  let rec loop' flitter =
-    let%lwt events = Lwt.npick [ draw_event flitter; keyboard_event flitter ] in
-    match handle_events flitter events with
+let loop l =
+  let rec loop' l =
+    let%lwt events = Lwt.npick [ draw_event l; keyboard_event l ] in
+    match handle_events l events with
     | new_flitter -> loop' new_flitter
     | exception Stdlib.Exit ->
-        Display.close flitter.display;
+        Display.close l.display;
         Lwt.return ()
   in
-  loop' flitter
+  loop' l

--- a/src/event_loop.mli
+++ b/src/event_loop.mli
@@ -1,4 +1,4 @@
-type t
+type 'a t
 
-val make : Timer_types.timer -> t Lwt.t
-val loop : t -> unit Lwt.t
+val make : 'a -> 'a t Lwt.t
+val loop : Timer_types.timer t -> unit Lwt.t