+/*
+ * 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.
+ */
+
//
// Created by mfritzsc on 7/11/17.
//
display{d},
controller{},
outputs(),
+ config(),
layouts(),
layers() {
assert(g_app == nullptr);
g_app = this;
- {
- auto l = load_layer_map("../ids.json");
- if (l.is_ok()) {
- this->layers = l.unwrap();
- } else {
- logerror("%s", l.err().value());
+ try {
+ {
+ auto l = load_layer_map(
+ this->config.get_string("layers.json").value().c_str());
+ if (l.is_ok()) {
+ this->layers = l.unwrap();
+ } else {
+ logerror("%s", l.err().value());
+ }
}
- }
- {
- auto l = load_layout("../layout.json");
- if (l.is_ok()) {
- this->layouts = l.unwrap();
- } else {
- logerror("%s", l.err().value());
+ {
+ auto l = load_layout(
+ this->config.get_string("layout.json").value().c_str());
+ if (l.is_ok()) {
+ this->layouts = l.unwrap();
+ } else {
+ logerror("%s", l.err().value());
+ }
}
+ } catch (std::exception &e) {
+ logerror("Loading of configuration failed: %s", e.what());
}
}
this->display->flush();
// execute pending tasks, that is layout changes etc.
- this->controller->execute_pending();
- this->display->roundtrip();
+ 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);
+
+ if (!o_layer_id) {
+ logerror("Surface %d is not associated with any layer!", int(surface_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();
+
+ auto rect = this->layers.get_layer_rect(surface_id).value();
+ auto &s = this->controller->surfaces[surface_id];
+
+ int x = rect.x;
+ int y = rect.y;
+ int w = rect.w;
+ int h = rect.h;
+
+ // less-than-0 values refer to MAX + 1 - $VALUE
+ // e.g. MAX is either screen width or height
+ if (w < 0) {
+ w = this->controller->output_size.w + 1 + w;
+ }
+ if (h < 0) {
+ h = this->controller->output_size.h + 1 + h;
+ }
+ logdebug("Computed rect={ %d, %d, %d, %d }", x, y, w, h);
+
+ // configure surface to wxh dimensions
+ s->set_configuration(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);
+ this->controller->layers[layer_id]->add_surface(s.get());
+
+ 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) {
+ if (! this->controller->surface_exists(surface_id)) {
+ return "Surface does not exist";
+ }
+
+ // This shouild 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
+
+ // Make it visible, no (or little effect) if already visible
+ auto &s = this->controller->surfaces[surface_id];
+ s->set_visibility(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) {
+ i.second->set_visibility(0);
+ }
+ }
+
+ // commit changes
+ this->controller->commit_changes();
+ this->display->flush();
+
+ // no error
+ return nullptr;
+}
+
+void App::add_task(char const *name, std::function<void()> &&f) {
+ this->pending.emplace_back(std::make_pair(name, f));
+}
+
+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();
+ }
+}
+
// _ _ _____ _
// _ __ _ __ _____ _(_) ___ __| | | ____|_ _____ _ __ | |_ ___
// | '_ \| '__/ _ \ \/ / |/ _ \/ _` | | _| \ \ / / _ \ '_ \| __/ __|
// |_|
void App::surface_created(uint32_t surface_id) {
DB("surface_id is " << surface_id);
- int layer_id = this->layers.get_layer_id(surface_id).value_or(-1);
- if (layer_id == -1) {
- logerror("Surface %d (0x%x) is not part of any layer!", surface_id,
- surface_id);
- } else {
- auto rect = this->layers.get_layer_rect(surface_id).value();
- this->controller->add_task(
- "fullscreen surface",
- [layer_id, surface_id, rect](struct genivi::controller *c) {
- auto &s = c->surfaces[surface_id];
-
- int x = rect.x;
- int y = rect.y;
- int w = rect.w;
- int h = rect.h;
-
- // less-than-0 values refer to MAX + 1 - $VALUE
- // e.g. MAX is either screen width or height
- if (w < 0) {
- w = c->output_size.w + 1 + w;
- }
- if (h < 0) {
- h = c->output_size.h + 1 + h;
- }
- logdebug("Computed rect={ %d, %d, %d, %d }", x, y, w, h);
-
- // configure surface to wxh dimensions
- s->set_configuration(w, h);
- // set source rect to "entire surface"
- s->set_source_rectangle(0, 0, w, h);
- // set destination to the display rectangle
- s->set_destination_rectangle(x, y, w, h);
-
- s->set_visibility(1);
- c->layers[layer_id]->add_surface(s.get());
- logdebug("Surface %u now on layer %u", surface_id, layer_id);
- });
- }
+
+ // We need to execute the surface setup after its creation.
+ // XXX: perhaps move the late-tasks functionality to App?
+ this->add_task("surface_set_layout",
+ [surface_id, this] { this->surface_set_layout(surface_id); });
}
void App::surface_removed(uint32_t surface_id) {
binding_api::result_type binding_api::debug_layers() {
logdebug("%s", __func__);
- return Ok(to_json(this->app->controller->lprops));
+ return Ok(json_tokener_parse(this->app->layers.to_json().dump().c_str()));
}
binding_api::result_type binding_api::debug_surfaces() {
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) {
+ 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