struct ilmSurfaceProperties* surface_prop,
t_ilm_notification_mask mask)
{
- g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask);
+ g_lc_ctxt->dispatchSurfacePropChangeEvent(surface, surface_prop, mask);
}
static void layerCallback_static(t_ilm_layer layer,
struct ilmLayerProperties* layer_prop,
t_ilm_notification_mask mask)
{
- g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask);
+ g_lc_ctxt->dispatchLayerPropChangeEvent(layer, layer_prop, mask);
}
LayerControl::LayerControl(const std::string& root)
// load layers.setting.json
WMError ret = this->loadLayerSetting(layer_path);
assert(ret == WMError::SUCCESS);
- // load area.db
+ // load areas.json
ret = this->loadAreaDb(area_path);
assert(ret == WMError::SUCCESS);
}
if(rc != ILM_SUCCESS) goto lc_init_error;
- // Register Callback from ILM
+ // Register Callback to Window Manager and from ILM
this->cb = cb;
ilm_registerNotification(createCallback_static, this);
struct rect rct = this->area2size[LC_DEFAULT_AREA];
ilm_layerCreateWithDimension(&id, rct.w, rct.h);
//ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h);
- //ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h);
+ ilm_layerSetDestinationRectangle(id, this->offset_x, this->offset_y, rct.w, rct.h);
ilm_layerSetOpacity(id, 1.0);
ilm_layerSetVisibility(id, ILM_FALSE);
ilm_commitChanges();
void LayerControl::setupArea(const rectangle& base_rct, double scaling)
{
- struct rect rct;
this->scaling = scaling;
-
- rct = this->area2size["normal.full"];
- this->area2size["normalfull"] = rct;
- this->area2size["normal"] = rct;
+ this->offset_x = base_rct.left();
+ this->offset_y = base_rct.top();
for (auto &i : this->area2size)
{
- i.second.x = base_rct.left() + static_cast<int>(scaling * i.second.x + 0.5);
- i.second.y = base_rct.top() + static_cast<int>(scaling * i.second.y + 0.5);
+ i.second.x = static_cast<int>(scaling * i.second.x + 0.5);
+ i.second.y = static_cast<int>(scaling * i.second.y + 0.5);
i.second.w = static_cast<int>(scaling * i.second.w + 0.5);
i.second.h = static_cast<int>(scaling * i.second.h + 0.5);
return rc;
}
+WMError LayerControl::setXDGSurfaceOriginSize(unsigned surface)
+{
+ WMError ret = WMError::NOT_REGISTERED;
+ ilmSurfaceProperties prop;
+ ilmErrorTypes rc = ilm_getPropertiesOfSurface(surface, &prop);
+ if(rc == ILM_SUCCESS)
+ {
+ HMI_INFO("xdg surface info %d, %d", prop.origSourceWidth, prop.origSourceHeight);
+ ilm_surfaceSetSourceRectangle(surface, 0, 0, prop.origSourceWidth, prop.origSourceHeight);
+ ret = WMError::SUCCESS;
+ }
+ return ret;
+}
+
+
void LayerControl::undoUpdate()
{
for(auto& l : this->wm_layers)
return WMError::NOT_REGISTERED;
}
unsigned layer = action.client->layerID();
+ unsigned surface = action.client->surfaceID();
- // Layout Manager
- // WMError ret = this->setLayerSize(layer, action.area);
auto rect = this->getAreaSize(action.area);
HMI_DEBUG("Set layout %d, %d, %d, %d",rect.x, rect.y, rect.w, rect.h);
- ilm_layerSetSourceRectangle(layer, 0, 0, rect.w, rect.h);
ilm_commitChanges();
- ilm_layerSetDestinationRectangle(layer, rect.x, rect.y, rect.w, rect.h);
+ ilm_surfaceSetDestinationRectangle(surface, rect.x, rect.y, rect.w, rect.h);
ilm_commitChanges();
for(auto &wm_layer: this->wm_layers)
{
+ // Store the state who is assigned to the area
if(wm_layer->hasLayerID(layer))
{
wm_layer->setAreaToState(action.client->appID(), action.area);
}
}
-void LayerControl::dispatchPropertyChangeEvent(unsigned id,
+void LayerControl::dispatchSurfacePropChangeEvent(unsigned id,
struct ilmSurfaceProperties* sprop,
t_ilm_notification_mask mask)
{
HMI_DEBUG("surface %d size %d, %d, %d, %d", id,
sprop->sourceX, sprop->sourceY, sprop->origSourceWidth, sprop->origSourceHeight);
ilm_surfaceSetSourceRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight);
- ilm_surfaceSetDestinationRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight);
}
}
-void LayerControl::dispatchPropertyChangeEvent(unsigned id,
+void LayerControl::dispatchLayerPropChangeEvent(unsigned id,
struct ilmLayerProperties* lprop,
t_ilm_notification_mask mask)
{
- /*
- ILM_NOTIFICATION_CONTENT_AVAILABLE & ILM_NOTIFICATION_CONTENT_REMOVED
- are not handled here, handled in create/destroy event
- */
if (ILM_NOTIFICATION_VISIBILITY & mask)
{
HMI_DEBUG("layer %d turns visibility %d", id, lprop->visibility);