const char kKeyHeightPixel[] = "height_pixel";
const char kKeyWidthMm[] = "width_mm";
const char kKeyHeightMm[] = "height_mm";
+const char kKeyScale[] = "scale";
const char kKeyIds[] = "ids";
static sd_event_source *g_timer_ev_src = nullptr;
// This protocol needs the output, so lets just add our mapping here...
this->controller->add_proxy_to_id_mapping(
- this->outputs.back()->proxy.get(),
+ this->outputs.front()->proxy.get(),
wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
- this->outputs.back()->proxy.get())));
+ this->outputs.front()->proxy.get())));
// Create screen
- this->controller->create_screen(this->outputs.back()->proxy.get());
+ this->controller->create_screen(this->outputs.front()->proxy.get());
// Set display to controller
this->controller->display = this->display;
result<json_object *> WindowManager::api_get_display_info()
{
- // Check controller
- if (!this->controller)
+ if (!this->display->ok())
{
- return Err<json_object *>("ivi_controller global not available");
+ return Err<json_object *>("Wayland compositor is not available");
}
// Set display info
json_object_object_add(object, kKeyHeightPixel, json_object_new_int(o_size.h));
json_object_object_add(object, kKeyWidthMm, json_object_new_int(p_size.w));
json_object_object_add(object, kKeyHeightMm, json_object_new_int(p_size.h));
+ json_object_object_add(object, kKeyScale, json_object_new_double(this->controller->scale));
return Ok<json_object *>(object);
}
*/
void WindowManager::surface_created(uint32_t surface_id)
{
+ this->controller->get_surface_properties(surface_id, IVI_WM_PARAM_SIZE);
+
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
c->physical_size = compositor::size{uint32_t(o->physical_width),
uint32_t(o->physical_height)};
+
+ HMI_DEBUG("wm", "SCALING: screen (%dx%d), physical (%dx%d)",
+ o->width, o->height, o->physical_width, o->physical_height);
+
+ this->layers.loadAreaDb();
+
+ const compositor::rect css_bg = this->layers.getAreaSize("fullscreen");
+ rectangle dp_bg(o->width, o->height);
+
+ dp_bg.set_aspect(static_cast<double>(css_bg.w) / css_bg.h);
+ dp_bg.fit(o->width, o->height);
+ dp_bg.center(o->width, o->height);
+ HMI_DEBUG("wm", "SCALING: CSS BG(%dx%d) -> DDP %dx%d,(%dx%d)",
+ css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
+
// Clear scene
layers.clear();
// Quick and dirty setup of layers
for (auto const &i : this->layers.mapping)
{
- c->layer_create(i.second.layer_id, o->width, o->height);
+ c->layer_create(i.second.layer_id, dp_bg.width(), dp_bg.height());
auto &l = layers[i.second.layer_id];
- l->set_destination_rectangle(0, 0, o->width, o->height);
+ l->set_destination_rectangle(dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height());
l->set_visibility(1);
HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
this->layout_commit();
- this->layers.loadAreaDb();
- this->layers.setupArea(o->width, o->height);
+ c->scale = static_cast<double>(dp_bg.height()) / css_bg.h;
+ this->layers.setupArea(c->scale);
return 0;
}
layer_id);
// set destination to the display rectangle
- s->set_source_rectangle(0, 0, w, h);
- this->layout_commit();
s->set_destination_rectangle(x, y, w, h);
// update area information
{
continue;
}
+ if (l.second.role == "homescreen")
+ {
+ continue;
+ }
HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub);
if (l.second.state.main != -1)
{
HMI_SEQ_DEBUG(req_num, "visible %s", act.role.c_str());
//this->lm_enddraw(act.role.c_str());
}
+ this->layout_commit();
// Change current state
this->changeCurrentState(req_num);
*/
void controller_hooks::surface_created(uint32_t surface_id)
{
- this->app->surface_created(surface_id);
+ this->wmgr->surface_created(surface_id);
}
void controller_hooks::surface_removed(uint32_t surface_id)
{
- this->app->surface_removed(surface_id);
+ this->wmgr->surface_removed(surface_id);
}
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,