#include <json-c/json.h>
+#include <algorithm>
#include <bits/signum.h>
#include <csignal>
#include <fstream>
+#include <thread>
#include <json.hpp>
namespace wm {
return wm::area{
j["name"],
{
- j["width"], j["height"],
- j["x"], j["y"],
+ j["width"], j["height"], j["x"], j["y"],
},
j["zorder"],
};
outputs(),
config(),
layouts(),
- layers() {
+ layers(),
+ name_mapping(),
+ 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;
this->display->flush();
// execute pending tasks, that is layout changes etc.
- this->execute_pending();
+ //this->execute_pending();
return 0;
}
return 0;
}
-void App::surface_set_layout(uint32_t surface_id) {
- auto o_layer_id = this->layers.get_layer_id(surface_id);
+namespace {
- if (!o_layer_id) {
- logerror("Surface %d is not associated with any layer!", int(surface_id));
- return;
+// 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, h);
+ s->set_source_rectangle(0, 0, w, h);
+ s->set_destination_rectangle(x, y, w, 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 + 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);
}
+}
+
+} // namespace
+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) {
+ logerror("Surface %d is not associated with any layer!", 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);
- auto rect = this->layers.get_layer_rect(surface_id).value();
+ auto const &layer = this->layers.get_layer(layer_id);
+ auto rect = layer.value().rect;
auto &s = this->controller->surfaces[surface_id];
int x = rect.x;
if (h < 0) {
h = this->controller->output_size.h + 1 + h;
}
- logdebug("Computed rect={ %d, %d, %d, %d }", x, y, w, h);
+
+ redraw_fix(this, s, x, y, w, h);
// 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(1);
+ s->set_visibility(0);
+ s->set_opacity(256);
+
+ this->controller->commit_changes();
+ this->display->roundtrip();
+
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);
+ }
+
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
return "Surface does not exist";
}
- // This shouild involve a policy check, but as we do not (yet) have
+ // This should involve a policy check, but as we do not (yet) have
// such a thing, we will just switch to this surface.
// XXX: input focus missing!!1
// Set all others invisible
for (auto &i : this->controller->surfaces) {
auto &si = this->controller->sprops[i.second->id];
- if (si.visibility == 1 && si.id != s->id &&
- int(si.id) != this->layers.main_surface) {
+ if (int(si.id) != this->layers.main_surface) {
i.second->set_visibility(0);
+ this->controller->commit_changes();
+ this->display->flush();
}
}
s->set_visibility(1);
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;
}
-void App::add_task(char const *name, std::function<void()> &&f) {
- this->pending.emplace_back(std::make_pair(name, f));
-}
+char const *App::deactivate_surface(uint32_t surface_id) {
+ if (surface_id == this->layers.main_surface) {
+ return "Cannot deactivate main_surface";
+ }
-void App::execute_pending() {
- if (!this->pending.empty()) {
- for (auto &t : this->pending) {
- logdebug("executing task '%s'", t.first);
- t.second();
- }
- this->pending.clear();
- this->controller->commit_changes();
- this->display->flush();
+ 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::surface_created(uint32_t surface_id) {
+ //surface_id >>= id_allocator::id_shift;
+
logdebug("surface_id is %u", surface_id);
- // We need to execute the surface setup after its creation.
- this->add_task("surface_set_layout",
- [surface_id, this] { this->surface_set_layout(surface_id); });
+ this->surface_set_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", label);
+}
+
+void App::emit_deactivated(char const *label) {
+ this->api.send_event("deactivated", label);
+}
+
+void App::emit_syncdraw(char const *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", label);
+}
+
+result<int> App::request_surface(char const *drawing_name) {
+ auto lid = this->layers.get_layer_id(std::string(drawing_name));
+ if (!lid) {
+ // XXX: to we need to put these applications on the App layer?
+ return Err<int>("Drawing name does not match any role");
+ }
+
+ auto rname = this->id_alloc.lookup(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!
+ 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 Ok<int>(id);
+ }
+
+ // Check currently registered drawing names if it is already there.
+ 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;
+ }
+
+ 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());
+ }
+
+ logerror("surface %s unknown", drawing_name);
+ return "Surface unknown";
}
// _ _ _ _ _ _ _
// | |_) | | | | | (_| | | | | | (_| | | (_| | |_) | | | | | | | | | |_) | |
// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_|
// |___/_____| |_| |_|
-binding_api::result_type binding_api::register_surface(uint32_t appid,
- uint32_t surfid) {
- logdebug("%s appid %u surfid %u", __func__, appid, surfid);
- if (appid > 0xff) {
- return Err<json_object *>("invalid appid");
+binding_api::result_type binding_api::request_surface(
+ char const *drawing_name) {
+ auto r = this->app->request_surface(drawing_name);
+ if (r.is_err()) {
+ return Err<json_object *>(r.unwrap_err());
}
+ return Ok(json_object_new_int(r.unwrap()));
+}
- if (surfid > 0xffff) {
- return Err<json_object *>("invalid surfaceid");
+binding_api::result_type binding_api::activate_surface(
+ char const *drawing_name) {
+ logdebug("%s drawing_name %s", __func__, drawing_name);
+ auto r = this->app->activate_surface(drawing_name);
+ 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());
+}
- return Ok(json_object_new_int((appid << 16) + surfid));
+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::debug_layers() {
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());
this->app->surface_removed(surface_id);
}
-void controller_hooks::add_task(char const *name, std::function<void()> &&f) {
- this->app->add_task(name, std::move(f));
-}
-
} // namespace wm
Code Review / staging / windowmanager.git / blobdiff