X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=172e688ae421e17536a44be88ac220601662ce62;hb=b3e6d76a1729ead40eb1fa5af98d8d734dfdd09b;hp=a3108b37ef316a15fe0d6549763bba738c42fb8b;hpb=628df48e0238391658dab54f81dfa1c62dbfb3ec;p=staging%2Fwindowmanager.git

diff --git a/src/app.hpp b/src/app.hpp
index a3108b3..172e688 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,48 +5,43 @@
 #ifndef TMCAGLWM_APP_HPP
 #define TMCAGLWM_APP_HPP
 
-#include <json.hpp>
-#include <experimental/optional>
+#include <json-c/json.h>
+#include <memory>
 
-namespace wm {
-
-    using std::experimental::optional;
-    using std::experimental::nullopt;
+#include "afb_binding_api.hpp"
+#include "result.hpp"
+#include "wayland.hpp"
 
-    template <typename E, typename T>
-    struct result {
-        optional<E> e;
-        optional<T> t;
+namespace wl {
+struct display;
+}
 
-        bool is_ok() const { return this->t != nullopt; }
-        bool is_err() const { return this->e != nullopt; }
-        T unwrap() { return this->t.value(); }
-    };
+namespace genivi {
+struct controller;
+}
 
-    template <typename E, typename T>
-    struct result<E, T> Err(E e) { return result<E, T>{e, nullopt}; }
-
-    template <typename E, typename T>
-    struct result<E, T> Ok(T t) { return result<E, T>{nullopt, t}; }
+namespace wm {
 
-    using json = nlohmann::json;
+struct App {
+   struct binding_api api;
 
-    struct App {
-        struct API {
-            struct App *app;
+   // This is the one thing, we do not own.
+   struct wl::display *display;
 
-            result<char const *, json> debug_status() const;
-            result<char const *, json> debug_layers() const;
-            result<char const *, json> debug_surfaces() const;
+   std::unique_ptr<struct genivi::controller> controller;
+   std::vector<std::unique_ptr<struct wl::output>> outputs;
 
-            result<char const *, json> register_surface(uint32_t appid, uint32_t surfid);
-        };
+   App(wl::display *d);
+   ~App();
 
-        struct API api;
+   App(App const &) = delete;
+   App &operator=(App const &) = delete;
 
-        App();
-    };
+   int init();
+   int dispatch_events();
+   int init_layout();
+};
 
-} // namespace wm
+}  // namespace wm
 
-#endif //TMCAGLWM_APP_HPP
+#endif  // TMCAGLWM_APP_HPP