X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=b72edc61950cd8e2f618803e9b1faa7e0201cfd8;hb=afd5c59cdfeeb142feb57afe7d3d47f5f83fda45;hp=61a840dadfc9af526b9fea54394ed9d8e704f250;hpb=074d058a7a483a66af7f8c0b928b321ad483f47c;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/wayland.hpp b/src/wayland.hpp index 61a840d..b72edc6 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. @@ -132,12 +132,9 @@ struct output : wayland_proxy { // |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| // |_| // _ _ -// __ _ ___ _ __ (_)_ _(_) -// / _` |/ _ \ '_ \| \ \ / / | -// | (_| | __/ | | | |\ V /| | -// \__, |\___|_| |_|_| \_/ |_| -// |___/ -namespace genivi { + +// namespace compositor +namespace compositor { struct size { uint32_t w, h; @@ -288,6 +285,8 @@ struct controller : public wayland_proxy { wm::controller_hooks *chooks; + bool is_configured; + 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); @@ -349,6 +348,6 @@ struct controller : public wayland_proxy { void layer_screen(struct layer *l, struct wl_output *screen); void layer_destroyed(struct layer *l); }; -} // namespace genivi +} // namespace compositor #endif // !WM_WAYLAND_HPP