X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=4865e422af651d7fbcf719f0f21bec1bbfdb8cf6;hb=1d0467a538127f4cdd905b785b561f339426a94a;hp=973e06302579945ffd58abd177d1e1589ae1d5de;hpb=1a4f20e844123e3b77e4bd25e8d588e50bde664f;p=staging%2Fwindowmanager.git diff --git a/src/wayland.hpp b/src/wayland.hpp index 973e063..4865e42 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -3,11 +3,11 @@ #include "ivi-controller-client-protocol.h" -#include "util.h" +#include "util.hpp" #include -#include #include +#include #include // _ _ @@ -75,6 +75,7 @@ struct display { int dispatch(); void flush(); int get_fd() const; + int get_error(); }; // _ _ @@ -99,7 +100,7 @@ struct output : wayland_proxy { void done(); void scale(int32_t factor); }; -} +} // namespace wl // _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___ // | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \ @@ -248,6 +249,8 @@ struct controller : public wayland_proxy { size output_size; + void debug_dump_current_status(); + void add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id); void remove_proxy_to_id_mapping(struct ivi_controller_surface *p); void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id); @@ -287,8 +290,8 @@ struct controller : public wayland_proxy { void surface_orientation(struct surface *s, int32_t orientation); void surface_pixelformat(struct surface *s, int32_t pixelformat); void surface_layer(struct surface *s, struct ivi_controller_layer *layer); - void surface_stats(struct surface *s, uint32_t redraw_count, uint32_t frame_count, - uint32_t update_count, uint32_t pid, + void surface_stats(struct surface *s, uint32_t redraw_count, + uint32_t frame_count, uint32_t update_count, uint32_t pid, const char *process_name); void surface_destroyed(struct surface *s); void surface_content(struct surface *s, int32_t content_state); @@ -296,8 +299,8 @@ struct controller : public wayland_proxy { // layer void layer_visibility(struct layer *l, int32_t visibility); void layer_opacity(struct layer *l, float opacity); - void layer_source_rectangle(struct layer *l, int32_t x, int32_t y, int32_t width, - int32_t height); + void layer_source_rectangle(struct layer *l, int32_t x, int32_t y, + int32_t width, int32_t height); void layer_destination_rectangle(struct layer *l, int32_t x, int32_t y, int32_t width, int32_t height); void layer_configuration(struct layer *l, int32_t width, int32_t height); @@ -305,6 +308,6 @@ struct controller : public wayland_proxy { void layer_screen(struct layer *l, struct wl_output *screen); void layer_destroyed(struct layer *l); }; -} +} // namespace genivi #endif // !WM_WAYLAND_HPP