#define LC_AREA_PATH "/etc/areas.db"
#define LC_LAYER_SETTING_PATH "/etc/layers_setting.json"
#define LC_DEFAULT_AREA "fullscreen"
+#define BACK_GROUND_LAYER "BackGroundLayer"
using std::string;
using std::vector;
ilm_layerSetVisibility(id, ILM_FALSE);
ilm_commitChanges();
auto wm_layer = getWMLayer(id);
- wm_layer->addLayer(id);
- this->commitChange();
+ wm_layer->addLayerToState(id);
+ this->renderLayers();
}
unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)
return this->wm_layers[uuid];
}
+std::shared_ptr<WMLayer> LayerControl::getWMLayer(std::string layer_name)
+{
+ for(auto &l : this->wm_layers)
+ {
+ if(l->layerName() == layer_name)
+ {
+ return l;
+ }
+ }
+ return nullptr;
+}
+
struct rect LayerControl::getAreaSize(const std::string& area)
{
return area2size[area];
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)
{
auto state = l->getLayerState();
+ HMI_DEBUG("layer %s", l->layerName().c_str());
for(const auto& id : state.getIviIdList())
{
+ HMI_DEBUG("Add %d", id);
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)
{
this->undoUpdate();
rc = WMError::FAIL;
}
+ else
+ {
+ for(auto& l : this->wm_layers)
+ {
+ l->update();
+ }
+ }
ilm_commitChanges();
delete id_array;
return rc;
}
-void LayerControl::undoUpdate() {}
+void LayerControl::undoUpdate()
+{
+ for(auto& l : this->wm_layers)
+ {
+ l->undo();
+ }
+}
WMError LayerControl::loadLayerSetting(const string &path)
{
WMError LayerControl::layoutChange(const WMAction& action)
{
- WMError ret = WMError::FAIL;
if (action.visible == TaskVisible::INVISIBLE)
{
// Visibility is not change -> no redraw is required
// 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);
- ilmErrorTypes err = ilm_layerSetDestinationRectangle(layer, 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_commitChanges();
for(auto &wm_layer: this->wm_layers)
{
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(); */
}
}
- if(err == ILM_SUCCESS)
- {
- ret = WMError::SUCCESS;
- }
- return ret;
+
+ return WMError::SUCCESS;
}
WMError LayerControl::visibilityChange(const WMAction& action)
return WMError::NOT_REGISTERED;
}
- if (action.visible != TaskVisible::INVISIBLE)
+ if (action.visible == TaskVisible::VISIBLE)
{
ret = this->makeVisible(action.client);
}
- else
+ else if (action.visible == TaskVisible::INVISIBLE)
{
ret = this->makeInvisible(action.client);
}
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)
}
else
{
- // this->cb->surfaceDestroyed(id);
+ this->cb.surfaceDestroyed(id);
}
}
if (ILM_LAYER == object)
// Don't check here the client is not nullptr
unsigned layer = client->layerID();
+ this->moveForeGround(client);
+
ilm_layerSetVisibility(layer, ILM_TRUE);
/* for(auto& wm_layer : this->wm_layers)
WMError ret = WMError::SUCCESS;
unsigned layer = client->layerID(); // Don't check here the client is not nullptr
- /* bool mv_ok = this->mvBackGround(client);
+ bool mv_ok = this->moveBackGround(client);
if(!mv_ok)
{
+ HMI_INFO("make invisible client %s", client->appID().c_str());
ilm_layerSetVisibility(layer, ILM_FALSE);
- } */
+ }
- ilm_layerSetDestinationRectangle(layer, 0, 0, 0, 0);
+ //ilm_layerSetDestinationRectangle(layer, 0, 0, 0, 0);
/* for(auto& wm_layer : this->wm_layers)
{
return ret;
}
-/* bool LayerControl::mvBackGround(const shared_ptr<WMClient> client)
+bool LayerControl::moveBackGround(const shared_ptr<WMClient> client)
{
bool ret = false;
// Move background from foreground layer
- auto bg = this->getWMLayer("BackGroundLayer");
+ auto bg = this->getWMLayer(BACK_GROUND_LAYER);
if(bg != nullptr)
{
+ HMI_DEBUG("client %s role %s", client->appID().c_str(), client->role().c_str());
unsigned layer = client->layerID();
if(bg->hasRole(client->role()))
{
+ HMI_INFO("%s go to background", client->appID().c_str());
+ bg->addLayerToState(layer);
+ auto wm_layer = this->getWMLayer(layer);
+ wm_layer->removeLayerFromState(layer);
+ /* TODO: manipulate state directly
LayerState bg_ls = bg->getLayerState();
bg_ls.addLayer(layer);
- auto wm_layer = this->getWMLayer(layer);
LayerState ls = wm_layer->getLayerState();
- ls.removeLayer(layer);
+ ls.removeLayer(layer); */
+ bg->dump();
+ wm_layer->dump();
+ ret = true;
}
- ret = true;
}
return ret;
}
-bool LayerControl::mvForeGround(const shared_ptr<WMClient> client)
+bool LayerControl::moveForeGround(const shared_ptr<WMClient> client)
{
bool ret = false;
// Move foreground from foreground layer
- auto bg = this->getWMLayer("BackGroundLayer");
+ auto bg = this->getWMLayer(BACK_GROUND_LAYER);
if(bg != nullptr)
{
- unsigned layer = client->layerID();
if(bg->hasRole(client->role()))
{
+ unsigned layer = client->layerID();
+ HMI_INFO("%s go to foreground", client->appID().c_str());
+ bg->removeLayerFromState(layer);
+ auto wm_layer = this->getWMLayer(layer);
+ wm_layer->addLayerToState(layer);
+ /* TODO: manipulate state directly
LayerState bg_ls = bg->getLayerState();
bg_ls.removeLayer(layer);
- auto wm_layer = this->getWMLayer(layer);
LayerState ls = wm_layer->getLayerState();
- ls.addLayer(layer);
+ ls.addLayer(layer); */
+ bg->dump();
+ wm_layer->dump();
+ ret = true;
}
- ret = true;
}
return ret;
}
-*/
-
} // namespace wm
\ No newline at end of file