X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=5b140f2ac190db0c9be86620ace768acbe89bee4;hb=6fdda786876d9640a6a26f05ef2c5aa7e2175421;hp=4593f22a68b6f9fb4b26deed412453a289a92899;hpb=675184e57e4b1a04f871babc2bc777c6f53e7b6f;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index 4593f22..5b140f2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,27 @@ +/* + * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "app.hpp" #include "json_helper.hpp" #include "util.hpp" #include "wayland.hpp" #include +#include + #include extern "C" { @@ -11,14 +30,12 @@ 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 +47,13 @@ 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(); - - return 0; + return this->app.init(); } -// _ _ _ _ _ ____ -// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ -// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | -// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | -// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | -// |_____| |___/ \_\/_/ -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)}; +int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events, + void * /*data*/) { + ST(); - // 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; -} - -int display_event_callback(sd_event_source *evs, int fd, uint32_t events, - void *data) { if ((events & EPOLLHUP) != 0) { logerror("The compositor hung up, dying now."); delete g_afb_instance; @@ -121,24 +61,31 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events, goto error; } - 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; + if ((events & EPOLLIN) != 0u) { + { + STN(display_read_events); + g_afb_instance->app.display->read_events(); + g_afb_instance->app.set_pending_events(); + } + { + // We want do dispatch pending wayland events from within + // the API context + STN(winman_ping_api_call); + afb_service_call("winman", "ping", json_object_new_object(), + [](void *c, int st, json_object *j) { + STN(winman_ping_api_call_return); + }, + nullptr); } - g_afb_instance->display->flush(); - - // execute pending tasks, that is layout changes etc. - g_afb_instance->controller->execute_pending(); - g_afb_instance->display->roundtrip(); } return 0; error: sd_event_source_unref(evs); + if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) { + exit(1); +} return -1; } @@ -167,11 +114,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, @@ -201,92 +143,20 @@ int binding_init() noexcept { return -1; } -// _ _ _ _ ____ -// __| | ___| |__ _ _ __ _ ___| |_ __ _| |_ _ _ ___ / /\ \ -// / _` |/ _ \ '_ \| | | |/ _` | / __| __/ _` | __| | | / __| | | | -// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | | -// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | | -// |___/_____| \_\/_/ -void debug_status(struct afb_req req) { - // Quick and dirty, dump current surfaces and layers - AFB_REQ_DEBUG(req, "status"); - - auto o = json_object_new_object(); - json_object_object_add(o, "surfaces", - to_json(g_afb_instance->controller->sprops)); - json_object_object_add(o, "layers", to_json(g_afb_instance->controller->lprops)); -// json_object_object_add(o, "screens", -// to_json(g_afb_instance->controller->screens)); - - afb_req_success(req, o, "status"); -} - -void debug_surfaces(afb_req req) { - afb_req_success(req, to_json(g_afb_instance->controller->sprops), "surfaces"); -} - -void debug_layers(afb_req req) { - afb_req_success(req, to_json(g_afb_instance->controller->lprops), "layers"); -} - -// Dummy register_surface implementation -void register_surface(afb_req req) { - AFB_DEBUG("register_surface"); - - auto jo = afb_req_json(req); - json_object *jappid; - if (! json_object_object_get_ex(jo, "appid", &jappid)) { - afb_req_fail(req, "failed", "register_surface needs 'appid' integer argument"); - return; - } - - json_object *jsurfid; - if (! json_object_object_get_ex(jo, "surfaceid", &jsurfid)) { - afb_req_fail(req, "failed", "register_surface needs 'surfaceid' integer argument"); - return; - } +} // namespace - uint32_t appid = json_object_get_int(jappid); - uint32_t surfid = json_object_get_int(jsurfid); +#include "afb_binding_glue.inl" - if (appid > 0xff) { - afb_req_fail(req, "failed", "invalid appid"); - return; +// XXX implement send_event right here... +namespace wm { +void binding_api::send_event(char const *evname, char const *label) { + logdebug("%s: %s(%s)", __func__, evname, label); + int ret = afb_daemon_broadcast_event(evname, json_object_new_string(label)); + if (ret != 0) { + logdebug("afb_event_broadcast failed: %m"); } - - if (surfid > 0xffff) { - afb_req_fail(req, "failed", "invalid surfaceid"); - return; - } - - lognotice("register_surface, got appid %d and surfaceid %d", appid, surfid); - - afb_req_success(req, json_object_new_int((appid << 16) + surfid), "success"); } - -#define WRAP(F) \ - [](afb_req req) noexcept { \ - if (g_afb_instance == nullptr) { \ - afb_req_fail(req, "failed", \ - "Binding not initialized, did the compositor die?"); \ - return; \ - } \ - try { \ - F(req); \ - } catch (std::exception & e) { \ - afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what()); \ - } \ - } - -const struct afb_verb_v2 verbs[] = { - {"debug::status", WRAP(debug_status), NULL, NULL, AFB_SESSION_NONE_V2}, - {"debug::layers", WRAP(debug_layers), NULL, NULL, AFB_SESSION_NONE_V2}, - {"debug::surfaces", WRAP(debug_surfaces), NULL, NULL, AFB_SESSION_NONE_V2}, - - {"register_surface", WRAP(register_surface), NULL, NULL, AFB_SESSION_NONE_V2}, - {} -}; -} // namespace +} // namespace wm extern "C" const struct afb_binding_v2 afbBindingV2 = { - "winman", NULL, NULL, verbs, NULL, binding_init, NULL, 1}; + "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 0};