+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#include <utility>
+#include "util.hpp"
#include "wayland.hpp"
// _
// |_| |___/
display::display()
: d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
- wl_display_connect(nullptr),
-#ifdef DEBUG_OUTPUT
- [](struct wl_display *d) {
- logdebug("wl::display ~display @ %p", d);
- wl_display_disconnect(d);
- })),
-#else
- &wl_display_disconnect)),
-#endif
- r(d.get()) {
-}
+ wl_display_connect(nullptr), &wl_display_disconnect)),
+ r(d.get()) {}
bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
int display::dispatch() { return wl_display_dispatch(this->d.get()); }
+int display::dispatch_pending() { return wl_display_dispatch_pending(this->d.get()); }
+
+int display::read_events() {
+ ST();
+ // XXX: uhm, how?!
+ while (wl_display_prepare_read(this->d.get()) == -1) {
+ STN(pending_events_dispatch);
+ if (wl_display_dispatch_pending(this->d.get()) == -1) {
+ return -1;
+ }
+ }
+
+ if (wl_display_flush(this->d.get()) == -1) {
+ return -1;
+ }
+
+ if (wl_display_read_events(this->d.get()) == -1) {
+ wl_display_cancel_read(this->d.get());
+ }
+
+ return 0;
+}
+
void display::flush() { wl_display_flush(this->d.get()); }
int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
+int display::get_error() { return wl_display_get_error(this->d.get()); }
+
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
logdebug(
"wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
__func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx);
+ this->transform = tx;
}
void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
void output::done() {
logdebug("wl::output %s @ %p done", __func__, this->proxy.get());
+ // Let's just disregard the flipped ones...
+ if (this->transform == WL_OUTPUT_TRANSFORM_90 ||
+ this->transform == WL_OUTPUT_TRANSFORM_270) {
+ std::swap(this->width, this->height);
+ }
}
void output::scale(int32_t factor) {
controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
: wayland_proxy(
wl_registry_bind(r, name, &ivi_controller_interface, version)),
- surface_proxy_to_id{},
- layer_proxy_to_id{},
- screen_proxy_to_id{},
- surfaces{},
- layers{},
- screens{},
- pending{},
output_size{} {
ivi_controller_add_listener(this->proxy.get(), &listener, this);
}
void controller::controller_layer(uint32_t id) {
logdebug("genivi::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
- auto &l = this->layers[id] = std::make_unique<struct layer>(id, this);
- l->clear_surfaces();
+ if (this->layers.find(id) != this->layers.end()) {
+ logerror("Someone created a layer without asking US! (%d)", id);
+ } else {
+ auto &l = this->layers[id] = std::make_unique<struct layer>(id, this);
+ l->clear_surfaces();
+ }
}
void controller::controller_surface(uint32_t id) {
logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
id);
- this->surfaces[id] = std::make_unique<struct surface>(id, this);
-
- add_task("fullscreen surface", [id](struct controller *c) {
- auto &s = c->surfaces[id];
- s->set_destination_rectangle(0, 0, c->output_size.w, c->output_size.h);
- s->set_visibility(1);
- uint32_t lid = id == 0x16180 ? 1000 : 100;
- c->layers[lid]->add_surface(s.get());
- logdebug("Surface %u now fullscreen on layer %u", id, lid);
- });
+ if (this->surfaces.find(id) == this->surfaces.end()) {
+ this->surfaces[id] = std::make_unique<struct surface>(id, this);
+ this->chooks->surface_created(id);
+ }
}
void controller::controller_error(int32_t object_id, int32_t object_type,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t visibility) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_visibility(l->id, visibility);
+ l->parent->layer_visibility(l, visibility);
}
void layer_opacity(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
wl_fixed_t opacity) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_opacity(l->id, float(wl_fixed_to_double(opacity)));
+ l->parent->layer_opacity(l, float(wl_fixed_to_double(opacity)));
}
void layer_source_rectangle(
void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_source_rectangle(l->id, x, y, width, height);
+ l->parent->layer_source_rectangle(l, x, y, width, height);
}
void layer_destination_rectangle(
void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_destination_rectangle(l->id, x, y, width, height);
+ l->parent->layer_destination_rectangle(l, x, y, width, height);
}
void layer_configuration(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_configuration(l->id, width, height);
+ l->parent->layer_configuration(l, width, height);
}
void layer_orientation(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t orientation) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_orientation(l->id, orientation);
+ l->parent->layer_orientation(l, orientation);
}
void layer_screen(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
struct wl_output *screen) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_screen(l->id, screen);
+ l->parent->layer_screen(l, screen);
}
void layer_destroyed(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_destroyed(l->id);
+ l->parent->layer_destroyed(l);
}
constexpr struct ivi_controller_layer_listener layer_listener = {
c->remove_proxy_to_id_mapping(l);
ivi_controller_layer_destroy(l, 1);
}),
- controller_child(c, i),
- dst_rect{},
- src_rect{},
- size{},
- orientation{},
- visibility{},
- opacity{} {
+ controller_child(c, i) {
this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
ivi_controller_layer_add_listener(this->proxy.get(), &layer_listener, this);
}
ivi_controller_layer_set_render_order(this->proxy.get(), &wlro);
}
-void controller::layer_visibility(uint32_t id, int32_t visibility) {
- logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy.get(),
- visibility);
- this->layers[id]->visibility = visibility;
+void controller::layer_visibility(struct layer *l, int32_t visibility) {
+ logdebug("genivi::layer %s @ %d v %i", __func__, l->id, visibility);
+ this->lprops[l->id].visibility = visibility;
}
-void controller::layer_opacity(uint32_t id, float opacity) {
- logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy.get(), opacity);
- this->layers[id]->opacity = opacity;
+void controller::layer_opacity(struct layer *l, float opacity) {
+ logdebug("genivi::layer %s @ %d o %f", __func__, l->id, opacity);
+ this->lprops[l->id].opacity = opacity;
}
-void controller::layer_source_rectangle(uint32_t id, int32_t x, int32_t y,
+void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
int32_t width, int32_t height) {
- logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy.get(), x, y, width, height);
- this->layers[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ logdebug("genivi::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};
}
-void controller::layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
- int32_t width, int32_t height) {
- logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy.get(), x, y, width, height);
- this->layers[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+void controller::layer_destination_rectangle(struct layer *l, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
+ logdebug("genivi::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(uint32_t id, int32_t width,
+void controller::layer_configuration(struct layer *l, int32_t width,
int32_t height) {
- logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy.get(),
+ logdebug("genivi::layer %s @ %d w %i h %i", __func__, l->id,
width, height);
- this->layers[id]->size = size{uint32_t(width), uint32_t(height)};
+ this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
}
-void controller::layer_orientation(uint32_t id, int32_t orientation) {
- logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy.get(),
+void controller::layer_orientation(struct layer *l, int32_t orientation) {
+ logdebug("genivi::layer %s @ %d o %i", __func__, l->id,
orientation);
- this->layers[id]->orientation = orientation;
+ this->lprops[l->id].orientation = orientation;
}
-void controller::layer_screen(uint32_t /*id*/, struct wl_output *screen) {
- logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy.get(), screen);
+void controller::layer_screen(struct layer *l, struct wl_output *screen) {
+ logdebug("genivi::layer %s @ %d s %p", __func__, l->id, screen);
}
-void controller::layer_destroyed(uint32_t id) {
- logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
- add_task("remove layer",
- [id](struct controller *c) { c->layers.erase(id); });
+void controller::layer_destroyed(struct layer *l) {
+ logdebug("genivi::layer %s @ %d", __func__, l->id);
+ this->lprops.erase(l->id);
+ this->layers.erase(l->id);
}
// __
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t visibility) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_visibility(s->id, visibility);
+ s->parent->surface_visibility(s, visibility);
}
void surface_opacity(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
wl_fixed_t opacity) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_opacity(s->id, float(wl_fixed_to_double(opacity)));
+ s->parent->surface_opacity(s, float(wl_fixed_to_double(opacity)));
}
void surface_source_rectangle(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_source_rectangle(s->id, x, y, width, height);
+ s->parent->surface_source_rectangle(s, x, y, width, height);
}
void surface_destination_rectangle(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_destination_rectangle(s->id, x, y, width, height);
+ s->parent->surface_destination_rectangle(s, x, y, width, height);
}
void surface_configuration(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_configuration(s->id, width, height);
+ s->parent->surface_configuration(s, width, height);
}
void surface_orientation(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t orientation) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_orientation(s->id, orientation);
+ s->parent->surface_orientation(s, orientation);
}
void surface_pixelformat(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t pixelformat) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_pixelformat(s->id, pixelformat);
+ s->parent->surface_pixelformat(s, pixelformat);
}
void surface_layer(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
struct ivi_controller_layer *layer) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_layer(s->id, layer);
+ s->parent->surface_layer(s, layer);
}
void surface_stats(void *data,
uint32_t update_count, uint32_t pid,
const char *process_name) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_stats(s->id, redraw_count, frame_count, update_count, pid,
+ s->parent->surface_stats(s, redraw_count, frame_count, update_count, pid,
process_name);
}
void surface_destroyed(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_destroyed(s->id);
+ s->parent->surface_destroyed(s);
}
void surface_content(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t content_state) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_content(s->id, content_state);
+ s->parent->surface_content(s, content_state);
}
constexpr struct ivi_controller_surface_listener surface_listener = {
c->remove_proxy_to_id_mapping(s);
ivi_controller_surface_destroy(s, 1);
}),
- controller_child(c, i),
- dst_rect{},
- src_rect{},
- size{},
- orientation{},
- visibility{},
- opacity{1.f} {
+ controller_child(c, i) {
this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
ivi_controller_surface_add_listener(this->proxy.get(), &surface_listener,
this);
ivi_controller_surface_destroy(this->proxy.get(), destroy_scene_object);
}
-void controller::surface_visibility(uint32_t id, int32_t visibility) {
- logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy.get(),
+void controller::surface_visibility(struct surface *s, int32_t visibility) {
+ logdebug("genivi::surface %s @ %d v %i", __func__, s->id,
visibility);
- this->surfaces[id]->visibility = visibility;
+ this->sprops[s->id].visibility = visibility;
+ this->chooks->surface_visibility(s->id, visibility);
}
-void controller::surface_opacity(uint32_t id, float opacity) {
- logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy.get(),
+void controller::surface_opacity(struct surface *s, float opacity) {
+ logdebug("genivi::surface %s @ %d o %f", __func__, s->id,
opacity);
- this->surfaces[id]->opacity = opacity;
+ this->sprops[s->id].opacity = opacity;
}
-void controller::surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
- int32_t width, int32_t height) {
- logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy.get(), x, y, width, height);
- this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+void controller::surface_source_rectangle(struct surface *s, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
+ logdebug("genivi::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};
}
-void controller::surface_destination_rectangle(uint32_t id, int32_t x,
+void controller::surface_destination_rectangle(struct surface *s, int32_t x,
int32_t y, int32_t width,
int32_t height) {
- logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy.get(), x, y, width, height);
- this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ logdebug("genivi::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);
}
-void controller::surface_configuration(uint32_t id, int32_t width,
+void controller::surface_configuration(struct surface *s, int32_t width,
int32_t height) {
- logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy.get(),
+ logdebug("genivi::surface %s @ %d w %i h %i", __func__, s->id,
width, height);
- this->surfaces[id]->size = size{uint32_t(width), uint32_t(height)};
+ this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
}
-void controller::surface_orientation(uint32_t id, int32_t orientation) {
- logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy.get(),
+void controller::surface_orientation(struct surface *s, int32_t orientation) {
+ logdebug("genivi::surface %s @ %d o %i", __func__, s->id,
orientation);
- this->surfaces[id]->orientation = orientation;
+ this->sprops[s->id].orientation = orientation;
}
-void controller::surface_pixelformat(uint32_t /*id*/, int32_t pixelformat) {
- logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy.get(),
+void controller::surface_pixelformat(struct surface * s,
+ int32_t pixelformat) {
+ logdebug("genivi::surface %s @ %d f %i", __func__, s->id,
pixelformat);
}
-void controller::surface_layer(uint32_t /*id*/,
+void controller::surface_layer(struct surface * s,
struct ivi_controller_layer *layer) {
- logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy.get(),
+ logdebug("genivi::surface %s @ %d l %u @ %p", __func__, s->id,
this->layer_proxy_to_id[uintptr_t(layer)], layer);
}
-void controller::surface_stats(uint32_t /*id*/, uint32_t redraw_count,
+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) {
- logdebug("genivi::surface %s @ %p r %u f %u u %u pid %u p %s", __func__,
- this->proxy.get(), redraw_count, frame_count, update_count, pid,
+ logdebug("genivi::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(uint32_t id) {
- logdebug("genivi::surface %s @ %p", __func__, this->proxy.get());
- this->surfaces.erase(id);
+void controller::surface_destroyed(struct surface *s) {
+ logdebug("genivi::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);
+ this->surfaces.erase(s->id);
}
-void controller::surface_content(uint32_t id, int32_t content_state) {
- logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(),
+void controller::surface_content(struct surface *s, int32_t content_state) {
+ logdebug("genivi::surface %s @ %d s %i", __func__, s->id,
content_state);
if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
- add_task("remove surface",
- [id](struct controller *c) { c->surfaces.erase(id); });
+ // XXX is this the right thing to do?
+ this->chooks->surface_removed(s->id);
+ this->sprops.erase(s->id);
+ this->surfaces.erase(s->id);
}
}
void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p,
uint32_t id) {
- this->surface_proxy_to_id[uintptr_t(p)] = id;
logdebug("Add surface proxy mapping for %p (%u)", p, id);
+ this->surface_proxy_to_id[uintptr_t(p)] = id;
+ this->sprops[id].id = id;
}
void controller::remove_proxy_to_id_mapping(struct ivi_controller_surface *p) {
uint32_t id) {
logdebug("Add layer proxy mapping for %p (%u)", p, id);
this->layer_proxy_to_id[uintptr_t(p)] = id;
+ this->lprops[id].id = id;
}
void controller::remove_proxy_to_id_mapping(struct ivi_controller_layer *p) {
this->screen_proxy_to_id.erase(uintptr_t(p));
}
-void controller::add_task(char const *name,
- std::function<void(struct controller *)> &&f) {
- this->pending.emplace_back(std::make_pair(name, f));
-}
-
-void controller::execute_pending() {
- if (!this->pending.empty()) {
- for (auto &t : this->pending) {
- logdebug("executing task '%s'", t.first);
- t.second(this);
- }
- this->pending.clear();
- ivi_controller_commit_changes(this->proxy.get());
- // XXX: No flush here...
- }
-}
-
//
// ___ ___ _ __ ___ ___ _ __
// / __|/ __| '__/ _ \/ _ \ '_ \
Code Review / staging / windowmanager.git / blobdiff