aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-08-08 16:15:46 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-08-08 18:32:00 +0900
commit25e4aae46a08a2a58a8d05702e11451fec235f7d (patch)
treef318993a1a7ca025d65cc1044ab1b764b9fd31ef
parentd91dac86a4037365a4bfbd209e4e7bf2abed08b5 (diff)
Proposal: New layer settings
Change-Id: I860f8dea4eee340fd8ab3dba3bbaee1661c584bf Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--layers_setting.json61
-rw-r--r--src/wm_client.cpp5
-rw-r--r--src/wm_client.hpp2
3 files changed, 68 insertions, 0 deletions
diff --git a/layers_setting.json b/layers_setting.json
new file mode 100644
index 0000000..ed43288
--- /dev/null
+++ b/layers_setting.json
@@ -0,0 +1,61 @@
+{
+ "description": "Layer mapping",
+ "mappings": [
+ {
+ "name": "EvacuationLayer",
+ "role" : "",
+ "type" : "stack",
+ "id_range_begin": 0,
+ "id_range_end": 0,
+ "comment": "Work Around: This is evacuation layer that not stopping event loop"
+ },
+ {
+ "name": "FarHomeScreen",
+ "role": "homescreen",
+ "type": "stack",
+ "id_range_begin": 100,
+ "id_range_end": 199,
+ "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
+ },
+ {
+ "name": "Apps",
+ "role": "music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback",
+ "type": "tile",
+ "id_range_begin": 1000,
+ "id_range_end": 2999,
+ "comment": "Range of IDs that will always be placed on layer 1001"
+ },
+ {
+ "name": "NearHomeScreen",
+ "role": "software_keyboard",
+ "type": "tile",
+ "id_range_begin": 3000,
+ "id_range_end": 3000,
+ "comment": "TOYOTA special software keyboard"
+ },
+ {
+ "name": "Application Popup Layer",
+ "role": "popup*",
+ "type": "stack",
+ "id_range_begin": 4000,
+ "id_range_end": 4999,
+ "comment": "[T.B.D]This layer is for application popup layer"
+ },
+ {
+ "name": "Restriction",
+ "role": "restriction",
+ "type": "stack",
+ "id_range_begin": 5000,
+ "id_range_end": 5999,
+ "comment": "This layer is for restriction notification. This is used by restriction role"
+ },
+ {
+ "name": "OnScreen",
+ "role": "^on_screen.*",
+ "type": "stack",
+ "id_range_begin": 6000,
+ "id_range_end": 6999,
+ "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999"
+ }
+ ]
+} \ No newline at end of file
diff --git a/src/wm_client.cpp b/src/wm_client.cpp
index d4303fd..9ce39e0 100644
--- a/src/wm_client.cpp
+++ b/src/wm_client.cpp
@@ -101,6 +101,11 @@ unsigned WMClient::surfaceID() const
return this->surface;
}
+const string& WMClient::getWMLayerName()
+{
+ return this->wm_layer_name;
+}
+
void WMClient::setRole(const string& role)
{
this->role_list.push_back(role);
diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index 0173bb9..231656b 100644
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -46,6 +46,7 @@ class WMClient
std::string appID() const;
unsigned layerID() const;
+ const std::string& getWMLayerName();
unsigned surfaceID() const;
std::vector<unsigned> renderOrder() const;
const std::vector<std::string> &roles() const;
@@ -71,6 +72,7 @@ class WMClient
private:
std::string id;
unsigned layer;
+ std::string wm_layer_name;
std::string area;
unsigned surface; // currently, main application has only one surface.
std::vector<std::string> role_list;