#include <json-c/json.h>
+#include <algorithm>
#include <bits/signum.h>
#include <csignal>
#include <fstream>
-#include <algorithm>
#include <json.hpp>
namespace wm {
layers(),
pending(),
name_mapping(),
- id_alloc{}
-{
+ id_alloc{},
+ last_active() {
assert(g_app == nullptr);
g_app = this;
this->display->add_global_handler(
"ivi_controller", [this](wl_registry *r, uint32_t name, uint32_t v) {
- this->controller = std::make_unique<genivi::controller>(r, name, v);
+ this->controller = std::make_unique<struct genivi::controller>(r, name, v);
// Init controller hooks
this->controller->chooks = &this->chooks;
}
void App::surface_set_layout(uint32_t surface_id) {
+ if (!this->controller->surface_exists(surface_id)) {
+ logerror("Surface %d does not exist", int(surface_id));
+ return;
+ }
+
auto o_layer_id = this->layers.get_layer_id(surface_id);
if (!o_layer_id) {
return;
}
- if (!this->controller->surface_exists(surface_id)) {
- logerror("Surface %d does not exist", int(surface_id));
- return;
- }
-
uint32_t layer_id = o_layer_id.value();
- logdebug("surface_set_layout for surface %u on layer %u", surface_id, layer_id);
+ logdebug("surface_set_layout for surface %u on layer %u", surface_id,
+ layer_id);
auto const &layer = this->layers.get_layer(layer_id);
auto rect = layer.value().rect;
// 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: visibility should be determined independently of our
- // layer + geometry setup.
- s->set_visibility(surface_id == (unsigned)this->layers.main_surface ? 1 : 0);
+ // XXX: The main_surface will be visible regardless
+ s->set_visibility(
+ surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
this->controller->layers[layer_id]->add_surface(s.get());
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
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;
}
+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)";
+ }
+
+ // 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)";
+ }
+
+ this->last_active.erase(is);
+
+ 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);
+ }
+
+ return nullptr;
+}
+
void App::add_task(char const *name, std::function<void()> &&f) {
this->pending.emplace_back(std::make_pair(name, f));
}
// | .__/|_| \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
// |_|
void App::surface_created(uint32_t surface_id) {
+ surface_id &= id_allocator::id_mask;
+
logdebug("surface_id is %u", surface_id);
// We need to execute the surface setup after its creation.
}
void App::surface_removed(uint32_t surface_id) {
+ surface_id &= id_allocator::id_mask;
+
logdebug("surface_id is %u", surface_id);
+
+ this->add_task("remove surface ID",
+ [surface_id, this] {
+ 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);
+ }
+ });
}
result<int> App::request_surface(char const *drawing_name) {
return Err<int>("Drawing name does not match any role");
}
- auto rname = this->id_alloc[drawing_name];
- if (! rname) {
+ auto rname = this->id_alloc.lookup(drawing_name);
+ if (!rname) {
// name does not exist yet, allocate surface id...
- // XXX: how to allocate surface IDs?
- // * allocate by running a counter for each layer?
- // * allocate IDs globally, i.e. do not have layers contain
- // ID ranges (only define the surfaces on the layer by
- // role?)
- auto id = int(this->id_alloc(drawing_name));
+ auto id = int(this->id_alloc.generate_id(drawing_name));
this->layers.add_surface(id, lid.value());
- // XXX: setup the main_surface id if we registered HomeScreen
// XXX: you should fix this!
if (!this->layers.main_surface_name.empty() &&
- this->layers.main_surface_name == drawing_name) {
+ 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[drawing_name];
+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());
+ return this->activate_surface(osid.value());
+ }
+
+ 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("ativate surface with name %s and id %u", drawing_name, osid.value());
- this->activate_surface(osid.value());
- return nullptr;
+ logdebug("deativate surface with name %s and id %u", drawing_name,
+ osid.value());
+ return this->deactivate_surface(osid.value());
}
logerror("surface %s unknown", drawing_name);
char const *drawing_name) {
auto r = this->app->request_surface(drawing_name);
if (r.is_err()) {
- return Err<json_object*>(r.unwrap_err());
+ return Err<json_object *>(r.unwrap_err());
}
return Ok(json_object_new_int(r.unwrap()));
}
char const *drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
auto r = this->app->activate_surface(drawing_name);
- if (r) {
+ if (r != nullptr) {
+ return Err<json_object *>(r);
+ }
+ return Ok(json_object_new_object());
+}
+
+binding_api::result_type binding_api::deactivate_surface(char const* drawing_name) {
+ logdebug("%s drawing_name %s", __func__, drawing_name);
+ auto r = this->app->deactivate_surface(drawing_name);
+ if (r != nullptr) {
return Err<json_object *>(r);
}
return Ok(json_object_new_object());
}
+binding_api::result_type binding_api::enddraw(char const* drawing_name) {
+ logdebug("%s drawing_name %s", __func__, drawing_name);
+ return Err<json_object*>("not implemented");
+}
+
binding_api::result_type binding_api::list_drawing_names() {
+ logdebug("%s", __func__);
json j = this->app->id_alloc.names;
return Ok(json_tokener_parse(j.dump().c_str()));
}
binding_api::result_type binding_api::demo_activate_surface(
uint32_t surfaceid) {
char const *e = this->app->activate_surface(surfaceid);
- if (e) {
+ if (e != nullptr) {
return Err<json_object *>(e);
}
return Ok(json_object_new_object());
Code Review / staging / windowmanager.git / blobdiff