Merge pull request #38 from art-w/sigwinch

dinosaure · web-flow · commit a99d5bbc5ada · 2023-09-25T12:16:50.000+02:00
Add missing `ocaml_terminal_get_sigwinch` for unsupported platform
diff --git a/src/progress/dune b/src/progress/dune
@@ -1,6 +1,9 @@
 (library
  (name progress)
  (public_name progress)
+ (foreign_stubs
+  (language c)
+  (names terminal_stubs))
  (libraries
   (re_export progress.engine)
   (re_export terminal)
diff --git a/src/progress/terminal_stubs.c b/src/progress/terminal_stubs.c
@@ -91,6 +91,11 @@ CAMLprim value ocaml_terminal_get_terminal_dimensions(value unit)
 // Unsupported platform
 #else
 
+CAMLprim value ocaml_terminal_get_sigwinch()
+{
+  return Val_int(0);
+}
+
 CAMLprim value ocaml_terminal_get_terminal_dimensions(value unit)
 {
 	CAMLparam1(unit);
diff --git a/src/progress/terminal_width.ml b/src/progress/terminal_width.ml
@@ -3,18 +3,32 @@
    Distributed under the MIT license. See terms at the end of this file.
   ————————————————————————————————————————————————————————————————————————————*)
 
+external sigwinch : unit -> int option = "ocaml_terminal_get_sigwinch"
+(** The number of the signal used to indicate terminal size changes. [None] on
+    Windows. *)
+
+type dimensions = { rows : int; columns : int }
+
+external get_dimensions : unit -> dimensions option
+  = "ocaml_terminal_get_terminal_dimensions"
+
+let get_columns () =
+  match get_dimensions () with
+  | Some { columns; _ } -> Some columns
+  | None -> None
+
 let on_change = ref (fun _ -> ())
 let latest_width = ref None
 
 let initialise =
   let handle_signal _ =
-    let width = Terminal.Size.get_columns () in
+    let width = get_columns () in
     latest_width := width;
     !on_change width
   in
   lazy
-    (latest_width := Terminal.Size.get_columns ();
-     match Terminal.Size.sigwinch with
+    (latest_width := get_columns ();
+     match sigwinch () with
      | None -> ()
      | Some n -> Sys.set_signal n (Signal_handle handle_signal))
 
diff --git a/src/terminal/dune b/src/terminal/dune
@@ -1,7 +1,4 @@
 (library
  (name terminal)
  (public_name terminal)
- (foreign_stubs
-  (language c)
-  (names terminal_stubs))
  (libraries stdlib-shims uutf uucp))
diff --git a/src/terminal/terminal.ml b/src/terminal/terminal.ml
@@ -10,25 +10,6 @@ module Ansi = Ansi
 let guess_printed_width, truncate_to_width =
   Ansi.(guess_printed_width, truncate_to_width)
 
-module Size = struct
-  type dimensions = { rows : int; columns : int }
-
-  external sigwinch : unit -> int option = "ocaml_terminal_get_sigwinch"
-
-  external get_dimensions : unit -> dimensions option
-    = "ocaml_terminal_get_terminal_dimensions"
-
-  let get_rows () =
-    match get_dimensions () with Some { rows; _ } -> Some rows | None -> None
-
-  let get_columns () =
-    match get_dimensions () with
-    | Some { columns; _ } -> Some columns
-    | None -> None
-
-  let sigwinch = sigwinch ()
-end
-
 (*————————————————————————————————————————————————————————————————————————————
    Copyright (c) 2020–2021 Craig Ferguson <me@craigfe.io>
 
diff --git a/src/terminal/terminal.mli b/src/terminal/terminal.mli
@@ -80,21 +80,6 @@ module Ansi : sig
   val erase_display_suffix : string
 end
 
-module Size : sig
-  val sigwinch : int option
-  (** The number of the signal used to indicate terminal size changes. [None] on
-      Windows. *)
-
-  (** Functions for getting the size of the terminal to which [stdout] is
-      attached (provided [stdout] is a TTY). *)
-
-  type dimensions = { rows : int; columns : int }
-
-  val get_dimensions : unit -> dimensions option
-  val get_columns : unit -> int option
-  val get_rows : unit -> int option
-end
-
 val guess_printed_width : string -> int
 (** [guess_printed_width s] returns an estimate of the number of terminal
     columns that the UTF-8 encoded string [s] would occupy if displayed in a
