From 13ef75141312d50c2d4caeffe4ba0e132752cf99 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 16 Jan 2019 20:29:54 -0500 Subject: cluster-windowmanager-conf: Update configuration Update the recipe and files to handle the rename of areas.db to areas.json and the significant rewrite of layers.json. Change-Id: I9af4e6bf29e8983568126c92b17645be4735dabe Signed-off-by: Scott Murray --- .../cluster-windowmanager-conf/areas.db | 40 ----------- .../cluster-windowmanager-conf/areas.json | 40 +++++++++++ .../cluster-windowmanager-conf/layers.json | 84 ++++++++++++---------- .../cluster-windowmanager-conf_1.0.bb | 4 +- 4 files changed, 87 insertions(+), 81 deletions(-) delete mode 100644 recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.db create mode 100644 recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json diff --git a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.db b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.db deleted file mode 100644 index 00322ac..0000000 --- a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.db +++ /dev/null @@ -1,40 +0,0 @@ -{ - "areas": [ - { - "name": "fullscreen", - "rect": { - "x": 0, - "y": 0, - "w": 1920, - "h": 1080 - } - }, - { - "name": "normal.full", - "rect": { - "x": 672, - "y": 264, - "w": 576, - "h": 552 - } - }, - { - "name": "restriction.normal", - "rect": { - "x": 672, - "y": 264, - "w": 576, - "h": 552 - } - }, - { - "name": "on_screen", - "rect": { - "x": 672, - "y": 264, - "w": 576, - "h": 552 - } - } - ] -} diff --git a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json new file mode 100644 index 0000000..00322ac --- /dev/null +++ b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/areas.json @@ -0,0 +1,40 @@ +{ + "areas": [ + { + "name": "fullscreen", + "rect": { + "x": 0, + "y": 0, + "w": 1920, + "h": 1080 + } + }, + { + "name": "normal.full", + "rect": { + "x": 672, + "y": 264, + "w": 576, + "h": 552 + } + }, + { + "name": "restriction.normal", + "rect": { + "x": 672, + "y": 264, + "w": 576, + "h": 552 + } + }, + { + "name": "on_screen", + "rect": { + "x": 672, + "y": 264, + "w": 576, + "h": 552 + } + } + ] +} diff --git a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json index 1fd9d18..5c6a5b3 100644 --- a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json +++ b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf/layers.json @@ -1,41 +1,47 @@ { - "comment": "Surface ID to Layer ID mapping", - - "main_surface": { - "surface_role": "HomeScreen", - "comment": "This surface should never be made invisible (The HomeScreen)" - }, - - "mappings": [ - { - "role": "BackGroundLayer", - "name": "BackGroundLayer", - "layer_id": 999, - "comment": "Single BackGround layer map for the map, radio, music and video" - }, - { - "role": "homescreen", - "name": "FarHomeScreen", - "layer_id": 1000, - "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen" - }, - { - "role": "receiver|fallback", - "name": "Apps", - "layer_id": 1001, - "comment": "Range of IDs that will always be placed on layer 1001" - }, - { - "role": "restriction", - "name": "Restriction", - "layer_id": 1002, - "comment": "This layer is for restriction notification. This is used by restriction role" - }, - { - "role": "^on_screen.*", - "name": "OnScreen", - "layer_id": 9999, - "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999" - } - ] + "description": "Layer mapping", + "mappings": [ + { + "name": "BackGroundLayer", + "role" : "receiver", + "id_range_begin": 0, + "id_range_end": 0, + "comment": "Work Around: This is a special fallback layer that not stopping wayland event loop." + }, + { + "name": "FarHomeScreen", + "role": "homescreen", + "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": "receiver|fallback", + "id_range_begin": 1000, + "id_range_end": 2999, + "comment": "Application layer" + }, + { + "name": "Popup", + "role": "popup*", + "id_range_begin": 4000, + "id_range_end": 4999, + "comment": "This layer is for popup application layer" + }, + { + "name": "Restriction", + "role": "restriction", + "id_range_begin": 5000, + "id_range_end": 5999, + "comment": "This layer is for restriction notification on driving. This is used by restriction role" + }, + { + "name": "OnScreen", + "role": "^on_screen.*", + "id_range_begin": 6000, + "id_range_end": 6999, + "comment": "System notification layer. For example, on_screen_low_battery_alert to notify user" + } + ] } diff --git a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb index 0cef85c..4be666b 100644 --- a/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb +++ b/recipes-demo-hmi/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://layers.json \ - file://areas.db \ + file://areas.json \ file://roles.db \ " @@ -12,7 +12,7 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/xdg/windowmanager install -m 0644 ${WORKDIR}/layers.json ${D}${sysconfdir}/xdg/windowmanager/layers.json - install -m 0644 ${WORKDIR}/areas.db ${D}${sysconfdir}/xdg/windowmanager/areas.db + install -m 0644 ${WORKDIR}/areas.json ${D}${sysconfdir}/xdg/windowmanager/areas.json install -m 0644 ${WORKDIR}/roles.db ${D}${sysconfdir}/xdg/windowmanager/roles.db } -- cgit 1.2.3-korg