+/*
+ * 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 <algorithm>
-#include <json.h>
+#include <mutex>
-#define AFB_BINDING_VERSION 2
+#include <json.h>
extern "C" {
#include <afb/afb-binding.h>
#include <systemd/sd-event.h>
}
-#include <json.hpp>
-
namespace {
-struct wayland {
+
+struct afb_instance {
std::unique_ptr<wl::display> display;
- std::unique_ptr<genivi::controller> controller;
- std::vector<std::unique_ptr<wl::output>> outputs;
+ wm::App app;
- wayland() : display(new wl::display), controller(nullptr), outputs() {}
+ afb_instance() : display{new wl::display}, app{this->display.get()} {}
int init();
};
-struct wayland *g_wayland;
+struct afb_instance *g_afb_instance;
-int wayland::init() {
+int afb_instance::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_wayland->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
- });
-
- this->display->r.add_global_handler(
- "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) {
- g_wayland->controller =
- std::make_unique<genivi::controller>(r, name, v);
-
- // XXX: This protocol needs the output, so lets just add our mapping
- // here...
- g_wayland->controller->add_proxy_to_id_mapping(
- g_wayland->outputs.back()->proxy.get(),
- wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
- g_wayland->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_wayland->controller) {
- return "ivi_controller global not available";
- }
-
- if (g_wayland->outputs.empty()) {
- return "no output was set up!";
- }
-
- auto &c = g_wayland->controller;
-
- auto &o = g_wayland->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();
+int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
+ void * /*data*/) {
+ ST();
- // 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_wayland->display->flush();
-
- return nullptr;
-}
-
-int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
- void *data) {
if ((events & EPOLLHUP) != 0) {
- AFB_ERROR("The compositor hung up, dying now.");
- delete g_wayland;
- g_wayland = nullptr;
+ logerror("The compositor hung up, dying now.");
+ delete g_afb_instance;
+ g_afb_instance = nullptr;
goto error;
}
- if (events & EPOLLIN) {
- int ret = g_wayland->display->dispatch();
- if (ret == -1) {
- AFB_ERROR("wl_display_dipatch() returned error %d",
- g_wayland->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_wayland->display->flush();
-
- // execute pending tasks, that is layout changes etc.
- g_wayland->controller->execute_pending();
- g_wayland->display->roundtrip();
}
return 0;
error:
sd_event_source_unref(evs);
+ if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) {
+ exit(1);
+}
return -1;
}
int binding_init_() {
lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
- if (g_wayland != nullptr) {
- AFB_ERROR("Wayland context already initialized?");
- return -1;
+ if (g_afb_instance != nullptr) {
+ logerror("Wayland context already initialized?");
+ return 0;
}
if (getenv("XDG_RUNTIME_DIR") == nullptr) {
- AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set");
- return -1;
+ logerror("Environment variable XDG_RUNTIME_DIR not set");
+ goto error;
}
- g_wayland = new wayland;
- if (g_wayland->init() == -1) {
- AFB_ERROR("Could not connect to compositor");
- delete g_wayland;
- return -1;
+ g_afb_instance = new afb_instance;
+ if (g_afb_instance->init() == -1) {
+ logerror("Could not connect to compositor");
+ goto error;
}
- if (char const *e = init_layout()) {
- AFB_ERROR("Could not init layout: %s", e);
- return -1;
+ {
+ int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr,
+ g_afb_instance->display->get_fd(), EPOLLIN,
+ display_event_callback, g_afb_instance);
+ if (ret < 0) {
+ logerror("Could not initialize afb_instance event handler: %d", -ret);
+ goto error;
+ }
}
- sd_event_add_io(afb_daemon_get_event_loop(), nullptr,
- g_wayland->display->get_fd(), EPOLLIN,
- display_event_callback, g_wayland);
-
- atexit([] { delete g_wayland; });
+ atexit([] { delete g_afb_instance; });
return 0;
+
+error:
+ delete g_afb_instance;
+ g_afb_instance = nullptr;
+ return -1;
}
int binding_init() noexcept {
try {
return binding_init_();
} catch (std::exception &e) {
- AFB_ERROR("Uncaught exception in binding_init(): %s", e.what());
+ logerror("Uncaught exception in binding_init(): %s", e.what());
}
return -1;
}
-#define CHECK_WAYLAND() \
- do { \
- if (g_wayland == nullptr) { \
- afb_req_fail(req, "failed", \
- "Binding not initialized, did the compositor die?"); \
- return; \
- } \
- } while (0)
-
-// _ _ _ _ ____
-// __| | ___| |__ _ _ __ _ ___| |_ __ _| |_ _ _ ___ / /\ \
-// / _` |/ _ \ '_ \| | | |/ _` | / __| __/ _` | __| | | / __| | | |
-// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | |
-// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | |
-// |___/_____| \_\/_/
-void debug_status(struct afb_req req) noexcept {
- // Quick and dirty, dump current surfaces and layers
- AFB_REQ_DEBUG(req, "status");
-
- CHECK_WAYLAND();
-
- try {
- using json = nlohmann::json;
-
- json j;
-
- if (!g_wayland->controller->surfaces.empty()) {
- auto a = json::array();
- for (auto const &i : g_wayland->controller->surfaces) {
- auto const &r = i.second->dst_rect;
- auto const &s = i.second->size;
- a.push_back({{"id", i.first},
- {"size", {s.w, s.h}},
- {"dst_rect", {r.w, r.h, r.x, r.y}}});
- }
- j["surfaces"] = a;
- }
-
- if (!g_wayland->controller->layers.empty()) {
- auto a = json::array();
- for (auto const &i : g_wayland->controller->layers) {
- auto const &r = i.second->dst_rect;
- auto const &s = i.second->size;
- a.push_back({{"id", i.first},
- {"size", {s.w, s.h}},
- {"dst_rect", {r.w, r.h, r.x, r.y}}});
- }
- j["layers"] = a;
- }
-
- afb_req_success(req, json_tokener_parse(j.dump().c_str()), "status");
- } catch (std::exception &e) {
- afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what());
- }
-}
-
-void debug_surfaces(afb_req req) {
- CHECK_WAYLAND();
-
- auto a = json_object_new_array();
-
- if (!g_wayland->controller->surfaces.empty()) {
- for (auto const &i : g_wayland->controller->surfaces) {
- json_object_array_add(a, json_object_new_int(i.first));
- }
- }
-
- afb_req_success(req, a, "surfaces");
-}
-
-void debug_layers(afb_req req) {
- CHECK_WAYLAND();
+} // namespace
- auto a = json_object_new_array();
+#include "afb_binding_glue.inl"
- if (!g_wayland->controller->layers.empty()) {
- for (auto const &i : g_wayland->controller->layers) {
- json_object_array_add(a, json_object_new_int(i.first));
- }
+// 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");
}
-
- afb_req_success(req, a, "surfaces");
}
-
-const struct afb_verb_v2 verbs[] = {
- {"status", debug_status, NULL, NULL, AFB_SESSION_NONE_V2},
- {"layers", debug_layers, NULL, NULL, AFB_SESSION_NONE_V2},
- {"surfaces", debug_surfaces, 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};
Code Review / staging / windowmanager.git / blobdiff