Bind a couple more functions related to output_layout

Author: Armael

examples/simple.ml

@@ -59,7 +59,10 @@ let output_remove_notify output_handles _ _output =
 let new_output_notify _ output =
   let o = { frame = Wl.Listener.create ();
             destroy = Wl.Listener.create (); } in
-  Output.set_best_mode output;
+  begin match Output.modes output with
+    | mode :: _ -> Output.set_mode output mode
+    | [] -> ()
+  end;
   Wl.Signal.add (Output.signal_frame output) o.frame output_frame_notify;
   Wl.Signal.add (Output.signal_destroy output) o.destroy
     (output_remove_notify o);

ffi/ffi.ml

@@ -124,13 +124,22 @@ struct
   let wlr_output_commit = foreign "wlr_output_commit"
       (wlr_output_p @-> returning bool)
 
+  let wlr_output_preferred_mode = foreign "wlr_output_preferred_mode"
+      (wlr_output_p @-> returning wlr_output_mode_p)
+
+  let wlr_output_enable = foreign "wlr_output_enable"
+      (wlr_output_p @-> bool @-> returning void)
+
   (* wlr_output_layout *)
 
   let wlr_output_layout_p = ptr Output_layout.t
 
   let wlr_output_layout_create = foreign "wlr_output_layout_create"
       (void @-> returning wlr_output_layout_p)
 
+  let wlr_output_layout_add_auto = foreign "wlr_output_layout_add_auto"
+      (wlr_output_layout_p @-> wlr_output_p @-> returning void)
+
   (* wlr_box *)
 
   let wlr_box_p = ptr Box.t

lib/dune

@@ -17,7 +17,7 @@
            wl log texture surface box matrix output
            keyboard pointer touch tablet_tool tablet_pad input_device
            backend renderer data_device compositor xdg_shell cursor
-           xcursor_manager seat)
+           xcursor_manager seat output_layout)
   (c_names generated_ffi_stubs)
   (c_flags (:standard -Werror -pedantic -Wall -Wunused -DWLR_USE_UNSTABLE -O0) -w
            (:include ../config/wlroots-ccopt.sexp)

lib/output.ml

@@ -38,17 +38,9 @@ let transform_matrix (output : t) : Matrix.t =
 let set_mode (output : t) (mode : Mode.t): unit =
   Bindings.wlr_output_set_mode output mode
 
-let best_mode (output : t): Mode.t option =
-  match modes output with
-  | [] -> None
-  | mode :: _ -> Some mode
-
-let set_best_mode (output : t) =
-  match best_mode output with
-  | None -> ()
-  | Some mode ->
-    (* TODO log the mode set *)
-    set_mode output mode |> ignore
+let preferred_mode output =
+  let mode = Bindings.wlr_output_preferred_mode output in
+  if is_null mode then None else Some mode
 
 let create_global (output : t) =
   Bindings.wlr_output_create_global output
@@ -60,9 +52,4 @@ let attach_render (output : t): bool =
 let commit (output : t): bool =
   Bindings.wlr_output_commit output
 
-module Layout = struct
-  type t = Types.Output_layout.t ptr
-  include Ptr
-
-  let create = Bindings.wlr_output_layout_create
-end
+let enable = Bindings.wlr_output_enable

lib/output_layout.ml

@@ -0,0 +1,11 @@
+open Ctypes
+open Wlroots_common.Utils
+
+module Bindings = Wlroots_ffi_f.Ffi.Make (Generated_ffi)
+module Types = Wlroots_ffi_f.Ffi.Types
+
+type t = Types.Output_layout.t ptr
+include Ptr
+
+let create = Bindings.wlr_output_layout_create
+let add_auto = Bindings.wlr_output_layout_add_auto

lib/wlroots.ml

@@ -1,5 +1,6 @@
 include Event
 
+module Output_layout = Output_layout
 module Seat = Seat
 module Xcursor_manager = Xcursor_manager
 module Cursor = Cursor

lib/wlroots.mli

@@ -100,23 +100,24 @@ module Output : sig
   (* Setting an output mode *)
   val modes : t -> Mode.t list
   val set_mode : t -> Mode.t -> unit
-  val best_mode : t -> Mode.t option
-  val set_best_mode : t -> unit
+  val preferred_mode : t -> Mode.t option
 
   val transform_matrix : t -> Matrix.t
   val create_global : t -> unit
   val attach_render : t -> bool
   val commit : t -> bool
+  val enable : t -> bool -> unit
 
   val signal_frame : t -> t Wl.Signal.t
   val signal_destroy : t -> t Wl.Signal.t
+end
 
-  module Layout : sig
-    type t
-    include Comparable0 with type t := t
+module Output_layout : sig
+  type t
+  include Comparable0 with type t := t
 
-    val create : unit -> t
-  end
+  val create : unit -> t
+  val add_auto : t -> Output.t -> unit
 end
 
 module Keyboard : sig
@@ -258,7 +259,7 @@ module Cursor : sig
   include Comparable0 with type t := t
 
   val create : unit -> t
-  val attach_output_layout : t -> Output.Layout.t -> unit
+  val attach_output_layout : t -> Output_layout.t -> unit
 
   val signal_motion : t -> Pointer.Event_motion.t Wl.Signal.t
   val signal_motion_absolute : t -> Pointer.Event_motion_absolute.t Wl.Signal.t

tinywl/tinywl.ml

@@ -2,21 +2,45 @@ open Wlroots
 
 type view
 
-type st = {
+type tinywl_output = {
+  output : Output.t;
+
+  frame : Wl.Listener.t;
+}
+
+type tinywl_server = {
   display : Wl.Display.t;
   backend : Backend.t;
   renderer : Renderer.t;
-  output_layout : Output.Layout.t;
-  mutable outputs : Output.t list;
+  output_layout : Output_layout.t;
+  mutable outputs : tinywl_output list;
   mutable views : view list;
   mutable keyboards : Keyboard.t list;
 
   new_output : Wl.Listener.t;
 }
 
-let server_new_output _st _ _ =
+let output_frame _st _ _ =
   failwith "todo"
 
+let server_new_output st _ output =
+  let output_ok =
+    match Output.preferred_mode output with
+    | Some mode ->
+      Output.set_mode output mode;
+      Output.enable output true;
+      Output.commit output
+    | None -> true
+  in
+  if output_ok then begin
+    let o = { output; frame = Wl.Listener.create () } in
+    Wl.Signal.add (Output.signal_frame output) o.frame (output_frame st);
+    st.outputs <- o :: st.outputs;
+
+    Output_layout.add_auto st.output_layout output;
+    Output.create_global output;
+  end
+
 let server_new_xdg_surface _st _ _ =
   failwith "todo"
 
@@ -60,7 +84,7 @@ let () =
   let _compositor = Compositor.create display renderer in
   let _data_manager = Data_device.Manager.create display in
 
-  let output_layout = Output.Layout.create () in
+  let output_layout = Output_layout.create () in
 
   let xdg_shell = Xdg_shell.create display in