From 7678bfc942bd501f8e121ff153d1852d73578257 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Wed, 12 Jul 2017 16:40:29 +0200 Subject: [PATCH] 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 --- src/CMakeLists.txt | 3 +- src/app.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++-- src/app.hpp | 14 ++++++- src/main.cpp | 108 +++-------------------------------------------- 4 files changed, 136 insertions(+), 109 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4bb082f..a0d3db6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,8 @@ target_include_directories(winman PRIVATE ${AFB_INCLUDE_DIRS} ${SD_INCLUDE_DIRS} - ../include) + ../include + ../src) target_link_libraries(winman PRIVATE diff --git a/src/app.cpp b/src/app.cpp index 74f3bfa..6515978 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -7,13 +7,127 @@ #include "json_helper.hpp" #include "wayland.hpp" +#include + #include namespace wm { - App::App() - : api{this}, display{}, controller{} - {} + namespace { + App *g_app; + } + + App::App(wl::display *d) + : api{this}, display{d}, controller{}, outputs() + { + assert(g_app == nullptr); + g_app = this; + } + + int App::init() { + if (!this->display->ok()) { + return -1; + } + + this->display->r.add_global_handler("wl_output", [](wl_registry *r, + uint32_t name, + uint32_t v) { + g_app->outputs.emplace_back(std::make_unique(r, name, v)); + }); + + this->display->r.add_global_handler( + "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) { + g_app->controller = + std::make_unique(r, name, v); + + // XXX: This protocol needs the output, so lets just add our mapping + // here... + g_app->controller->add_proxy_to_id_mapping( + g_app->outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + g_app->outputs.back()->proxy.get()))); + }); + + // First level objects + this->display->roundtrip(); + // Second level objects + this->display->roundtrip(); + // Third level objects + this->display->roundtrip(); + + return init_layout(); + } + + int App::dispatch_events() { + int ret = this->display->dispatch(); + if (ret == -1) { + logerror("wl_display_dipatch() returned error %d", + this->display->get_error()); + return -1; + } + this->display->flush(); + + // execute pending tasks, that is layout changes etc. + this->controller->execute_pending(); + this->display->roundtrip(); + + return 0; + } + + // _ _ _ _ _ ____ + // (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ + // | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | + // | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | + // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | + // |_____| |___/ \_\/_/ + int App::init_layout() { + if (!this->controller) { + logerror("ivi_controller global not available"); + return -1; + } + + if (this->outputs.empty()) { + logerror("no output was set up!"); + return -1; + } + + auto &c = this->controller; + + auto &o = this->outputs.front(); + auto &s = c->screens.begin()->second; + auto &layers = c->layers; + + // XXX: Write output dimensions to ivi controller... + c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + + // Clear scene + layers.clear(); + + // Clear screen + s->clear(); + + // Setup our dummy scene... + c->layer_create(100, 0, 0); // bottom layer, anything else + c->layer_create(1000, 0, 0); // top layer, mandelbrot + + auto &l100 = c->layers[100]; + auto &l1k = c->layers[1000]; + + // Set layers fullscreen + l100->set_destination_rectangle(0, 0, o->width, o->height); + l1k->set_destination_rectangle(0, 0, o->width, o->height); + l100->set_visibility(1); + l1k->set_visibility(1); + + // Add layers to screen + s->set_render_order({100, 1000}); + + c->commit_changes(); + + this->display->flush(); + + return 0; + } binding_api::result_type binding_api::register_surface(uint32_t appid, uint32_t surfid) { 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 +#include +#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 controller; + std::vector> outputs; + + App(wl::display *d); + + int init(); + int dispatch_events(); + int init_layout(); }; } // namespace wm diff --git a/src/main.cpp b/src/main.cpp index 23b1b4d..6de8597 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,11 +14,9 @@ extern "C" { namespace { struct afb_instance { std::unique_ptr display; - std::unique_ptr controller; - std::vector> outputs; wm::App app; - afb_instance() : display{new wl::display}, controller{nullptr}, outputs{}, app{} {} + afb_instance() : display{new wl::display}, app{this->display.get()} {} int init(); }; @@ -30,90 +28,7 @@ int afb_instance::init() { return -1; } - this->display->r.add_global_handler("wl_output", [](wl_registry *r, - uint32_t name, - uint32_t v) { - g_afb_instance->outputs.emplace_back(std::make_unique(r, name, v)); - }); - - this->display->r.add_global_handler( - "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) { - g_afb_instance->controller = - std::make_unique(r, name, v); - - // XXX: This protocol needs the output, so lets just add our mapping - // here... - g_afb_instance->controller->add_proxy_to_id_mapping( - g_afb_instance->outputs.back()->proxy.get(), - wl_proxy_get_id(reinterpret_cast( - g_afb_instance->outputs.back()->proxy.get()))); - }); - - // First level objects - this->display->roundtrip(); - // Second level objects - this->display->roundtrip(); - // Third level objects - this->display->roundtrip(); - - // Init the app's members - this->app.display = this->display.get(); - this->app.controller = this->controller.get(); - - return 0; -} - -// _ _ _ _ _ ____ -// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ -// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | -// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | -// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | -// |_____| |___/ \_\/_/ -char const *init_layout() { - if (!g_afb_instance->controller) { - return "ivi_controller global not available"; - } - - if (g_afb_instance->outputs.empty()) { - return "no output was set up!"; - } - - auto &c = g_afb_instance->controller; - - auto &o = g_afb_instance->outputs.front(); - auto &s = c->screens.begin()->second; - auto &layers = c->layers; - - // XXX: Write output dimensions to ivi controller... - c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; - - // Clear scene - layers.clear(); - - // Clear screen - s->clear(); - - // Setup our dummy scene... - c->layer_create(100, 0, 0); // bottom layer, anything else - c->layer_create(1000, 0, 0); // top layer, mandelbrot - - auto &l100 = c->layers[100]; - auto &l1k = c->layers[1000]; - - // Set layers fullscreen - l100->set_destination_rectangle(0, 0, o->width, o->height); - l1k->set_destination_rectangle(0, 0, o->width, o->height); - l100->set_visibility(1); - l1k->set_visibility(1); - - // Add layers to screen - s->set_render_order({100, 1000}); - - c->commit_changes(); - - g_afb_instance->display->flush(); - - return nullptr; + return this->app.init(); } int display_event_callback(sd_event_source *evs, int fd, uint32_t events, @@ -126,17 +41,9 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events, } if (events & EPOLLIN) { - int ret = g_afb_instance->display->dispatch(); - if (ret == -1) { - logerror("wl_display_dipatch() returned error %d", - g_afb_instance->display->get_error()); - goto error; - } - g_afb_instance->display->flush(); - - // execute pending tasks, that is layout changes etc. - g_afb_instance->controller->execute_pending(); - g_afb_instance->display->roundtrip(); + if (g_afb_instance->app.dispatch_events() == -1) { + goto error; + } } return 0; @@ -171,11 +78,6 @@ int binding_init_() { goto error; } - if (char const *e = init_layout()) { - logerror("Could not init layout: %s", e); - goto error; - } - { int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr, g_afb_instance->display->get_fd(), EPOLLIN, -- 2.16.6