Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add terminate process for layer_control
[apps/agl-service-windowmanager.git]
/
src
/
wm_layer_control.cpp
diff --git
a/src/wm_layer_control.cpp
b/src/wm_layer_control.cpp
index
13072a4
..
30c37f9
100644
(file)
--- a/
src/wm_layer_control.cpp
+++ b/
src/wm_layer_control.cpp
@@
-24,6
+24,7
@@
#define LC_AREA_PATH "/etc/areas.db"
#define LC_LAYER_SETTING_PATH "/etc/layers_setting.json"
#define LC_DEFAULT_AREA "fullscreen"
#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;
using std::string;
using std::vector;
@@
-128,8
+129,8
@@
void LayerControl::createNewLayer(unsigned id)
ilm_layerSetVisibility(id, ILM_FALSE);
ilm_commitChanges();
auto wm_layer = getWMLayer(id);
ilm_layerSetVisibility(id, ILM_FALSE);
ilm_commitChanges();
auto wm_layer = getWMLayer(id);
- wm_layer->addLayer(id);
- this->
commitChange
();
+ wm_layer->addLayer
ToState
(id);
+ this->
renderLayers
();
}
unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)
}
unsigned LayerControl::getNewLayerID(const string& role, string* layer_name)
@@
-155,6
+156,18
@@
shared_ptr<WMLayer> LayerControl::getWMLayer(unsigned layer)
return this->wm_layers[uuid];
}
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];
struct rect LayerControl::getAreaSize(const std::string& area)
{
return area2size[area];
@@
-196,19
+209,25
@@
WMError LayerControl::updateLayer(LayerState& layer_state)
return WMError::SUCCESS;
}
return WMError::SUCCESS;
}
-WMError LayerControl::
commitChange
()
+WMError LayerControl::
renderLayers
()
{
HMI_INFO("Commit change");
WMError rc = WMError::SUCCESS;
{
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();
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())
{
for(const auto& id : state.getIviIdList())
{
+ HMI_DEBUG("Add %d", id);
ivi_l_ids.push_back(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)
{
t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()];
if(id_array == nullptr)
{
@@
-220,22
+239,35
@@
WMError LayerControl::commitChange()
for(const auto& i : ivi_l_ids)
{
id_array[count] = i;
for(const auto& i : ivi_l_ids)
{
id_array[count] = i;
- HMI_DEBUG("check render order %d", i);
++count;
}
++count;
}
+ // Display
ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size());
if(ret != ILM_SUCCESS)
{
this->undoUpdate();
rc = WMError::FAIL;
}
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;
}
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::loadLayerSetting(const string &path)
{
@@
-365,8
+397,11
@@
WMError LayerControl::layoutChange(const WMAction& action)
{
if(wm_layer->hasLayerID(layer))
{
{
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);
LayerState ls = wm_layer->getLayerState();
ls.setArea(action.client->appID(), action.area);
+ wm_layer->dump(); */
}
}
}
}
@@
-393,6
+428,14
@@
WMError LayerControl::visibilityChange(const WMAction& action)
return ret;
}
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)
void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created)
{
if (ILM_SURFACE == object)
@@
-559,6
+602,8
@@
WMError LayerControl::makeVisible(const shared_ptr<WMClient> client)
// Don't check here the client is not nullptr
unsigned layer = client->layerID();
// 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)
ilm_layerSetVisibility(layer, ILM_TRUE);
/* for(auto& wm_layer : this->wm_layers)
@@
-592,14
+637,15
@@
WMError LayerControl::makeInvisible(const shared_ptr<WMClient> client)
WMError ret = WMError::SUCCESS;
unsigned layer = client->layerID(); // Don't check here the client is not nullptr
WMError ret = WMError::SUCCESS;
unsigned layer = client->layerID(); // Don't check here the client is not nullptr
-
/* bool mv_ok = this->mv
BackGround(client);
+
bool mv_ok = this->move
BackGround(client);
if(!mv_ok)
{
if(!mv_ok)
{
+ HMI_INFO("make invisible client %s", client->appID().c_str());
ilm_layerSetVisibility(layer, ILM_FALSE);
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)
{
/* for(auto& wm_layer : this->wm_layers)
{
@@
-615,50
+661,61
@@
WMError LayerControl::makeInvisible(const shared_ptr<WMClient> client)
return ret;
}
return ret;
}
-
/* bool LayerControl::mv
BackGround(const shared_ptr<WMClient> client)
+
bool LayerControl::move
BackGround(const shared_ptr<WMClient> client)
{
bool ret = false;
// Move background from foreground layer
{
bool ret = false;
// Move background from foreground layer
- auto bg = this->getWMLayer(
"BackGroundLayer"
);
+ auto bg = this->getWMLayer(
BACK_GROUND_LAYER
);
if(bg != nullptr)
{
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()))
{
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);
LayerState bg_ls = bg->getLayerState();
bg_ls.addLayer(layer);
- auto wm_layer = this->getWMLayer(layer);
LayerState ls = wm_layer->getLayerState();
LayerState ls = wm_layer->getLayerState();
- ls.removeLayer(layer);
+ ls.removeLayer(layer); */
+ bg->dump();
+ wm_layer->dump();
+ ret = true;
}
}
- ret = true;
}
return ret;
}
}
return ret;
}
-bool LayerControl::m
v
ForeGround(const shared_ptr<WMClient> client)
+bool LayerControl::m
ove
ForeGround(const shared_ptr<WMClient> client)
{
bool ret = false;
// Move foreground from foreground layer
{
bool ret = false;
// Move foreground from foreground layer
- auto bg = this->getWMLayer(
"BackGroundLayer"
);
+ auto bg = this->getWMLayer(
BACK_GROUND_LAYER
);
if(bg != nullptr)
{
if(bg != nullptr)
{
- unsigned layer = client->layerID();
if(bg->hasRole(client->role()))
{
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);
LayerState bg_ls = bg->getLayerState();
bg_ls.removeLayer(layer);
- auto wm_layer = this->getWMLayer(layer);
LayerState ls = wm_layer->getLayerState();
LayerState ls = wm_layer->getLayerState();
- ls.addLayer(layer);
+ ls.addLayer(layer); */
+ bg->dump();
+ wm_layer->dump();
+ ret = true;
}
}
- ret = true;
}
return ret;
}
}
return ret;
}
-*/
-
} // namespace wm
\ No newline at end of file
} // namespace wm
\ No newline at end of file