summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app.cpp4
-rw-r--r--src/app.hpp4
-rw-r--r--src/json_helper.cpp6
-rw-r--r--src/json_helper.hpp4
-rw-r--r--src/layers.cpp6
-rw-r--r--src/layers.hpp2
-rw-r--r--src/wayland.cpp62
-rw-r--r--src/wayland.hpp11
8 files changed, 46 insertions, 53 deletions
diff --git a/src/app.cpp b/src/app.cpp
index a5583ae..14bcdb2 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -120,7 +120,7 @@ int App::init() {
this->display->add_global_handler(
"ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
this->controller =
- std::make_unique<struct genivi::controller>(r, name, v);
+ std::make_unique<struct compositor::controller>(r, name, v);
// Init controller hooks
this->controller->chooks = &this->chooks;
@@ -204,7 +204,7 @@ int App::init_layers() {
auto &layers = c->layers;
// Write output dimensions to ivi controller...
- c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
+ c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
// Clear scene
layers.clear();
diff --git a/src/app.hpp b/src/app.hpp
index 1029aac..782f042 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -39,7 +39,7 @@ namespace wl {
struct display;
}
-namespace genivi {
+namespace compositor {
struct controller;
}
@@ -142,7 +142,7 @@ struct App {
// This is the one thing, we do not own.
struct wl::display *display;
- std::unique_ptr<struct genivi::controller> controller;
+ std::unique_ptr<struct compositor::controller> controller;
std::vector<std::unique_ptr<struct wl::output>> outputs;
struct config config;
diff --git a/src/json_helper.cpp b/src/json_helper.cpp
index 179c8cc..8c4274d 100644
--- a/src/json_helper.cpp
+++ b/src/json_helper.cpp
@@ -18,7 +18,7 @@
#include <json.h>
-json_object *to_json(genivi::surface_properties const &s) {
+json_object *to_json(compositor::surface_properties const &s) {
// auto j = json::object({
auto j = json_object_new_object();
@@ -70,7 +70,7 @@ json_object *to_json(genivi::surface_properties const &s) {
return j;
}
-json_object *to_json(genivi::screen const *s) {
+json_object *to_json(compositor::screen const *s) {
auto o = json_object_new_object();
json_object_object_add(o, "id", json_object_new_int(s->id));
return o;
@@ -89,7 +89,7 @@ json_object *to_json_(T const &s) {
return a;
}
-json_object *to_json(genivi::controller::props_map const &s) {
+json_object *to_json(compositor::controller::props_map const &s) {
return to_json_(s);
}
diff --git a/src/json_helper.hpp b/src/json_helper.hpp
index 15d72c3..73f79d2 100644
--- a/src/json_helper.hpp
+++ b/src/json_helper.hpp
@@ -23,8 +23,8 @@
struct json_object;
-json_object *to_json(genivi::screen const *s);
-json_object *to_json(genivi::controller::props_map const &s);
+json_object *to_json(compositor::screen const *s);
+json_object *to_json(compositor::controller::props_map const &s);
json_object *to_json(std::vector<uint32_t> const &v);
#endif // TMCAGLWM_JSON_HELPER_HPP
diff --git a/src/layers.cpp b/src/layers.cpp
index fe95495..e37160c 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -30,10 +30,10 @@ layer::layer(nlohmann::json const &j) {
this->role = j["role"];
this->name = j["name"];
this->layer_id = j["layer_id"];
- this->rect = genivi::full_rect;
+ this->rect = compositor::full_rect;
if (j["area"]["type"] == "rect") {
auto jr = j["area"]["rect"];
- this->rect = genivi::rect{
+ this->rect = compositor::rect{
jr["width"], jr["height"], jr["x"], jr["y"],
};
}
@@ -134,7 +134,7 @@ optional<int> layer_map::get_layer_id(std::string const &role) {
}
json layer::to_json() const {
- auto is_full = this->rect == genivi::full_rect;
+ auto is_full = this->rect == compositor::full_rect;
json r{};
if (is_full) {
diff --git a/src/layers.hpp b/src/layers.hpp
index 63650b4..eda6f6f 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -48,7 +48,7 @@ struct layer {
// the actual value is computed using MAX + 1 - w
// That is; allow us to specify dimensions dependent on
// e.g. screen dimension, w/o knowing the actual screen size.
- genivi::rect rect;
+ compositor::rect rect;
// Specify a role prefix for surfaces that should be
// put on this layer.
std::string role;
diff --git a/src/wayland.cpp b/src/wayland.cpp
index 1d0f5a8..26bf158 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -193,13 +193,9 @@ void output::scale(int32_t factor) {
// | | | | (_| | | | | | | __/\__ \ |_) | (_| | (_| __/
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
// |_|
-// _ _
-// __ _ ___ _ __ (_)_ _(_)
-// / _` |/ _ \ '_ \| \ \ / / |
-// | (_| | __/ | | | |\ V /| |
-// \__, |\___|_| |_|_| \_/ |_|
-// |___/
-namespace genivi {
+
+// namespace compositor
+namespace compositor {
// _ _ _
// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __
@@ -233,7 +229,7 @@ void controller_error(void *data, struct ivi_controller * /*ivi_controller*/,
constexpr struct ivi_controller_listener listener = {
controller_screen, controller_layer, controller_surface, controller_error};
-} // namespace
+} // namespace compositor
controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
: wayland_proxy(
@@ -252,13 +248,13 @@ void controller::surface_create(uint32_t id) {
void controller::controller_screen(uint32_t id,
struct ivi_controller_screen *screen) {
- HMI_DEBUG("wm", "genivi::controller @ %p screen %u (%x) @ %p", this->proxy.get(),
+ HMI_DEBUG("wm", "compositor::controller @ %p screen %u (%x) @ %p", this->proxy.get(),
id, id, screen);
this->screens[id] = std::make_unique<struct screen>(id, this, screen);
}
void controller::controller_layer(uint32_t id) {
- HMI_DEBUG("wm", "genivi::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
+ HMI_DEBUG("wm", "compositor::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
if (this->layers.find(id) != this->layers.end()) {
HMI_ERROR("wm", "Someone created a layer without asking US! (%d)", id);
} else {
@@ -268,7 +264,7 @@ void controller::controller_layer(uint32_t id) {
}
void controller::controller_surface(uint32_t id) {
- HMI_DEBUG("wm", "genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
+ HMI_DEBUG("wm", "compositor::controller @ %p surface %u (%x)", this->proxy.get(), id,
id);
if (this->surfaces.find(id) == this->surfaces.end()) {
this->surfaces[id] = std::make_unique<struct surface>(id, this);
@@ -278,7 +274,7 @@ void controller::controller_surface(uint32_t id) {
void controller::controller_error(int32_t object_id, int32_t object_type,
int32_t error_code, const char *error_text) {
- HMI_DEBUG("wm", "genivi::controller @ %p error o %i t %i c %i text %s",
+ HMI_DEBUG("wm", "compositor::controller @ %p error o %i t %i c %i text %s",
this->proxy.get(), object_id, object_type, error_code, error_text);
}
@@ -419,18 +415,18 @@ void layer::set_render_order(std::vector<uint32_t> const &ro) {
}
void controller::layer_visibility(struct layer *l, int32_t visibility) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d v %i", __func__, l->id, visibility);
+ HMI_DEBUG("wm", "compositor::layer %s @ %d v %i", __func__, l->id, visibility);
this->lprops[l->id].visibility = visibility;
}
void controller::layer_opacity(struct layer *l, float opacity) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d o %f", __func__, l->id, opacity);
+ HMI_DEBUG("wm", "compositor::layer %s @ %d o %f", __func__, l->id, opacity);
this->lprops[l->id].opacity = opacity;
}
void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
int32_t width, int32_t height) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+ HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i", __func__,
l->id, x, y, width, height);
this->lprops[l->id].src_rect = rect{width, height, x, y};
}
@@ -438,30 +434,30 @@ void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
void controller::layer_destination_rectangle(struct layer *l, int32_t x,
int32_t y, int32_t width,
int32_t height) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+ HMI_DEBUG("wm", "compositor::layer %s @ %d x %i y %i w %i h %i", __func__,
l->id, x, y, width, height);
this->lprops[l->id].dst_rect = rect{width, height, x, y};
}
void controller::layer_configuration(struct layer *l, int32_t width,
int32_t height) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d w %i h %i", __func__, l->id,
+ HMI_DEBUG("wm", "compositor::layer %s @ %d w %i h %i", __func__, l->id,
width, height);
this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
}
void controller::layer_orientation(struct layer *l, int32_t orientation) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d o %i", __func__, l->id,
+ HMI_DEBUG("wm", "compositor::layer %s @ %d o %i", __func__, l->id,
orientation);
this->lprops[l->id].orientation = orientation;
}
void controller::layer_screen(struct layer *l, struct wl_output *screen) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d s %p", __func__, l->id, screen);
+ HMI_DEBUG("wm", "compositor::layer %s @ %d s %p", __func__, l->id, screen);
}
void controller::layer_destroyed(struct layer *l) {
- HMI_DEBUG("wm", "genivi::layer %s @ %d", __func__, l->id);
+ HMI_DEBUG("wm", "compositor::layer %s @ %d", __func__, l->id);
this->lprops.erase(l->id);
this->layers.erase(l->id);
}
@@ -622,14 +618,14 @@ void surface::destroy(int32_t destroy_scene_object) {
}
void controller::surface_visibility(struct surface *s, int32_t visibility) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d v %i", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d v %i", __func__, s->id,
visibility);
this->sprops[s->id].visibility = visibility;
this->chooks->surface_visibility(s->id, visibility);
}
void controller::surface_opacity(struct surface *s, float opacity) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d o %f", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d o %f", __func__, s->id,
opacity);
this->sprops[s->id].opacity = opacity;
}
@@ -637,7 +633,7 @@ void controller::surface_opacity(struct surface *s, float opacity) {
void controller::surface_source_rectangle(struct surface *s, int32_t x,
int32_t y, int32_t width,
int32_t height) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
s->id, x, y, width, height);
this->sprops[s->id].src_rect = rect{width, height, x, y};
}
@@ -645,7 +641,7 @@ void controller::surface_source_rectangle(struct surface *s, int32_t x,
void controller::surface_destination_rectangle(struct surface *s, int32_t x,
int32_t y, int32_t width,
int32_t height) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d x %i y %i w %i h %i", __func__,
s->id, x, y, width, height);
this->sprops[s->id].dst_rect = rect{width, height, x, y};
this->chooks->surface_destination_rectangle(s->id, x, y, width, height);
@@ -653,40 +649,40 @@ void controller::surface_destination_rectangle(struct surface *s, int32_t x,
void controller::surface_configuration(struct surface *s, int32_t width,
int32_t height) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d w %i h %i", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d w %i h %i", __func__, s->id,
width, height);
this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
is_configured = true;
}
void controller::surface_orientation(struct surface *s, int32_t orientation) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d o %i", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d o %i", __func__, s->id,
orientation);
this->sprops[s->id].orientation = orientation;
}
void controller::surface_pixelformat(struct surface * s,
int32_t pixelformat) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d f %i", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d f %i", __func__, s->id,
pixelformat);
}
void controller::surface_layer(struct surface * s,
struct ivi_controller_layer *layer) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d l %u @ %p", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d l %u @ %p", __func__, s->id,
this->layer_proxy_to_id[uintptr_t(layer)], layer);
}
void controller::surface_stats(struct surface *s, uint32_t redraw_count,
uint32_t frame_count, uint32_t update_count,
uint32_t pid, const char *process_name) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d r %u f %u u %u pid %u p %s", __func__,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d r %u f %u u %u pid %u p %s", __func__,
s->id, redraw_count, frame_count, update_count, pid,
process_name);
}
void controller::surface_destroyed(struct surface *s) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d", __func__, s->id);
+ HMI_DEBUG("wm", "compositor::surface %s @ %d", __func__, s->id);
this->chooks->surface_removed(s->id);
// XXX: do I need to actually remove the surface late, i.e. using add_task()?
this->sprops.erase(s->id);
@@ -694,7 +690,7 @@ void controller::surface_destroyed(struct surface *s) {
}
void controller::surface_content(struct surface *s, int32_t content_state) {
- HMI_DEBUG("wm", "genivi::surface %s @ %d s %i", __func__, s->id,
+ HMI_DEBUG("wm", "compositor::surface %s @ %d s %i", __func__, s->id,
content_state);
if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
// XXX is this the right thing to do?
@@ -747,7 +743,7 @@ void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
screen::screen(uint32_t i, struct controller *c,
struct ivi_controller_screen *p)
: wayland_proxy(p), controller_child(c, i) {
- HMI_DEBUG("wm", "genivi::screen @ %p id %u", p, i);
+ HMI_DEBUG("wm", "compositor::screen @ %p id %u", p, i);
}
void screen::clear() { ivi_controller_screen_clear(this->proxy.get()); }
@@ -764,4 +760,4 @@ void screen::set_render_order(std::vector<uint32_t> const &ro) {
ivi_controller_screen_set_render_order(this->proxy.get(), &wlro);
}
-} // namespace genivi
+} // namespace compositor
diff --git a/src/wayland.hpp b/src/wayland.hpp
index f6d17b4..ee9d070 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -132,12 +132,9 @@ struct output : wayland_proxy<struct wl_output> {
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
// |_|
// _ _
-// __ _ ___ _ __ (_)_ _(_)
-// / _` |/ _ \ '_ \| \ \ / / |
-// | (_| | __/ | | | |\ V /| |
-// \__, |\___|_| |_|_| \_/ |_|
-// |___/
-namespace genivi {
+
+// namespace compositor
+namespace compositor {
struct size {
uint32_t w, h;
@@ -351,6 +348,6 @@ struct controller : public wayland_proxy<struct ivi_controller> {
void layer_screen(struct layer *l, struct wl_output *screen);
void layer_destroyed(struct layer *l);
};
-} // namespace genivi
+} // namespace compositor
#endif // !WM_WAYLAND_HPP