config(),
layouts(),
layers(),
- name_mapping(),
- id_alloc{},
- last_active() {
+ id_alloc{} {
assert(g_app == nullptr);
g_app = this;
// Third level objects
this->display->roundtrip();
- return init_layout();
+ return init_layers();
}
int App::dispatch_events() {
// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | |
// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | |
// |_____| |___/ \_\/_/
-int App::init_layout() {
+int App::init_layers() {
if (!this->controller) {
logerror("ivi_controller global not available");
return -1;
return 0;
}
-void App::surface_set_layout(uint32_t surface_id) {
+namespace {
+
+// This can fix the HomeScreen...
+void redraw_fix(App *app, std::unique_ptr<genivi::surface> &s, int x, int y, int w, int h) {
+ { // XXX: Work around weston redraw issues
+ // trigger an update by changing the source dimensions!
+ s->set_configuration(w + 1, h);
+ s->set_source_rectangle(0, 0, w + 1, h);
+ s->set_destination_rectangle(x, y, w + 1, h);
+ app->controller->commit_changes();
+ app->display->roundtrip();
+
+ // wait some time, for the process to do its thing...
+ using namespace std::chrono_literals;
+ std::this_thread::sleep_for(100ms);
+
+ // Set a different size then what we actually want.
+ s->set_configuration(w, h);
+ s->set_source_rectangle(0, 0, w, h);
+ s->set_destination_rectangle(x, y, w, h);
+ app->controller->commit_changes();
+ app->display->roundtrip();
+ }
+}
+
+} // namespace
+
+void App::surface_init_layout(uint32_t surface_id) {
if (!this->controller->surface_exists(surface_id)) {
logerror("Surface %d does not exist", int(surface_id));
return;
// configure surface to wxh dimensions
s->set_configuration(w, h);
+
// set source reactangle, even if we should not need to set it.
s->set_source_rectangle(0, 0, w, h);
+
// set destination to the display rectangle
s->set_destination_rectangle(x, y, w, h);
- // XXX: The main_surface will be visible regardless
- //s->set_visibility(
- // surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
+ s->set_visibility(0);
+ s->set_opacity(256);
+
+ this->controller->commit_changes();
+ this->display->roundtrip();
+
+ redraw_fix(this, s, x, y, w, h);
+
this->controller->layers[layer_id]->add_surface(s.get());
+ // activate the main_surface right away
if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
logdebug("Activating main_surface (%d)", surface_id);
- this->activate_surface(surface_id);
+
+ this->activate_surface(this->lookup_name(surface_id).value_or("unknown-name").c_str());
}
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
-char const *App::activate_surface(uint32_t surface_id) {
+char const *App::activate_surface(char const *drawing_name) {
+ int surface_id = -1;
+
+ {
+ auto oid = this->lookup_id(drawing_name);
+ if (oid) {
+ surface_id = oid.value();
+ } else {
+ return "Surface does not exist";
+ }
+ }
+
if (!this->controller->surface_exists(surface_id)) {
return "Surface does not exist";
}
// Set all others invisible
for (auto &i : this->controller->surfaces) {
auto &si = this->controller->sprops[i.second->id];
- if (si.id != s->id && int(si.id) != this->layers.main_surface) {
- i.second->set_visibility(0);
+ if (si.visibility != 0 &&
+ int(si.id) != this->layers.main_surface) {
+ this->deactivate(i.second->id);
}
}
- s->set_visibility(1);
+ this->activate(s->id);
// commit changes
this->controller->commit_changes();
this->display->flush();
- auto set_vis = [&s, this](int id, int vis) {
- using namespace std::chrono_literals;
-
- std::this_thread::sleep_for(200ms);
- char *buf;
- asprintf(&buf, "LayerManagerControl set surface %d visibility %d", id, vis);
- //system("LayerManagerControl get scene");
- //system("sleep 0.1");
- system(buf);
-
- //s->set_visibility(vis);
- //this->controller->commit_changes();
- //this->display->roundtrip();
- };
- set_vis(s->id, 0);
- set_vis(s->id, 1);
-
- // Current active surface is the first in last_active
- this->last_active.push_front(s->id);
- /// // XXX: I am not sure I even need 5 elements...
- /// this->last_active.resize(std::min(int(this->last_active.size()), 5));
-
// no error
return nullptr;
}
-char const *App::deactivate_surface(uint32_t surface_id) {
- if (surface_id == this->layers.main_surface) {
- return "Cannot deactivate main_surface";
- }
-
- if (this->last_active.empty()) {
- return "Cannot deactivate surface (not active)";
+char const *App::deactivate_surface(char const *drawing_name) {
+ int surface_id = -1;
+
+ {
+ auto oid = this->lookup_id(drawing_name);
+ if (oid) {
+ surface_id = oid.value();
+ } else {
+ return "Surface does not exist";
+ }
}
- // XXX: should an active surface not alsways be front() or
- // front+1() of last_active?!
-
- // XXX: Should I really be able to deactivate a surface that is not
- // front() of last_active?
- auto is = std::find(this->last_active.begin(),
- this->last_active.end(),
- surface_id);
-
- if (is == this->last_active.end()) {
- return "Cannot deactivate surface (not active)";
+ if (surface_id == this->layers.main_surface) {
+ return "Cannot deactivate main_surface";
}
- this->last_active.erase(is);
+ this->deactivate(surface_id);
- if (! this->last_active.empty()) {
- // Should be active already, shouldn't it?
- this->activate_surface(this->last_active.front());
- } else {
- this->activate_surface(this->layers.main_surface);
- }
+ this->controller->commit_changes();
+ this->display->flush();
return nullptr;
}
// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
// |_|
void App::surface_created(uint32_t surface_id) {
- //surface_id >>= id_allocator::id_shift;
-
logdebug("surface_id is %u", surface_id);
- this->surface_set_layout(surface_id);
+ this->surface_init_layout(surface_id);
}
void App::surface_removed(uint32_t surface_id) {
- //surface_id >>= id_allocator::id_shift;
-
logdebug("surface_id is %u", surface_id);
this->id_alloc.remove_id(surface_id);
-
- // Also remove from last_active, if found
- auto i = std::find(this->last_active.begin(),
- this->last_active.end(), surface_id);
- if (i != this->last_active.end()) {
- this->last_active.erase(i);
- }
}
void App::emit_activated(char const *label) {
- this->api.send_event("activated", json_object_new_string(label));
+ this->api.send_event("activated", label);
}
void App::emit_deactivated(char const *label) {
- this->api.send_event("deactivated", json_object_new_string(label));
+ this->api.send_event("deactivated", label);
}
void App::emit_syncdraw(char const *label) {
- this->api.send_event("syncdraw", json_object_new_string(label));
+ this->api.send_event("syncdraw", label);
+}
+
+void App::emit_flushdraw(char const *label) {
+ this->api.send_event("syncdraw", label);
}
void App::emit_visible(char const *label, bool is_visible) {
- this->api.send_event(is_visible ? "visible" : "invisible", json_object_new_string(label));
+ this->api.send_event(is_visible ? "visible" : "invisible", label);
}
result<int> App::request_surface(char const *drawing_name) {
return Err<int>("Drawing name does not match any role");
}
- auto rname = this->id_alloc.lookup(drawing_name);
+ auto rname = this->lookup_id(drawing_name);
if (!rname) {
// name does not exist yet, allocate surface id...
auto id = int(this->id_alloc.generate_id(drawing_name));
this->layers.add_surface(id, lid.value());
- // XXX: you should fix this!
+ // XXX: we set the main_surface[_name] here and now,
+ // not sure if we want this, but it worked so far.
if (!this->layers.main_surface_name.empty() &&
this->layers.main_surface_name == drawing_name) {
this->layers.main_surface = id;
- this->activate_surface(id);
logdebug("Set main_surface id to %u", id);
}
return Err<int>("Surface already present");
}
-char const *App::activate_surface(char const *drawing_name) {
- auto osid = this->id_alloc.lookup(drawing_name);
-
- if (osid) {
- logdebug("ativate surface with name %s and id %u", drawing_name,
- osid.value());
- auto ret = this->activate_surface(osid.value());
- if (!ret) {
- this->emit_activated(drawing_name);
- }
- return ret;
+void App::activate(unsigned id) {
+ if (this->controller->sprops[id].visibility == 0) {
+ this->controller->surfaces[id]->set_visibility(1);
+ this->emit_activated(
+ this->lookup_name(id).value_or("unknown-name").c_str());
}
-
- logerror("surface %s unknown", drawing_name);
- return "Surface unknown";
}
-char const *App::deactivate_surface(char const *drawing_name) {
- auto osid = this->id_alloc.lookup(drawing_name);
-
- if (osid) {
- logdebug("deativate surface with name %s and id %u", drawing_name,
- osid.value());
- return this->deactivate_surface(osid.value());
+void App::deactivate(unsigned id) {
+ if (this->controller->sprops[id].visibility != 0) {
+ this->controller->surfaces[id]->set_visibility(0);
+ this->emit_deactivated(
+ this->lookup_name(id).value_or("unknown-name").c_str());
}
-
- logerror("surface %s unknown", drawing_name);
- return "Surface unknown";
}
// _ _ _ _ _ _ _
logdebug("%s drawing_name %s", __func__, drawing_name);
auto r = this->app->activate_surface(drawing_name);
if (r != nullptr) {
+ logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
}
return Ok(json_object_new_object());
logdebug("%s drawing_name %s", __func__, drawing_name);
auto r = this->app->deactivate_surface(drawing_name);
if (r != nullptr) {
+ logdebug("%s failed with error: %s", __func__, r);
return Err<json_object *>(r);
}
return Ok(json_object_new_object());
binding_api::result_type binding_api::list_drawing_names() {
logdebug("%s", __func__);
- json j = this->app->id_alloc.names;
+ json j = this->app->id_alloc.name2id;
return Ok(json_tokener_parse(j.dump().c_str()));
}
return Ok(json_object_new_object());
}
-binding_api::result_type binding_api::demo_activate_surface(
- uint32_t surfaceid) {
- char const *e = this->app->activate_surface(surfaceid);
- if (e != nullptr) {
- return Err<json_object *>(e);
- }
- return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::demo_activate_all() {
- for (auto &s : this->app->controller->surfaces) {
- s.second->set_visibility(1);
- }
- this->app->controller->commit_changes();
- this->app->display->flush();
- return Ok(json_object_new_object());
-}
-
// _ _ _ _ _
// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____
// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|
Code Review / staging / windowmanager.git / blobdiff