display connect/disconnect

4 files changed, 89 insertions, 21 deletions

diff --git a/lib/CWayland/CWayland.c b/lib/CWayland/CWayland.c
deleted file mode 100644
index 10c1cc2..0000000
--- a/lib/CWayland/CWayland.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "CWayland.h"
-#include <wayland-client.h>
-
-lean_obj_res lean_test_answer()
-{
-    struct wl_display* disp = wl_display_connect(NULL);
-    wl_fixed_t fixed = wl_fixed_from_double(42.0);
-    return lean_io_result_mk_ok(lean_int_to_int(wl_fixed_to_int(fixed)));
-}
\ No newline at end of file
diff --git a/lib/CWayland/CWayland.cc b/lib/CWayland/CWayland.cc
new file mode 100644
index 0000000..5877ad4
--- /dev/null
+++ b/lib/CWayland/CWayland.cc
@@ -0,0 +1,60 @@
+#include "CWayland.h"
+#include <wayland-client.h>
+
+static void noop_foreach(void *ptr, b_lean_obj_arg fn)
+{
+}
+
+static void waylean_display_finalize(void* ptr)
+{
+    wl_display* disp = static_cast<wl_display*>(ptr);
+    wl_display_disconnect(disp);
+}
+
+static lean_external_class* waylean_display_class()
+{
+    static lean_external_class* klass = lean_register_external_class(&waylean_display_finalize, &noop_foreach);
+    return klass;
+}
+
+static char const* option_cstr_or_null(b_lean_obj_arg str)
+{
+    if (lean_is_scalar(str))
+    {
+        return nullptr;
+    }
+    else
+    {
+        lean_object* val = lean_ctor_get(str, 0);
+        return lean_string_cstr(val);
+    }
+}
+
+static lean_obj_res io_result_mk_from_errno(char const* file_name)
+{
+    int err = errno;
+    lean_object* file_name_str = lean_mk_string(file_name);
+    lean_object* error = lean_decode_io_error(err, file_name_str);
+    lean_dec(file_name_str);
+
+    return lean_io_result_mk_error(error);
+}
+
+// Display.new : (name : @& Option String) → IO Display
+lean_obj_res waylean_display_new(b_lean_obj_arg name)
+{
+    char const* name_cstr = option_cstr_or_null(name);
+    wl_display* disp = wl_display_connect(name_cstr);
+    if (!disp) { return io_result_mk_from_errno(name_cstr ? name_cstr : "<default>"); }
+
+    lean_object* waylean_disp = lean_alloc_external(waylean_display_class(), disp);
+    return lean_io_result_mk_ok(waylean_disp);
+}
+
+// Display.getVersion : (display : @& Display) → IO UInt32
+lean_obj_res waylean_display_get_version(b_lean_obj_arg display)
+{
+    wl_display* disp = static_cast<wl_display*>(lean_get_external_data(display));
+    lean_object* version = lean_box_uint32(wl_display_get_version(disp));
+    return lean_io_result_mk_ok(version);
+}
\ No newline at end of file
diff --git a/lib/CWayland/CWayland.h b/lib/CWayland/CWayland.h
index 42bc5ee..adcadc0 100644
--- a/lib/CWayland/CWayland.h
+++ b/lib/CWayland/CWayland.h
@@ -2,19 +2,29 @@
 
 #include <lean/lean.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 // Display
 
-lean_obj_res waylean_display_new(void);
+lean_obj_res waylean_display_new        (b_lean_obj_arg name);
+lean_obj_res waylean_display_get_version(b_lean_obj_arg display);
 
 // Event Loop
 
 lean_obj_res waylean_event_loop_new        (void);
-lean_obj_res waylean_event_loop_add_display(lean_obj_arg event_loop,
-                                            lean_obj_arg display);
-lean_obj_res waylean_event_loop_add_timer  (lean_obj_arg event_loop,
-                                            unsigned     delay_ms,
-                                            lean_obj_arg message);
-lean_obj_res waylean_event_loop_add_signal (lean_obj_arg event_loop,
-                                            int          signum,
-                                            lean_obj_arg message);
-lean_obj_res waylean_event_loop_poll       (lean_obj_arg event_loop);
\ No newline at end of file
+lean_obj_res waylean_event_loop_add_display(b_lean_obj_arg event_loop,
+                                            b_lean_obj_arg display);
+lean_obj_res waylean_event_loop_add_timer  (b_lean_obj_arg event_loop,
+                                            unsigned       delay_ms,
+                                            b_lean_obj_arg message);
+lean_obj_res waylean_event_loop_add_signal (b_lean_obj_arg event_loop,
+                                            int            signum,
+                                            b_lean_obj_arg message);
+lean_obj_res waylean_event_loop_poll       (b_lean_obj_arg event_loop);
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/lib/Wayland/Native.lean b/lib/Wayland/Native.lean
index ded2e3a..c529b63 100644
--- a/lib/Wayland/Native.lean
+++ b/lib/Wayland/Native.lean
@@ -1,2 +1,9 @@
-@[extern "lean_test_answer"]
-opaque testAnswer : IO Int
+private opaque DisplayP : NonemptyType
+def Display : Type := DisplayP.type
+instance : Nonempty Display := DisplayP.property
+
+@[extern "waylean_display_new"]
+opaque Display.new : (name : @& Option String) → IO Display
+
+@[extern "waylean_display_get_version"]
+opaque Display.getVersion : (display : @& Display) → IO UInt32