From db95653246560c24ad3c8cb224b3d9321b50af0a Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Thu, 8 Jun 2017 13:33:47 +0200 Subject: cpp, simple wrappers for most of what we need, ivi_* still incomplete Signed-off-by: Marcus Fritzsch --- src/main.cpp | 153 +++++++---------------------------------------------------- 1 file changed, 18 insertions(+), 135 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 794d9af..0c010ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,171 +1,54 @@ #include "util.h" - -#include "ivi-controller-client-protocol.h" +#include "wayland.hpp" #include #include -#include - #include #include #include #include -struct ivi_surface; -struct ivi_layer; - struct conn { - wl_display *d; - wl_registry *r; - ivi_controller *c; - std::vector> outputs; - std::map> layers; - std::map> surfaces; + std::vector> outputs; + std::unique_ptr c; ~conn(); }; -struct ivi_surface { - ivi_controller_surface *controller; - uint32_t id; - conn *con; - ivi_surface(ivi_controller_surface *c, uint32_t i, conn *co) - : controller(c), id(i), con(co) {} - ~ivi_surface() { ivi_controller_surface_destroy(this->controller, 1); } -}; - -struct ivi_layer { - ivi_controller_layer *controller; - uint32_t id; - conn *con; - ivi_layer(ivi_controller_layer *c, uint32_t i, conn *co) - : controller(c), id(i), con(co) {} - ~ivi_layer() { ivi_controller_layer_destroy(this->controller, 1); } -}; - conn::~conn() { - this->layers.clear(); - this->surfaces.clear(); - ivi_controller_destroy(this->c); this->outputs.clear(); - wl_registry_destroy(this->r); - wl_display_disconnect(this->d); } -static ivi_controller_surface_listener cs_listener = {}; - -static ivi_controller_layer_listener cl_listener = {}; - -static void c_screen(void *data, struct ivi_controller *ivi_controller, - uint32_t id_screen, struct ivi_controller_screen *screen) { - lognotice("ivi_controller @ %p screen %u (%x) @ %p", ivi_controller, - id_screen, id_screen, screen); -} - -static void c_layer(void *data, struct ivi_controller *ivi_controller, - uint32_t id_layer) { - lognotice("ivi_controller @ %p layer %u (%x)", ivi_controller, id_layer, - id_layer); - auto c = static_cast(data); - auto i = std::make_unique( - ivi_controller_layer_create(c->c, id_layer, 0, 0), id_layer, c); - ivi_controller_layer_add_listener(i->controller, &cl_listener, i.get()); - c->layers[id_layer] = std::move(i); -} - -static void c_surface(void *data, struct ivi_controller *ivi_controller, - uint32_t id_surface) { - lognotice("ivi_controller @ %p surface %u (%x)", ivi_controller, id_surface, - id_surface); - auto c = static_cast(data); - auto i = std::make_unique( - ivi_controller_surface_create(c->c, id_surface), id_surface, c); - ivi_controller_surface_add_listener(i->controller, &cs_listener, i.get()); - c->surfaces[id_surface] = std::move(i); -} - -static void c_error(void *data, struct ivi_controller *ivi_controller, - int32_t object_id, int32_t object_type, int32_t error_code, - const char *error_text) { - lognotice("ivi_controller @ %p error o %i t %i c %i text %s", ivi_controller, - object_id, object_type, error_code, error_text); -} - -static struct ivi_controller_listener c_listener = {c_screen, c_layer, - c_surface, c_error}; - -static void o_geometry(void *data, struct wl_output *wl_output, int32_t x, - int32_t y, int32_t physical_width, - int32_t physical_height, int32_t subpixel, - const char *make, const char *model, int32_t transform) { - lognotice("output @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i", - wl_output, x, y, physical_width, physical_height, subpixel, make, - model, transform); -} - -static void o_mode(void *data, struct wl_output *wl_output, uint32_t flags, - int32_t width, int32_t height, int32_t refresh) { - lognotice("output @ %p mode f %x w %i h %i r %i", wl_output, flags, width, - height, refresh); -} - -static void o_done(void *data, struct wl_output *wl_output) { - lognotice("output @ %p done"); -} - -static void o_scale(void *data, struct wl_output *wl_output, int32_t factor) { - lognotice("output @ %p scale %i", wl_output, factor); -} - -static struct wl_output_listener o_listener = {o_geometry, o_mode, o_done, - o_scale}; - -static void r_global(void *data, struct wl_registry *r, uint32_t name, - char const *iface, uint32_t v) { - struct conn *c = static_cast(data); - - if (strcmp(iface, "ivi_controller") == 0) { - c->c = static_cast( - wl_registry_bind(r, name, &ivi_controller_interface, v)); - ivi_controller_add_listener(c->c, &c_listener, c); - } else if (strcmp(iface, "wl_output") == 0) { - auto o = static_cast( - wl_registry_bind(r, name, &wl_output_interface, v)); - c->outputs.emplace_back(std::unique_ptr( - o, wl_output_destroy)); - wl_output_add_listener(o, &o_listener, c); - } else { - lognotice("registry @ %p global n %u i %s v %u", r, name, iface, v); - } -} - -static void r_global_remove(void *data, struct wl_registry *r, uint32_t name) {} - -static struct wl_registry_listener r_listener = {r_global, r_global_remove}; - int main(int argc, char **argv) { lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); if (!getenv("XDG_RUNTIME_DIR")) fatal("Environment variable XDG_RUNTIME_DIR not set"); + auto d = std::make_unique(); + if (!d->d) + fatal("Could not connect to compositor"); + struct conn c = {}; - c.d = wl_display_connect(NULL); - if (!c.d) - fatal("Could not connect to compositor"); - c.r = wl_display_get_registry(c.d); - wl_registry_add_listener(c.r, &r_listener, &c); + d->r->add_global_handler("ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t v) { + c.c = std::make_unique(r, name, v); + }); + + d->r->add_global_handler("wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) { + c.outputs.emplace_back(std::make_unique(r, name, v)); + }); // First level objects - wl_display_roundtrip(c.d); + d->roundtrip(); // Second level objects - wl_display_roundtrip(c.d); + d->roundtrip(); + // Third level objects + /* wl_display_roundtrip(c.d); */ if (!c.c) fatal("ivi_controller global not available"); - // main loop return 0; -- cgit 1.2.3-korg