X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=38f8946d86d2379c122d69c39997ebab4dd5ef6d;hb=72ca2b377687ef63ad223ab1b55cf6bc3af24062;hp=5cafd1ad3f1f12ed87959e3c41d8ff0c99c96a6a;hpb=db95653246560c24ad3c8cb224b3d9321b50af0a;p=staging%2Fwindowmanager.git diff --git a/src/wayland.hpp b/src/wayland.hpp index 5cafd1a..38f8946 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -24,8 +24,8 @@ struct wayland_proxy { virtual ~wayland_proxy() { // If this is the nullptr, then it means it already was destroyed by a // custom wayland dtor - logdebug("%s %p @ %p", __func__, this, this->proxy); - if (proxy) { + if (this->proxy) { + logdebug("%s %p @ %p", __func__, this, this->proxy); wl_proxy_destroy(reinterpret_cast(proxy)); } } @@ -51,7 +51,10 @@ struct display { std::unique_ptr r; display(); + ~display(); + bool ok() const; void roundtrip(); + int dispatch(); }; // _ _ @@ -69,16 +72,9 @@ struct registry : public wayland_proxy { void add_global_handler(char const *iface, binder bind); - void event_global(uint32_t name, char const *iface, uint32_t v); - void event_global_remove(uint32_t name); - - static void s_global(void *data, struct wl_registry *r, uint32_t name, - char const *iface, uint32_t v); - - static void s_global_remove(void *data, struct wl_registry *r, - uint32_t name); - - static constexpr wl_registry_listener listener = {s_global, s_global_remove}; + // Events + void global(uint32_t name, char const *iface, uint32_t v); + void global_remove(uint32_t name); }; // _ _ @@ -90,30 +86,14 @@ struct registry : public wayland_proxy { struct output : wayland_proxy { output(wl_registry *registry, uint32_t name, uint32_t version); - void event_geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, - int32_t subpel, char const *make, char const *model, - int32_t tx); - void event_mode(uint32_t flags, int32_t w, int32_t h, int32_t r); - void event_done(); - void event_scale(int32_t factor); - - static void s_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); - - static void s_mode(void *data, struct wl_output *wl_output, uint32_t flags, - int32_t width, int32_t height, int32_t refresh); - - static void s_done(void *data, struct wl_output *wl_output); - - static void s_scale(void *data, struct wl_output *wl_output, int32_t factor); - - static constexpr wl_output_listener listener = {s_geometry, s_mode, s_done, - s_scale}; -}; + // Events + void geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t subpel, + char const *make, char const *model, int32_t tx); + void mode(uint32_t flags, int32_t w, int32_t h, int32_t r); + void done(); + void scale(int32_t factor); }; +} // _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___ // | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \ @@ -140,7 +120,20 @@ struct surface : public wayland_proxy { surface(uint32_t i, ivi_controller *c); ~surface() override; - static constexpr ivi_controller_surface_listener listener = {}; + // Events + void visibility(int32_t visibility); + void opacity(float opacity); + void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height); + void destination_rectangle(int32_t x, int32_t y, int32_t width, + int32_t height); + void configuration(int32_t width, int32_t height); + void orientation(int32_t orientation); + void pixelformat(int32_t pixelformat); + void layer(struct ivi_controller_layer *layer); + void stats(uint32_t redraw_count, uint32_t frame_count, + uint32_t update_count, uint32_t pid, const char *process_name); + void destroyed(); + void content(int32_t content_state); }; // _ @@ -155,7 +148,29 @@ struct layer : public wayland_proxy { layer(uint32_t i, ivi_controller *c); ~layer() override; - static constexpr ivi_controller_layer_listener listener = {}; + // Events + void visibility(int32_t visibility); + void opacity(float opacity); + void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height); + void destination_rectangle(int32_t x, int32_t y, int32_t width, + int32_t height); + void configuration(int32_t width, int32_t height); + void orientation(int32_t orientation); + void screen(struct wl_output *screen); + void destroyed(); + + // Requests + void set_visibility(uint32_t visibility); + void set_opacity(wl_fixed_t opacity); + void set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height); + void set_destination_rectangle(int32_t x, int32_t y, int32_t width, int32_t height); + void set_configuration(int32_t width, int32_t height); + void set_orientation(int32_t orientation); + void screenshot(const char *filename); + void clear_surfaces(); + void add_surface(struct surface *surface); + void remove_surface(struct surface *surface); + void set_render_order(struct wl_array *id_surfaces); }; // @@ -184,28 +199,11 @@ struct controller : public wayland_proxy { controller(wl_registry *r, uint32_t name, uint32_t version); ~controller() override; - void event_screen(uint32_t id, ivi_controller_screen *screen); - void event_layer(uint32_t id); - void event_surface(uint32_t id); - void event_error(int32_t oid, int32_t otype, int32_t code, char const *text); - - // thunks... - static void s_screen(void *data, struct ivi_controller *ivi_controller, - uint32_t id_screen, - struct ivi_controller_screen *screen); - - static void s_layer(void *data, struct ivi_controller *ivi_controller, - uint32_t id_layer); - - static void s_surface(void *data, struct ivi_controller *ivi_controller, - uint32_t id_surface); - - static void s_error(void *data, struct ivi_controller *ivi_controller, - int32_t object_id, int32_t object_type, - int32_t error_code, const char *error_text); - - static constexpr ivi_controller_listener listener = {s_screen, s_layer, - s_surface, s_error}; + // Events + void screen(uint32_t id, ivi_controller_screen *screen); + void layer(uint32_t id); + void surface(uint32_t id); + void error(int32_t oid, int32_t otype, int32_t code, char const *text); }; }