main: move most of main to app, separate ownership

* Move everything apart from the display connection itself to App.
* Everything depending on the display however is owned by App.
* Dispatch events for the application in App::dispatch_events()
That is, display_dispatch and local stuff e.g. execute_pending().

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/src/app.hpp b/src/app.hpp
index 397548a..f6238af 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,7 +6,9 @@
 #define TMCAGLWM_APP_HPP
 
 #include <json-c/json.h>
+#include <memory>
 
+#include "wayland.hpp"
 #include "result.hpp"
 #include "afb_api.hpp"
 
@@ -21,10 +23,18 @@ namespace wm {
 
     struct App {
         struct binding_api api;
+
+        // This is the one thing, we do not own.
         struct wl::display *display;
-        struct genivi::controller *controller;
 
-        App();
+        std::unique_ptr<struct genivi::controller> controller;
+        std::vector<std::unique_ptr<struct wl::output>> outputs;
+
+        App(wl::display *d);
+
+        int init();
+        int dispatch_events();
+        int init_layout();
     };
 
 } // namespace wm