config(),
layouts(),
layers(),
- 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;
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, h);
- s->set_source_rectangle(0, 0, w, h);
- s->set_destination_rectangle(x, y, w, h);
+ 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();
std::this_thread::sleep_for(100ms);
// Set a different size then what we actually want.
- s->set_configuration(w + 1, h);
- s->set_source_rectangle(0, 0, w + 1, h);
- s->set_destination_rectangle(x, y, w + 1, h);
+ 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();
-
- std::this_thread::sleep_for(100ms);
}
}
} // namespace
-void App::surface_set_layout(uint32_t surface_id) {
+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;
h = this->controller->output_size.h + 1 + h;
}
- redraw_fix(this, s, x, y, w, h);
-
// configure surface to wxh dimensions
s->set_configuration(w, h);
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
// Set all others invisible
for (auto &i : this->controller->surfaces) {
auto &si = this->controller->sprops[i.second->id];
- if (int(si.id) != this->layers.main_surface) {
- i.second->set_visibility(0);
- this->controller->commit_changes();
- this->display->flush();
+ 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();
- // 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;
}
return "Cannot deactivate main_surface";
}
- if (this->last_active.empty()) {
- return "Cannot deactivate surface (not active)";
- }
-
- // XXX: should an active surface not alsways be front() or
- // front+1() of last_active?!
+ this->deactivate(surface_id);
- // 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)";
- }
-
- this->last_active.erase(is);
-
- if (! this->last_active.empty()) {
- // Should be active already, shouldn't it?
- this->activate_surface(this->lookup_name(this->last_active.front()).value_or("unknown-name").c_str());
- } else {
- this->activate_surface(this->layers.main_surface_name.c_str());
- }
+ 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) {
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(drawing_name);
logdebug("Set main_surface id to %u", id);
}
return Err<int>("Surface already present");
}
+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());
+ }
+}
+
+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());
+ }
+}
+
// _ _ _ _ _ _ _
// | |__ (_)_ __ __| (_)_ __ __ _ __ _ _ __ (_) (_)_ __ ___ _ __ | |
// | '_ \| | '_ \ / _` | | '_ \ / _` | / _` | '_ \| | | | '_ ` _ \| '_ \| |
return Ok(json_object_new_object());
}
-binding_api::result_type binding_api::demo_activate_surface(uint32_t s) {
- return Err<json_object *>("not implemented");
-}
-
-binding_api::result_type binding_api::demo_activate_all() {
- return Err<json_object *>("not implemented");
-}
-
// _ _ _ _ _
// ___ ___ _ __ | |_ _ __ ___ | | | ___ _ __ | |__ ___ ___ | | _____
// / __/ _ \| '_ \| __| '__/ _ \| | |/ _ \ '__|| '_ \ / _ \ / _ \| |/ / __|
Code Review / staging / windowmanager.git / blobdiff