ilm_commitChanges();
auto wm_layer = getWMLayer(id);
wm_layer->addLayerToState(id);
- this->commitChange();
+ this->renderLayers();
}
unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)
return WMError::SUCCESS;
}
-WMError LayerControl::commitChange()
+WMError LayerControl::renderLayers()
{
HMI_INFO("Commit change");
WMError rc = WMError::SUCCESS;
+
+ // Check the number of layers
vector<unsigned> ivi_l_ids;
for(auto& l : this->wm_layers)
{
ivi_l_ids.push_back(id);
}
}
+
+ // Create render order
t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()];
if(id_array == nullptr)
{
for(const auto& i : ivi_l_ids)
{
id_array[count] = i;
- HMI_DEBUG("check render order %d", i);
++count;
}
+ // Display
ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size());
if(ret != ILM_SUCCESS)
{
{
for(auto& l : this->wm_layers)
{
- l->commitChange();
+ l->update();
}
}
ilm_commitChanges();
return rc;
}
-void LayerControl::undoUpdate() {}
+void LayerControl::undoUpdate()
+{
+ for(auto& l : this->wm_layers)
+ {
+ l->undo();
+ }
+}
WMError LayerControl::loadLayerSetting(const string &path)
{
int ret = jh::inputJsonFilie(path.c_str(), &json_obj);
if (0 > ret)
{
- HMI_DEBUG("Could not open %s, so use default area information", path.c_str());
+ HMI_ERROR("Could not open %s", path.c_str());
return WMError::FAIL;
}
HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));
int ret = jh::inputJsonFilie(path.c_str(), &json_obj);
if (0 > ret)
{
- HMI_DEBUG("Could not open %s, so use default area information", path.c_str());
+ HMI_ERROR("Could not open %s", path.c_str());
return WMError::FAIL;
}
HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));
{
if(wm_layer->hasLayerID(layer))
{
+ wm_layer->setAreaToState(action.client->appID(), action.area);
+ /* TODO: manipulate state directly
LayerState ls = wm_layer->getLayerState();
ls.setArea(action.client->appID(), action.area);
+ wm_layer->dump(); */
}
}
return ret;
}
+void LayerControl::terminateApp(const shared_ptr<WMClient> client)
+{
+ for(auto& l : this->wm_layers)
+ {
+ l->terminateApp(client->layerID());
+ }
+}
+
void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created)
{
if (ILM_SURFACE == object)
ilmErrorTypes rc;
rc = ilm_getPropertiesOfSurface(id, &sp);
if(rc != ILM_SUCCESS)
+ {
+ HMI_ERROR("Failed to get surface %d property due to %d", id, ilm_getError());
return;
+ }
this->cb.surfaceCreated(sp.creatorPid, id);
ilm_surfaceAddNotification(id, surfaceCallback_static);
ilm_surfaceSetVisibility(id, ILM_TRUE);
if(created)
{
ilm_layerAddNotification(id, layerCallback_static);
- // this->cb->layerCreated(id);
}
else
{
- // this->cb->layerDestroyed(id); // Means Application is dead.
+ // Ignore here. Nothing to do currently.
+ // Process of application dead is handled by Window Manager
+ // from binder notification
}
}
}
struct ilmSurfaceProperties* sprop,
t_ilm_notification_mask mask)
{
- pid_t pid = sprop->creatorPid;
- HMI_DEBUG("pid : %d", pid);
-
+ /*
+ ILM_NOTIFICATION_CONTENT_AVAILABLE & ILM_NOTIFICATION_CONTENT_REMOVED
+ are not handled here, handled in create/destroy event
+ */
if (ILM_NOTIFICATION_VISIBILITY & mask)
{
- //this->cb->surfaceVisibilityChanged(id, sprop->visibility);
+ HMI_DEBUG("surface %d turns visibility %d", id, sprop->visibility);
}
if (ILM_NOTIFICATION_OPACITY & mask)
{
- }
- if (ILM_NOTIFICATION_ORIENTATION & mask)
- {
+ HMI_DEBUG("surface %d turns opacity %f", id, sprop->opacity);
}
if (ILM_NOTIFICATION_SOURCE_RECT & mask)
{
- // this->cb->surfaceSourceRectChanged(id, )
+ HMI_DEBUG("surface %d source rect changes", id);
}
if (ILM_NOTIFICATION_DEST_RECT & mask)
{
- // this->cb->surfaceSourceRectChanged(id, )
- }
- if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
- {
- }
- if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
- {
- /* application being down */
- // m_appLayers.remove(pid);
+ HMI_DEBUG("surface %d dest rect changes", id);
}
if (ILM_NOTIFICATION_CONFIGURED & mask)
{
- HMI_DEBUG("surface %d available", id);
+ 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);
- /* qDebug("ILM_NOTIFICATION_CONFIGURED");
- qDebug(" surfaceProperties %d", surface);
- qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);
- qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);
-
- if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {
- addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);
- configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);
- } else {
- ilmErrorTypes result;
- t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);
-
- if (layer != 0) {
- configureAppSurface(surface,
- surfaceProperties->origSourceWidth,
- surfaceProperties->origSourceHeight);
-
- result = ilm_layerAddSurface(layer, surface);
- if (result != ILM_SUCCESS) {
- qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);
- }
- ilm_commitChanges();
- }
- }
- updateScreen(); */
}
}
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)
{
- //this->cb->layerVisibilityChanged(id, sprop->visibility);
+ HMI_DEBUG("layer %d turns visibility %d", id, lprop->visibility);
}
if (ILM_NOTIFICATION_OPACITY & mask)
{
- }
- if (ILM_NOTIFICATION_ORIENTATION & mask)
- {
+ HMI_DEBUG("layer %d turns opacity %f", id, lprop->opacity);
}
if (ILM_NOTIFICATION_SOURCE_RECT & mask)
{
- // this->cb->surfaceSourceRectChanged(id, )
+ HMI_DEBUG("layer %d source rect changes", id);
}
if (ILM_NOTIFICATION_DEST_RECT & mask)
{
- // this->cb->surfaceSourceRectChanged(id, )
- }
- if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)
- {
- }
- if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)
- {
- /* application being down */
- // m_appLayers.remove(pid);
- }
- if (ILM_NOTIFICATION_CONFIGURED & mask)
- {
- /* qDebug("ILM_NOTIFICATION_CONFIGURED");
- qDebug(" surfaceProperties %d", surface);
- qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);
- qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);
-
- if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {
- addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);
- configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);
- } else {
- ilmErrorTypes result;
- t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);
-
- if (layer != 0) {
- configureAppSurface(surface,
- surfaceProperties->origSourceWidth,
- surfaceProperties->origSourceHeight);
-
- result = ilm_layerAddSurface(layer, surface);
- if (result != ILM_SUCCESS) {
- qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);
- }
- ilm_commitChanges();
- }
- }
- updateScreen(); */
+ HMI_DEBUG("layer %d dest rect changes", id);
}
}
Code Review / apps / agl-service-windowmanager.git / blobdiff