return Ok(l);
}
+result<json> file_to_json(char const *filename) {
+ std::ifstream i(filename);
+ if (i.fail()) {
+ return Err<json>("Could not open config file");
+ }
+ json j;
+ i >> j;
+ return Ok(j);
+}
+
struct result<layouts_type> load_layout(char const *filename) {
DB("loading layout from " << filename);
- json jlayouts;
- std::ifstream i(filename);
- i >> jlayouts;
+ auto j = file_to_json(filename);
+ if (j.is_err()) {
+ return Err<layouts_type>(j.unwrap_err());
+ }
+ json jlayouts = j.unwrap();
auto layouts = layouts_type();
layouts.reserve(jlayouts.size());
load_layer_ids(char const *filename) {
DB("loading IDs from " << filename);
- json jids;
- std::ifstream i(filename);
- i >> jids;
+ auto j = file_to_json(filename);
+ if (j.is_err()) {
+ return Err<surface_id_to_layer_map>(j.unwrap_err());
+ }
+ json jids = j.unwrap();
return to_surface_id_to_layer_map(jids);
}
display{d},
controller{},
outputs(),
- layouts(), // load_layout("../layout.json").unwrap()),
- surface2layer(load_layer_ids("../ids.json").unwrap()) {
- // layouts(load_layout("../layout.json").unwrap()) {
+ layouts(),
+ surface2layer() {
assert(g_app == nullptr);
g_app = this;
- try {
+ {
+ auto l = load_layer_ids("../ids.json");
+ if (l.is_ok()) {
+ this->surface2layer = l.unwrap();
+ } else {
+ logerror("%s", l.err().value());
+ }
+ }
+
+ {
auto l = load_layout("../layout.json");
- if (l.is_err()) {
- logerror("Coult not load layout configuration: %s", l.err().value());
+ if (l.is_ok()) {
+ this->layouts = l.unwrap();
+ } else {
+ logerror("%s", l.err().value());
}
- } catch (std::exception &e) {
- logerror("Coult not load layout configuration: %s", e.what());
}
}
return -1;
}
+ if (this->surface2layer.mapping.empty()) {
+ logerror("No surface -> layer mapping loaded");
+ return -1;
+ }
+
this->display->add_global_handler(
"wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) {
this->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
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;
}
}
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);