summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-01-17Add configuration file over-ride mechanismhalibut_7.90.0halibut/7.90.0guppy_6.99.4guppy/6.99.47.90.06.99.4Scott Murray4-32/+49
Reusing the windowmanager on the cluster demo platform requires modifications to the layers.json, areas.json, etc. configuration files. To allow this without breaking potential shared package feeds by building two versions, add a mechanism to allow over-riding the configuration files present in the widget with files in the directory /etc/xdg/windowmanager. Affected code has been refactored to use a new common configuration file path determination helper function to reduce duplication. Cherry-picked from flounder branch with rework to accommodate changes in master branch. Bug-AGL: SPEC-1805 Change-Id: Ib0014756fe684167950ddac534ea2363a1b6e7c3 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-01-16Fix misinterpreted return valueJosé Bollo2-4/+4
Also fix typo in error messages Change-Id: Ib023a43cdbb6b6442872abecb347940c703c5fde Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2018-12-21Make it easier to see journal log for debugKazumasa Mitsunari1-1/+1
When we set USE_HMI_DEBUG=5 in environment variable, a lot of logs of policy manager displayed. This patch decrease log level of DUMP macro. If we don't need to get policy decision procedure logs or tracing on debug, set USE_HMI_DEBUG=4. Change-Id: Iaa2f2efc68adcece8c6aef44be6a683c7c2a0dee Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-12-20docs: add yaml bookguppy_6.99.3guppy/6.99.36.99.3Frederic Marec1-0/+13
Bug-AGL: SPEC-1988 Change-Id: I295dc08f6ba0a9a36b3d6fbcbe82365fd787a791 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
2018-12-03Emit events to application not subscriberKazumasa Mitsunari5-156/+195
This patch change Window Manager emits event to application such as syncDraw not to subscribers. Bug-AGL: SPEC-1999 Change-Id: Ie2699c1180b4f37f6333933db9f11eaa7ed8f683 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-12-03Fix app surface is set to position (0, 0)Kazumasa Mitsunari4-3/+31
Sometimes, ivi_wm_surface_size signal doesn't reach WM. In that time, surface is not placed in the set place. This patch fix the issue. Change-Id: Id7137557d5aaae373fedbb70379179ab50205c60 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-12-03Fix timing issue of surface creationKazumasa Mitsunari3-0/+9
Rarely Window Manager get the event of surface creation after activateWindow. In that case, Window Manager reject application request because client doesn't have surface. This patch makes WM does provisional registration. Change-Id: Ib0a54a7f399f333175e0a4613364f7bcb0de9cc7 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-11-30Merge "Migrates bindings v3"guppy_6.99.2guppy/6.99.26.99.2Jan-Simon Moeller9-49/+71
2018-11-30Merge "doc: fix invalid image reference"Stéphane Desneux1-2/+2
2018-11-30Migrates bindings v3Tadao Tanikawa9-49/+71
This patch migrates biding API of WM to v3. Change-Id: I2f2b23a8af437a414e2a00d629d3e72d0614eb72 Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
2018-11-29Remove unnecessary functionKazumasa Mitsunari1-2/+0
Forgot removing the function. The function was removed in the previous commit. Change-Id: Ieab08aa116b7b8109022ff6983582da6085039dd Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-11-28doc: fix invalid image referenceStéphane Desneux1-2/+2
This fixes an invalid reference to image software-stack.png in ApplicationGuide.md Change-Id: I3362a02c00dd4524b6567ebc95b48cdfc792289b Signed-off-by: Stéphane Desneux <stephane.desneux@iot.bzh>
2018-11-20Clean: Remove conversion table from old roleguppy_6.99.1guppy/6.99.16.99.1Kazumasa Mitsunari5-318/+28
Stop compatibility support. Remove conversion table from old role. Bug-AGL: SPEC-1947 Change-Id: Idbb0717920c2f4a0c29bfb4356e1b167ac8bce0b Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-11-15Rename the image file nameKazumasa Mitsunari1-0/+0
Since it is duplicated with the name of homescreen image file, the WM page doesn't display correctly. So rename the image file name. Change-Id: I6bb9fe0c779df0cc9027d44500329009404a76e9 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-11-15Fix the file namesKazumasa Mitsunari6-5/+5
Fix the file names. Change-Id: I6adaf5fb024347222b235830bf5ff04208adc0ed Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-11-13Attach application to ivi-layer not to surfaceKazumasa Mitsunari11-318/+584
Window Manager expresses the application in ivi-layer. So for, Window Manager tied the surface and role applied by the application. This patch associates the application with the ivi-layer, and the role and surface are the attributes that makes up the application. Bug-AGL: SPEC-1818, SPEC-1635 Change-Id: Ice1e398e1db037577b0721c16da6603ec5437561 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-26Fix internal function name for consistencyKazumasa Mitsunari3-8/+8
Fix internal function name for consistency Change-Id: Iff85e7ab246f863ff47d7312da627a2317479b56 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-24Fix the conversion tableKazumasa Mitsunari5-5/+5
Fix the conversion table (Navigation -> map) to (Navigation -> navigation) Use `navigation` as it is. Change-Id: Icfb0c7839cfa1c8ae59aa3b381c07d8a2f88cdd4 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-24Delete verbs no longer usedKazumasa Mitsunari1-117/+0
Delete the following verbs for debug. Use LayerManagerControl instead. * debug_status * debug_layers * debug_surfaces * list_drawing_names Change-Id: Ifa414b769796a9007e06b5d4cc17d50bd26c86dd Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-24Merge "Refactor : Hide wayland operations from Window Manager"José Bollo20-16112/+946
2018-10-24Merge "Improve ApplicationGuide"Jan-Simon Moeller9-521/+666
2018-10-24Refactor : Hide wayland operations from Window ManagerKazumasa Mitsunari20-16112/+946
Window Manager now uses abstract client, area for layer/surface management, then hide wayland operation into LayerControl class. LayerControl class uses ilmControl library instead of wayland protocol. This patch reduces the binary size of binding by 30% than before. Currently, the following debug methods are not available. * debug_status * debug_layers * debug_surfaces * list_drawing_names Bug-AGL: SPEC-1817 Change-Id: I7313787f3c4a286ceee3c23783e5c0e713388dac Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-18Improve ApplicationGuideKazumasa Mitsunari9-521/+666
Improve ApplicationGuide * Change chapter structure * Add pictures for sequences and diagrams * Update the description Bug-AGL: SPEC-1712 Change-Id: Ic014677682c2281305b6a4c10a4a80390279db88 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Fix memory leakKazumasa Mitsunari1-53/+72
According to afb_x2_req.h, returned value of afb_req_x2_get_application_id must be freed by the caller. So release it when the function returned not Null. Bug-AGL: SPEC-1819 Change-Id: I4f23eeff6262171ac55776b4e214960dbff7ff45 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Include WMClient into WMRequestKazumasa Mitsunari5-18/+28
Policy Manager has to know *who* requests *which role* with *which role*. So for improvement of usability of WMRequest instead of appid. Change-Id: I452b2995922e8e303732e8e79f4f06930553b3e7 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Omit std::Kazumasa Mitsunari1-37/+40
To shorten source code, omit std:: Change-Id: I251df7f503337c71800612718504bbd31dc27071 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Fix verbsKazumasa Mitsunari1-7/+7
afb-binding doesn't care the case of verb, but it is better to unify it with libwindowmanager. Change-Id: I775b26069cd49a72603715470ddc4cedcfd2f375 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Rename file namesKazumasa Mitsunari4-6/+6
Rename layers.* to wm_layers.* Change-Id: If472c2b8f978231816f5c21edb0c53a6ee96d629 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-15Migrate hmi-debug into utilKazumasa Mitsunari15-532/+368
Migrate hmi-debug into util for * simplicity * remove warnings error `-Wunused-function` Change-Id: I7d061849429e5d50cc7d19d2051c7f5d0f0ef169 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-11Merge "Drop 2017 suffix"Jan-Simon Moeller3-4/+4
2018-10-11Drop 2017 suffixKazumasa Mitsunari3-4/+4
Drop 2017 suffix. Change-Id: I64fafe814b7d61dca860b9fa92489acb76abc1dd Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-09Use feature 'required-binding'Jose Bollo1-1/+1
The feature "urn:AGL:widget:required-binding" is now preferred to the feature "urn:AGL:widget:required-api" for requiring a local binding. Bug-AGL: SPEC-1800 Change-Id: If24f239990536f90ccc46802fabb2c2de2e6c239 Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
2018-10-04Clean: Remove split_layout structureKazumasa Mitsunari2-46/+2
split_layout is not used anymore. Change-Id: Iff24ebb4e827aee28394deb3aa55c96692cd0cc6 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-04Add .gitignoreKazumasa Mitsunari1-0/+2
Change-Id: Id05d447d30988afaaa35265ab928ec5fb333117f Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-04Modify .gitreviewKazumasa Mitsunari1-1/+1
Change-Id: I5d36d56c7957e33ce1137165e6273ba2599d8006 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-08-31Fix Window Manager crush when application terminatedKazumasa Mitsunari2-13/+12
Fix Window Manager crush when applicaiton terminated caused by wrong handling of sd_event_source. v2. Add error check just in case Bug-AGL: SPEC-1696 Change-Id: I639a60015cde46fca6bc5a3f6e8037afd8d79330 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-08-15Readd policy table generated by ZIPC for EXAMPLEYuta Doi38-1/+5787
This patch reverts commit e4222ca8da3b02afca5625fa2cef6832aa8ce90e and update it. To Policy Manager, add the source code of policy table which is generated by ZIPC for EXAMPLE. If use this example, please comment out line 22 and uncomment line 23 in policy_manager/CMakeLists.txt as follows: #set(STM_DIR stub) set(STM_DIR zipc) If try to show split layout, please set bool value "ON" to TRY_SPLIT_LAYOUT at line 28 in policy_manager/CMakeLists.txt as follows: set(TRY_SPLIT_LAYOUT OFF CACHE BOOL "Enable to show split layout") The generated source codes by ZIPC are "Common" and "StateTransitionor" in policy_manager/stm/zipc/. Bug-AGL: SPEC-1537 Change-Id: I1f91cf728eab79c229c5b4b12b9e1bdd338f64aa Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
2018-08-15Readd Policy Manager as pluginYuta Doi20-466/+2846
This patch reverts commit c6f9a9b8468b3746a3dec7ee2a0b7d84ec9fb44a and update it. Policy Manager decides next layout by inputed event and current state based on the policy table. And Policy Manager is plugin for Window Manager. Therefore the OEMs can replace it. This patch provides Policy Manager I/F as reference implementation and does not have policy table. Therefore Policy Manager updates each layers to draw the applications in requested area in accordance with just like activate/deactivate request. [APIs of Policy Manager class] - int initialize(void) Initialize Policy Manger. in: none out: 0(success), -1(error) - void registerCallback(CallbackTable callback_table) Register callback functions. in: the pointers of callback handlers out: none "CallbackTable" type is as follows: typedef struct { Handler onStateTransitioned; Handler onError; } CallbackTable; "Handler" type is as follows: using Handler = std::function<void(json_object *)>; - int setInputEventData(json_object *json_in) Set input event data for the policy table. in: input event data as json_object out: 0(success), -1(error) - int executeStateTransition(void) Execute state transition by using set input event data. in: none out: 0(success), -1(error) - void undoState(void) Undo state only once per once state transition. in: none out: none [Callbacks of Policy Manager class] - void onStateTransitioned(json_object *json_out) When state transition succeeds, this callback is called. The argument json_out has the state after transition. - void onError(json_object *json_out) When state transition fails, this callback is called. The argument json_out has the error information like message, inputed event datas and etc.. Bug-AGL: SPEC-1537 Change-Id: Ib8c71f2e544cb90b6763d07fad56dc1c453e9a97 Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
2018-08-09Fix multiple erase of surface informationYuta Doi1-2/+0
When application is killed and the surface is destroyed, the surface informations is erased twice. Therefore remove the one eracing process. Change-Id: I707febf5b5003058bcf847f635c16fb0d68e01d0 Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
2018-08-03Fix mistakeKazumasa Mitsunari2-2/+2
Currently, the code is not usable currently. Change-Id: I2de1c0f04df411f085faacc1ab71203ba9b5e0b1 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-08-02Merge changes from topic '15921'Jan-Simon Moeller4-9/+16
* changes: Fix WM attach layers to different screen. Fix source rectangle changes every state change
2018-08-02Fix WM attach layers to different screen.Kazumasa Mitsunari1-3/+3
If setting 2 display from 1 Soc, Window Manager attaches layers to different screen since corresponding to upgrade of wayland-ivi-extension. Fix the issue. Bug-AGL: SPEC-1577 Change-Id: Ib6eb4a19dc892348271762f236cc0650a83a8f70 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-08-02Improve output of multiple screen resolutionTadao Tanikawa7-9/+141
To improve output on various monitor with various resolution, the following items are introduced. * Abandon scaling by Weston/IVI-SHELL This is cause of huge memory consumption on AGL CES2018 Demo because all contents are designed and rendered with FullHD resolution. * Add parameter of 'scale' to WM API (getDisplayInfo) WM calculate scale factor from screen resolution from wayland compositor and parameter of layout from WM's configuration, area.db. Bug-AGL: SPEC-1568, SPEC-1569, SPEC-1611 Change-Id: I5eac2da0106228c296550135c5200b2653864fdf Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
2018-08-02Revert "Enable scaling to fit various screen resolutions"Tadao Tanikawa10-220/+22
Abandon scaling support by AGL window manager 2017 Bug-AGL: SPEC-1611 This reverts commit 8ab10aaafc6fb3dc7bbad755dce9b4bdaa41f287. Change-Id: Id6afb263a6dc30929b922e469d906e2e5190f7b0
2018-08-02Fix source rectangle changes every state changeKazumasa Mitsunari4-6/+13
Window Manager changes source rectangle size every state change. This patch changes it to set source rectangle first when the surface is created. Related commit: https://gerrit.automotivelinux.org/gerrit/#/c/15595/ Bug-AGL: SPEC-1584 Change-Id: Ia7429956053cfa18e6e82060f84f3b6fe755c0b1 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-07-27Fix crashed application can re-launchKazumasa Mitsunari5-112/+98
WM can't reset the state when application crashes, after the below commit. This patch fix the crashed application can re-launch. Related commit: https://gerrit.automotivelinux.org/gerrit/#/c/14871/ Bug-AGL: SPEC-1471 Change-Id: I46019b30cc8e9a341b4b681a0288f053b3ac1b30 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-07-26Fix memory release problemKazumasa Mitsunari1-1/+0
Do not release json_object after event push. The json_array which was freed is retained to the json-object that is released in afb_event_push. Related page: https://json-c.github.io/json-c/json-c-0.10/doc/html/json__object_8h.html#a04448b1c63173e1bfe49965835732075 Bug-AGL: SPEC-1616 Change-Id: Ic6de6425d7a18b289eb3e9d37d297dcfb3383f21 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-07-24Fix the race condition of HomeScreenKazumasa Mitsunari1-1/+9
HomeScreen and launcher have race condition. This patch fixes if the homescreen requests to be shown, WM doesn't change launcher(and others) invisible. This is quick hack. System UI's role is homescreen now. We can't change system UI from setting and so on currently. Bug-AGL: SPEC-1407 Change-Id: Ie70e0fd635fae03de7b731f3d73fb1863e3c6ad4 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-07-24Remove useless functionsKazumasa Mitsunari2-23/+0
These functions are not used anymore because of upgrade of wayland-ivi-extension * layer_configuration * layer_orientation * layer_screen Change-Id: I794fa13a3203b929c8fc49d6fb96b14004aa0fcc Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-07-24Fix XDG application shrinksKazumasa Mitsunari2-12/+7
WM set surface source size output_size(1080X1920) in case of using runXDG. Then, XDG surface shrinks because dest size(1080X1488) is set and the surface is scaled. On the other hand, XDG application's source size is w = 0, h = 0 on startup from ivi-wm, so WM has to set source size in somewhere. So this patch fixes WM set XDG surface source size. This is short term solution because WM set source rectangle size every state changes. Bug-AGL: SPEC-1584 Change-Id: I128db0b7feaba6b51e13c467e91d5aff6adaf0a7 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>