X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=59d7adec298881bb410442d737840000154390a8;hb=c392fff74872af6d4f165ff3f854d19f390ec0ee;hp=ee9d0705d6417dddbdf48050802b2d534e962bc9;hpb=4e1f6616b5ce24022f088943912e4b98e7764100;p=apps%2Fagl-service-windowmanager.git diff --git a/src/wayland.hpp b/src/wayland.hpp index ee9d070..59d7ade 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,9 @@ #include #include -// _ _ -// __ ____ _ _ _| | __ _ _ __ __| | _ __ _ __ _____ ___ _ -// \ \ /\ / / _` | | | | |/ _` | '_ \ / _` | | '_ \| '__/ _ \ \/ / | | | -// \ V V / (_| | |_| | | (_| | | | | (_| | | |_) | | | (_) > <| |_| | -// \_/\_/ \__,_|\__, |_|\__,_|_| |_|\__,_|____| .__/|_| \___/_/\_\\__, | -// |___/ |_____|_| |___/ +/** + * @struct wayland_proxy + */ template struct wayland_proxy { std::unique_ptr> proxy; @@ -45,19 +42,14 @@ struct wayland_proxy { static_cast(p), p_del)) {} }; -// _ -// _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___ __ _| | -// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \ \ \ /\ / / | -// | | | | (_| | | | | | | __/\__ \ |_) | (_| | (_| __/ \ V V /| | -// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_| -// |_| +/** + * namespace wl + */ namespace wl { -// _ _ -// _ __ ___ __ _(_)___| |_ _ __ _ _ -// | '__/ _ \/ _` | / __| __| '__| | | | -// | | | __/ (_| | \__ \ |_| | | |_| | -// |_| \___|\__, |_|___/\__|_| \__, | -// |___/ |___/ + +/** + * @struct registry + */ struct registry : public wayland_proxy { typedef std::function binder; std::unordered_map bindings; @@ -73,12 +65,9 @@ struct registry : public wayland_proxy { void global_remove(uint32_t name); }; -// _ _ _ -// __| (_)___ _ __ | | __ _ _ _ -// / _` | / __| '_ \| |/ _` | | | | -// | (_| | \__ \ |_) | | (_| | |_| | -// \__,_|_|___/ .__/|_|\__,_|\__, | -// |_| |___/ +/** + * @struct display + */ struct display { std::unique_ptr d; struct registry r; @@ -101,12 +90,9 @@ struct display { } }; -// _ _ -// ___ _ _| |_ _ __ _ _| |_ -// / _ \| | | | __| '_ \| | | | __| -// | (_) | |_| | |_| |_) | |_| | |_ -// \___/ \__,_|\__| .__/ \__,_|\__| -// |_| +/** + * @struct output + */ struct output : wayland_proxy { int width{}; int height{}; @@ -126,14 +112,9 @@ struct output : wayland_proxy { }; } // namespace wl -// _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___ -// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \ -// | | | | (_| | | | | | | __/\__ \ |_) | (_| | (_| __/ -// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| -// |_| -// _ _ - -// namespace compositor +/** + * namespace compositor + */ namespace compositor { struct size { @@ -173,12 +154,9 @@ struct surface_properties { float opacity; }; -// __ -// ___ _ _ _ __ / _| __ _ ___ ___ -// / __| | | | '__| |_ / _` |/ __/ _ \ -// \__ \ |_| | | | _| (_| | (_| __/ -// |___/\__,_|_| |_| \__,_|\___\___| -// +/** + * @struct surface + */ struct surface : public wayland_proxy, controller_child { surface(surface const &) = delete; @@ -199,12 +177,9 @@ struct surface : public wayland_proxy, void destroy(int32_t destroy_scene_object); }; -// _ -// | | __ _ _ _ ___ _ __ -// | |/ _` | | | |/ _ \ '__| -// | | (_| | |_| | __/ | -// |_|\__,_|\__, |\___|_| -// |___/ +/** + * @struct layer + */ struct layer : public wayland_proxy, controller_child { layer(layer const &) = delete; @@ -228,12 +203,9 @@ struct layer : public wayland_proxy, void set_render_order(std::vector const &ro); }; -// -// ___ ___ _ __ ___ ___ _ __ -// / __|/ __| '__/ _ \/ _ \ '_ \ -// \__ \ (__| | | __/ __/ | | | -// |___/\___|_| \___|\___|_| |_| -// +/** + * @struct screen + */ struct screen : public wayland_proxy, controller_child { screen(screen const &) = delete; @@ -244,12 +216,9 @@ struct screen : public wayland_proxy, void set_render_order(std::vector const &ro); }; -// _ _ _ -// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ -// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__| -// | (_| (_) | | | | |_| | | (_) | | | __/ | -// \___\___/|_| |_|\__|_| \___/|_|_|\___|_| -// +/** + * @struct controller + */ struct controller : public wayland_proxy { // This controller is still missing ivi-input