summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2017-10-23 13:17:55 +0900
committerZheng Wenlong <wenlong_zheng@nexty-ele.com>2017-10-30 04:15:35 +0000
commit26ec25e2f9271396328c208ae1a256fdf1a92c91 (patch)
tree082c9a6b098e6c573a2305419864858eaa0f407a
parentf04b274db13ba34c651fd15b28bca5468314f4a7 (diff)
Move sample to libhomescreen
The sample folder is using libhomescren with agl-service-homescreen-2017, So better move to libhomescreen. BUG-AGL: SPEC-988 Change-Id: I165bd3baa67ae2909f5ac699faf4f1f620f78747 Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat
-rw-r--r--sample/simple-egl/CMakeLists.txt69
-rw-r--r--sample/simple-egl/README.md24
-rw-r--r--sample/simple-egl/include/ivi-application-client-protocol.h245
-rw-r--r--sample/simple-egl/include/platform.h115
-rw-r--r--sample/simple-egl/package/hvac/config.xml16
-rw-r--r--sample/simple-egl/package/hvac/icon.svg279
-rw-r--r--sample/simple-egl/package/navi/config.xml16
-rw-r--r--sample/simple-egl/package/navi/icon.svg279
-rw-r--r--sample/simple-egl/package/root/config.xml16
-rw-r--r--sample/simple-egl/package/root/icon.svg279
-rw-r--r--sample/simple-egl/src/simple-egl.cpp744
-rw-r--r--sample/template/README28
-rw-r--r--sample/template/main.cpp207
-rw-r--r--sample/template/smhandler.cpp157
-rw-r--r--sample/template/smhandler.h58
-rw-r--r--sample/template/wmhandler.cpp36
-rw-r--r--sample/template/wmhandler.h47
17 files changed, 0 insertions, 2615 deletions
diff --git a/sample/simple-egl/CMakeLists.txt b/sample/simple-egl/CMakeLists.txt
deleted file mode 100644
index b0d72f2..0000000
--- a/sample/simple-egl/CMakeLists.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2017 TOYOTA MOTOR CORPORATION
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-project(simple-egl C CXX)
-
-cmake_minimum_required(VERSION 3.0)
-
-set(PROJECT_NAME "simple-egl")
-set(PROJECT_VERSION "1.0")
-set(PROJECT_PRETTY_NAME "SE")
-set(PROJECT_DESCRIPTION "Sample application for homescreen and windowmanager")
-set(PROJECT_URL "")
-set(CMAKE_CXX_FLAGS "-Wall -fpermissive")
-
-#source directory
-aux_source_directory(src DIR_SRCS)
-
-#head file path
-include_directories(include)
-
-#set extern libraries
-SET(LIBRARIES
- libwindowmanager.so
- libEGL.so
- libGLESv2.so
- libm.so
- libwayland-egl.so
- libwayland-client.so
- libjson-c.so
- libhomescreen.so
- librt.so
- libpthread.so
-)
-
-#add executable file
-add_executable(simple-egl ${DIR_SRCS})
-
-#add link library
-TARGET_LINK_LIBRARIES(simple-egl ${LIBRARIES})
-
-add_custom_command(TARGET simple-egl POST_BUILD
- COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR}
- COMMAND cp -rf ${PROJECT_BINARY_DIR}/simple-egl ${PROJECT_BINARY_DIR}/package/root/bin)
-
-add_custom_target(widget DEPENDS ${PROJECT_BINARY_DIR}/package/root
- COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}.wgt ${PROJECT_BINARY_DIR}/package/root)
-
-add_custom_target(hvac DEPENDS ${PROJECT_BINARY_DIR}/package/root
- COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/hvac/bin
- COMMAND cp -rf ${PROJECT_BINARY_DIR}/simple-egl ${PROJECT_BINARY_DIR}/package/hvac/bin/hvac
- COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/hvac.wgt ${PROJECT_BINARY_DIR}/package/hvac)
-
-add_custom_target(navi DEPENDS ${PROJECT_BINARY_DIR}/package/root
- COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/navi/bin
- COMMAND cp -rf ${PROJECT_BINARY_DIR}/simple-egl ${PROJECT_BINARY_DIR}/package/navi/bin/navi
- COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/navi.wgt ${PROJECT_BINARY_DIR}/package/navi)
diff --git a/sample/simple-egl/README.md b/sample/simple-egl/README.md
deleted file mode 100644
index 126f00c..0000000
--- a/sample/simple-egl/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Information
-====
-<br>This is a sample application for homescreen-2017 and windowmanager-2017.
-
-How to compile and install
-====
-<br>$ mkdir build
-<br>$ cd build
-<br>$ cmake ..
-<br>$ make
-<br>$ make widget
-
-<br>Copy package/simple-egl.wgt to rootfs.
-
-How to use
-====
-<br>afm-util install simple-egl.wgt
-<br>afm-util start simple-egl@0.1
-
-Depends
-====
-<br>homescreen-2017
-<br>agl-service-homescreen-2017
-<br>agl-service-windowmanger-2017
diff --git a/sample/simple-egl/include/ivi-application-client-protocol.h b/sample/simple-egl/include/ivi-application-client-protocol.h
deleted file mode 100644
index ca31bf7..0000000
--- a/sample/simple-egl/include/ivi-application-client-protocol.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* Generated by wayland-scanner 1.11.0 */
-
-#ifndef IVI_APPLICATION_CLIENT_PROTOCOL_H
-#define IVI_APPLICATION_CLIENT_PROTOCOL_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-
-/**
- * @page page_ivi_application The ivi_application protocol
- * @section page_ifaces_ivi_application Interfaces
- * - @subpage page_iface_ivi_surface - application interface to surface in ivi compositor
- * - @subpage page_iface_ivi_application - create ivi-style surfaces
- * @section page_copyright_ivi_application Copyright
- * <pre>
- *
- * Copyright (C) 2013 DENSO CORPORATION
- * Copyright (c) 2013 BMW Car IT GmbH
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * </pre>
- */
-struct ivi_application;
-struct ivi_surface;
-struct wl_surface;
-
-/**
- * @page page_iface_ivi_surface ivi_surface
- * @section page_iface_ivi_surface_desc Description
- * @section page_iface_ivi_surface_api API
- * See @ref iface_ivi_surface.
- */
-/**
- * @defgroup iface_ivi_surface The ivi_surface interface
- */
-extern const struct wl_interface ivi_surface_interface;
-/**
- * @page page_iface_ivi_application ivi_application
- * @section page_iface_ivi_application_desc Description
- *
- * This interface is exposed as a global singleton.
- * This interface is implemented by servers that provide IVI-style user interfaces.
- * It allows clients to associate a ivi_surface with wl_surface.
- * @section page_iface_ivi_application_api API
- * See @ref iface_ivi_application.
- */
-/**
- * @defgroup iface_ivi_application The ivi_application interface
- *
- * This interface is exposed as a global singleton.
- * This interface is implemented by servers that provide IVI-style user interfaces.
- * It allows clients to associate a ivi_surface with wl_surface.
- */
-extern const struct wl_interface ivi_application_interface;
-
-/**
- * @ingroup iface_ivi_surface
- * @struct ivi_surface_listener
- */
-struct ivi_surface_listener {
- /**
- * suggest resize
- *
- * The configure event asks the client to resize its surface.
- *
- * The size is a hint, in the sense that the client is free to
- * ignore it if it doesn't resize, pick a smaller size (to satisfy
- * aspect ratio or resize in steps of NxM pixels).
- *
- * The client is free to dismiss all but the last configure event
- * it received.
- *
- * The width and height arguments specify the size of the window in
- * surface-local coordinates.
- */
- void (*configure)(void *data,
- struct ivi_surface *ivi_surface,
- int32_t width,
- int32_t height);
-};
-
-/**
- * @ingroup ivi_surface_iface
- */
-static inline int
-ivi_surface_add_listener(struct ivi_surface *ivi_surface,
- const struct ivi_surface_listener *listener, void *data)
-{
- return wl_proxy_add_listener((struct wl_proxy *) ivi_surface,
- (void (**)(void)) listener, data);
-}
-
-#define IVI_SURFACE_DESTROY 0
-
-/**
- * @ingroup iface_ivi_surface
- */
-#define IVI_SURFACE_DESTROY_SINCE_VERSION 1
-
-/** @ingroup iface_ivi_surface */
-static inline void
-ivi_surface_set_user_data(struct ivi_surface *ivi_surface, void *user_data)
-{
- wl_proxy_set_user_data((struct wl_proxy *) ivi_surface, user_data);
-}
-
-/** @ingroup iface_ivi_surface */
-static inline void *
-ivi_surface_get_user_data(struct ivi_surface *ivi_surface)
-{
- return wl_proxy_get_user_data((struct wl_proxy *) ivi_surface);
-}
-
-static inline uint32_t
-ivi_surface_get_version(struct ivi_surface *ivi_surface)
-{
- return wl_proxy_get_version((struct wl_proxy *) ivi_surface);
-}
-
-/**
- * @ingroup iface_ivi_surface
- *
- * This removes link from ivi_id to wl_surface and destroys ivi_surface.
- * The ID, ivi_id, is free and can be used for surface_create again.
- */
-static inline void
-ivi_surface_destroy(struct ivi_surface *ivi_surface)
-{
- wl_proxy_marshal((struct wl_proxy *) ivi_surface,
- IVI_SURFACE_DESTROY);
-
- wl_proxy_destroy((struct wl_proxy *) ivi_surface);
-}
-
-#ifndef IVI_APPLICATION_ERROR_ENUM
-#define IVI_APPLICATION_ERROR_ENUM
-enum ivi_application_error {
- /**
- * given wl_surface has another role
- */
- IVI_APPLICATION_ERROR_ROLE = 0,
- /**
- * given ivi_id is assigned to another wl_surface
- */
- IVI_APPLICATION_ERROR_IVI_ID = 1,
-};
-#endif /* IVI_APPLICATION_ERROR_ENUM */
-
-#define IVI_APPLICATION_SURFACE_CREATE 0
-
-/**
- * @ingroup iface_ivi_application
- */
-#define IVI_APPLICATION_SURFACE_CREATE_SINCE_VERSION 1
-
-/** @ingroup iface_ivi_application */
-static inline void
-ivi_application_set_user_data(struct ivi_application *ivi_application, void *user_data)
-{
- wl_proxy_set_user_data((struct wl_proxy *) ivi_application, user_data);
-}
-
-/** @ingroup iface_ivi_application */
-static inline void *
-ivi_application_get_user_data(struct ivi_application *ivi_application)
-{
- return wl_proxy_get_user_data((struct wl_proxy *) ivi_application);
-}
-
-static inline uint32_t
-ivi_application_get_version(struct ivi_application *ivi_application)
-{
- return wl_proxy_get_version((struct wl_proxy *) ivi_application);
-}
-
-/** @ingroup iface_ivi_application */
-static inline void
-ivi_application_destroy(struct ivi_application *ivi_application)
-{
- wl_proxy_destroy((struct wl_proxy *) ivi_application);
-}
-
-/**
- * @ingroup iface_ivi_application
- *
- * This request gives the wl_surface the role of an IVI Surface. Creating more than
- * one ivi_surface for a wl_surface is not allowed. Note, that this still allows the
- * following example:
- *
- * 1. create a wl_surface
- * 2. create ivi_surface for the wl_surface
- * 3. destroy the ivi_surface
- * 4. create ivi_surface for the wl_surface (with the same or another ivi_id as before)
- *
- * surface_create will create a interface:ivi_surface with numeric ID; ivi_id in
- * ivi compositor. These ivi_ids are defined as unique in the system to identify
- * it inside of ivi compositor. The ivi compositor implements business logic how to
- * set properties of the surface with ivi_id according to status of the system.
- * E.g. a unique ID for Car Navigation application is used for implementing special
- * logic of the application about where it shall be located.
- * The server regards following cases as protocol errors and disconnects the client.
- * - wl_surface already has an nother role.
- * - ivi_id is already assigned to an another wl_surface.
- *
- * If client destroys ivi_surface or wl_surface which is assigne to the ivi_surface,
- * ivi_id which is assigned to the ivi_surface is free for reuse.
- */
-static inline struct ivi_surface *
-ivi_application_surface_create(struct ivi_application *ivi_application, uint32_t ivi_id, struct wl_surface *surface)
-{
- struct wl_proxy *id;
-
- id = wl_proxy_marshal_constructor((struct wl_proxy *) ivi_application,
- IVI_APPLICATION_SURFACE_CREATE, &ivi_surface_interface, ivi_id, surface, NULL);
-
- return (struct ivi_surface *) id;
-}
-
-//#ifdef __cplusplus
-//}
-//#endif
-
-#endif
diff --git a/sample/simple-egl/include/platform.h b/sample/simple-egl/include/platform.h
deleted file mode 100644
index 8fd57b0..0000000
--- a/sample/simple-egl/include/platform.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright © 2015 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef WESTON_PLATFORM_H
-#define WESTON_PLATFORM_H
-
-#include <string.h>
-
-#include <wayland-egl.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#ifndef EGL_PLATFORM_WAYLAND_KHR
-#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifndef EGL_EXT_platform_base
-typedef EGLDisplay (*PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform,
- void *native_display,
- const EGLint *attrib_list);
-typedef EGLSurface (*PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy,
- EGLConfig config,
- void *native_window,
- const EGLint *attrib_list);
-#endif
-
-static inline void *
-weston_platform_get_egl_proc_address(const char *address)
-{
- const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
-
- if (extensions
- && (strstr(extensions, "EGL_EXT_platform_wayland")
- || strstr(extensions, "EGL_KHR_platform_wayland"))) {
- return (void *) eglGetProcAddress(address);
- }
-
- return NULL;
-}
-
-static inline EGLDisplay
-weston_platform_get_egl_display(EGLenum platform, void *native_display,
- const EGLint *attrib_list)
-{
- static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = NULL;
-
- if (!get_platform_display) {
- get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
- weston_platform_get_egl_proc_address(
- "eglGetPlatformDisplayEXT");
- }
-
- if (get_platform_display)
- return get_platform_display(platform,
- native_display, attrib_list);
-
- return eglGetDisplay((EGLNativeDisplayType) native_display);
-}
-
-static inline EGLSurface
-weston_platform_create_egl_surface(EGLDisplay dpy, EGLConfig config,
- void *native_window,
- const EGLint *attrib_list)
-{
- static PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
- create_platform_window = NULL;
-
- if (!create_platform_window) {
- create_platform_window = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)
- weston_platform_get_egl_proc_address(
- "eglCreatePlatformWindowSurfaceEXT");
- }
-
- if (create_platform_window)
- return create_platform_window(dpy, config,
- native_window,
- attrib_list);
-
- return eglCreateWindowSurface(dpy, config,
- (EGLNativeWindowType) native_window,
- attrib_list);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WESTON_PLATFORM_H */
diff --git a/sample/simple-egl/package/hvac/config.xml b/sample/simple-egl/package/hvac/config.xml
deleted file mode 100644
index 9af2114..0000000
--- a/sample/simple-egl/package/hvac/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="hvac" version="0.1">
- <name>HVAC</name>
- <icon src="icon.svg"/>
- <content src="bin/hvac" type="application/vnd.agl.native"/>
- <description>This is a demo application for simple-egl</description>
- <author>TOYOA</author>
- <license>APL 2.0</license>
- <feature name="urn:AGL:widget:required-api">
- <param name="homescreen" value="ws" />
- <param name="windowmanager" value="ws" />
- </feature>
- <feature name="urn:AGL:widget:required-permission">
- <param name="urn:AGL:permission::public:no-htdocs" value="required" />
- </feature>
-</widget>
diff --git a/sample/simple-egl/package/hvac/icon.svg b/sample/simple-egl/package/hvac/icon.svg
deleted file mode 100644
index 91661a7..0000000
--- a/sample/simple-egl/package/hvac/icon.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
-<svg
- xmlns:i="&amp;ns_ai;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- x="0px"
- y="0px"
- viewBox="0 0 320 320"
- style="enable-background:new 0 0 320 320;"
- xml:space="preserve"
- id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="icon.svg"><metadata
- id="metadata1292"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1290" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2560"
- inkscape:window-height="1464"
- id="namedview1288"
- showgrid="false"
- inkscape:zoom="0.7375"
- inkscape:cx="-572.20339"
- inkscape:cy="160"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" /><style
- type="text/css"
- id="style4">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{opacity:0.4;fill:url(#SVGID_1_);}
- .st3{fill:url(#SVGID_2_);}
- .st4{fill:#FFFFFF;}
- .st5{font-family:'Roboto-Regular';}
- .st6{font-size:25px;}
- .st7{letter-spacing:6;}
- .st8{fill:url(#SVGID_3_);}
- .st9{fill:url(#SVGID_4_);}
- .st10{fill:url(#SVGID_5_);}
- .st11{fill:url(#SVGID_6_);}
- .st12{fill:url(#SVGID_7_);}
- .st13{fill:url(#SVGID_8_);}
- .st14{fill:url(#SVGID_9_);}
- .st15{fill:url(#SVGID_10_);}
- .st16{fill:url(#SVGID_11_);}
- .st17{fill:url(#SVGID_12_);}
- .st18{fill:url(#SVGID_13_);}
- .st19{fill:url(#SVGID_14_);}
- .st20{fill:url(#SVGID_15_);}
- .st21{fill:url(#SVGID_16_);}
- .st22{fill:url(#SVGID_17_);}
- .st23{fill:url(#SVGID_18_);}
- .st24{opacity:0.29;}
- .st25{fill:url(#SVGID_19_);}
- .st26{fill:url(#SVGID_20_);}
- .st27{fill:url(#SVGID_21_);}
- .st28{fill:url(#SVGID_22_);}
- .st29{fill:url(#SVGID_23_);}
- .st30{fill:url(#SVGID_24_);}
- .st31{fill:url(#SVGID_25_);}
- .st32{fill:url(#SVGID_26_);}
- .st33{fill:url(#SVGID_27_);}
- .st34{fill:url(#SVGID_28_);}
- .st35{fill:url(#SVGID_29_);}
- .st36{fill:url(#SVGID_30_);}
- .st37{fill:url(#SVGID_31_);}
- .st38{fill:url(#SVGID_32_);}
- .st39{fill:url(#SVGID_33_);}
- .st40{fill:url(#SVGID_34_);}
- .st41{fill:url(#SVGID_35_);}
- .st42{fill:url(#SVGID_36_);}
- .st43{opacity:0.4;fill:url(#SVGID_37_);}
- .st44{fill:url(#SVGID_38_);}
- .st45{fill:url(#SVGID_39_);}
- .st46{fill:url(#SVGID_40_);}
- .st47{fill:url(#SVGID_41_);}
- .st48{fill:url(#SVGID_42_);}
- .st49{fill:url(#SVGID_43_);}
- .st50{fill:url(#SVGID_44_);}
- .st51{display:inline;opacity:0.29;}
- .st52{display:inline;fill:url(#SVGID_45_);}
- .st53{display:inline;fill:url(#SVGID_46_);}
- .st54{display:inline;fill:#FFFFFF;}
- .st55{display:inline;fill:url(#SVGID_47_);}
- .st56{display:inline;fill:url(#SVGID_48_);}
- .st57{display:inline;fill:url(#SVGID_49_);}
- .st58{display:inline;fill:url(#SVGID_50_);}
- .st59{display:inline;fill:url(#SVGID_51_);}
- .st60{display:inline;fill:url(#SVGID_52_);}
- .st61{opacity:0.4;fill:url(#SVGID_53_);}
- .st62{fill:url(#SVGID_54_);}
- .st63{fill:url(#SVGID_55_);}
- .st64{fill:url(#SVGID_56_);}
- .st65{fill:url(#SVGID_57_);}
- .st66{fill:url(#SVGID_58_);}
- .st67{opacity:0.4;fill:url(#SVGID_59_);}
- .st68{fill:url(#SVGID_60_);}
- .st69{fill:url(#SVGID_61_);}
- .st70{fill:url(#SVGID_62_);}
- .st71{fill:url(#SVGID_63_);}
- .st72{fill:url(#SVGID_64_);}
- .st73{fill:url(#SVGID_65_);}
- .st74{fill:url(#SVGID_66_);}
- .st75{fill:url(#SVGID_67_);}
- .st76{fill:url(#SVGID_68_);}
- .st77{fill:url(#SVGID_69_);}
- .st78{fill:url(#SVGID_70_);}
- .st79{fill:url(#SVGID_71_);}
- .st80{fill:url(#SVGID_72_);}
- .st81{fill:url(#SVGID_73_);}
- .st82{fill:url(#SVGID_74_);}
- .st83{fill:url(#SVGID_75_);}
- .st84{fill:url(#SVGID_76_);}
- .st85{fill:url(#SVGID_77_);}
- .st86{fill:url(#SVGID_78_);}
- .st87{fill:url(#SVGID_79_);}
- .st88{fill:url(#SVGID_80_);}
- .st89{fill:url(#SVGID_81_);}
- .st90{fill:url(#SVGID_82_);}
- .st91{fill:url(#SVGID_83_);}
- .st92{fill:url(#SVGID_84_);}
- .st93{fill:url(#SVGID_85_);}
- .st94{fill:url(#SVGID_86_);}
- .st95{opacity:0.4;fill:url(#SVGID_87_);}
- .st96{fill:url(#SVGID_88_);}
- .st97{fill:url(#SVGID_89_);}
- .st98{fill:url(#SVGID_90_);}
- .st99{fill:url(#SVGID_91_);}
- .st100{fill:url(#SVGID_92_);}
- .st101{fill:url(#SVGID_93_);}
- .st102{fill:url(#SVGID_94_);}
- .st103{opacity:0.4;fill:url(#SVGID_95_);}
- .st104{fill:url(#SVGID_96_);}
- .st105{fill:url(#SVGID_97_);}
- .st106{fill:url(#SVGID_98_);}
- .st107{fill:url(#SVGID_99_);}
- .st108{fill:url(#SVGID_100_);}
- .st109{fill:url(#SVGID_101_);}
- .st110{display:inline;fill:url(#SVGID_102_);}
- .st111{display:inline;fill:url(#SVGID_103_);}
- .st112{fill:url(#SVGID_104_);}
- .st113{fill:url(#SVGID_105_);}
- .st114{fill:url(#SVGID_106_);}
- .st115{fill:url(#SVGID_107_);}
- .st116{fill:url(#SVGID_108_);}
- .st117{opacity:0.4;fill:url(#SVGID_109_);}
- .st118{fill:url(#SVGID_110_);}
- .st119{fill:url(#SVGID_111_);}
- .st120{fill:url(#SVGID_112_);}
- .st121{fill:url(#SVGID_113_);}
- .st122{fill:url(#SVGID_114_);}
- .st123{opacity:0.4;fill:url(#SVGID_115_);}
- .st124{fill:url(#SVGID_116_);}
- .st125{fill:url(#SVGID_117_);}
- .st126{fill:url(#SVGID_118_);}
- .st127{display:inline;fill:url(#SVGID_119_);}
- .st128{display:inline;fill:url(#SVGID_120_);}
- .st129{fill:url(#SVGID_121_);}
- .st130{fill:url(#SVGID_122_);}
-</style><switch
- id="switch6"><g
- i:extraneous="self"
- id="g8"><g
- id="Multimedia_Inactive_copy"><circle
- class="st24"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle884" /><linearGradient
- id="SVGID_91_"
- gradientUnits="userSpaceOnUse"
- x1="115.9317"
- y1="254.1836"
- x2="256.3852"
- y2="-133.5267"><stop
- offset="0"
- style="stop-color:#8BC53F"
- id="stop887" /><stop
- offset="2.015080e-02"
- style="stop-color:#7CCB56;stop-opacity:0.9678"
- id="stop889" /><stop
- offset="6.089833e-02"
- style="stop-color:#62D67D;stop-opacity:0.9028"
- id="stop891" /><stop
- offset="0.1057"
- style="stop-color:#4BDFA0;stop-opacity:0.8312"
- id="stop893" /><stop
- offset="0.1543"
- style="stop-color:#38E7BE;stop-opacity:0.7537"
- id="stop895" /><stop
- offset="0.2077"
- style="stop-color:#28EED6;stop-opacity:0.6684"
- id="stop897" /><stop
- offset="0.2681"
- style="stop-color:#1CF3E8;stop-opacity:0.572"
- id="stop899" /><stop
- offset="0.3394"
- style="stop-color:#13F6F5;stop-opacity:0.4581"
- id="stop901" /><stop
- offset="0.4323"
- style="stop-color:#0EF8FD;stop-opacity:0.3098"
- id="stop903" /><stop
- offset="0.6264"
- style="stop-color:#0DF9FF;stop-opacity:0"
- id="stop905" /></linearGradient><circle
- class="st99"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle907" /><linearGradient
- id="SVGID_92_"
- gradientUnits="userSpaceOnUse"
- x1="4.0481"
- y1="287.9492"
- x2="320.4859"
- y2="-15.4029"
- gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop910" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop912" /></linearGradient><path
- class="st100"
- d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5 c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2 c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9 c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
- id="path914" /><g
- id="g916"><text
- transform="matrix(1 0 0 1 53.5841 284.7119)"
- class="st4 st5 st6 st7"
- id="text918">MULTIMEDIA</text>
-<linearGradient
- id="SVGID_93_"
- gradientUnits="userSpaceOnUse"
- x1="140.5445"
- y1="202.2363"
- x2="186.8444"
- y2="68.7049"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop921" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop923" /></linearGradient><path
- class="st101"
- d="M114.5,190.9c-6.4,0-12-2.6-14.8-7.5c-2.9-4.9-5.4-14.5,9.6-23.2c4.8-2.8,17.1-3.9,20.8-4l0.1,3.6 c-4.6,0.1-15.5,1.4-19.1,3.5c-9.4,5.4-12.1,11.5-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2c6.6-3.8,10.6-10.5,10.7-17.9l-0.1-0.7V95.4 l71.9-14.2l0.1,71.3c0,6.7-3.3,16.4-12.5,21.8c-11.1,6.4-24.1,4.8-28.9-3.5c-2.9-4.9-5.4-14.5,9.6-23.2 c4.4-2.5,14.4-3.8,18.8-3.9l0.1,3.6c-4.2,0.1-13.5,1.4-17.1,3.5c-6.4,3.7-13.1,9.9-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2 c7.9-4.5,10.7-12.8,10.7-18.5l-0.1-0.8V85.6l-64.7,12.7v66.8l0.1,0.7c0,8.7-4.7,16.6-12.5,21.1 C123.9,189.6,119,190.9,114.5,190.9z"
- id="path925" /><linearGradient
- id="SVGID_94_"
- gradientUnits="userSpaceOnUse"
- x1="145.3286"
- y1="203.8951"
- x2="191.6285"
- y2="70.3637"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop928" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop930" /></linearGradient><polygon
- class="st102"
- points="155.6,123.3 154.8,119.8 195.5,110.2 196.3,113.7 "
- id="polygon932" /></g></g></g></switch></svg> \ No newline at end of file
diff --git a/sample/simple-egl/package/navi/config.xml b/sample/simple-egl/package/navi/config.xml
deleted file mode 100644
index 6f6e649..0000000
--- a/sample/simple-egl/package/navi/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="navigation" version="0.1">
- <name>Navigation</name>
- <icon src="icon.svg"/>
- <content src="bin/navi" type="application/vnd.agl.native"/>
- <description>This is a demo application for simple-egl</description>
- <author>TOYOA</author>
- <license>APL 2.0</license>
- <feature name="urn:AGL:widget:required-api">
- <param name="homescreen" value="ws" />
- <param name="windowmanager" value="ws" />
- </feature>
- <feature name="urn:AGL:widget:required-permission">
- <param name="urn:AGL:permission::public:no-htdocs" value="required" />
- </feature>
-</widget>
diff --git a/sample/simple-egl/package/navi/icon.svg b/sample/simple-egl/package/navi/icon.svg
deleted file mode 100644
index 91661a7..0000000
--- a/sample/simple-egl/package/navi/icon.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
-<svg
- xmlns:i="&amp;ns_ai;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- x="0px"
- y="0px"
- viewBox="0 0 320 320"
- style="enable-background:new 0 0 320 320;"
- xml:space="preserve"
- id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="icon.svg"><metadata
- id="metadata1292"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1290" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2560"
- inkscape:window-height="1464"
- id="namedview1288"
- showgrid="false"
- inkscape:zoom="0.7375"
- inkscape:cx="-572.20339"
- inkscape:cy="160"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" /><style
- type="text/css"
- id="style4">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{opacity:0.4;fill:url(#SVGID_1_);}
- .st3{fill:url(#SVGID_2_);}
- .st4{fill:#FFFFFF;}
- .st5{font-family:'Roboto-Regular';}
- .st6{font-size:25px;}
- .st7{letter-spacing:6;}
- .st8{fill:url(#SVGID_3_);}
- .st9{fill:url(#SVGID_4_);}
- .st10{fill:url(#SVGID_5_);}
- .st11{fill:url(#SVGID_6_);}
- .st12{fill:url(#SVGID_7_);}
- .st13{fill:url(#SVGID_8_);}
- .st14{fill:url(#SVGID_9_);}
- .st15{fill:url(#SVGID_10_);}
- .st16{fill:url(#SVGID_11_);}
- .st17{fill:url(#SVGID_12_);}
- .st18{fill:url(#SVGID_13_);}
- .st19{fill:url(#SVGID_14_);}
- .st20{fill:url(#SVGID_15_);}
- .st21{fill:url(#SVGID_16_);}
- .st22{fill:url(#SVGID_17_);}
- .st23{fill:url(#SVGID_18_);}
- .st24{opacity:0.29;}
- .st25{fill:url(#SVGID_19_);}
- .st26{fill:url(#SVGID_20_);}
- .st27{fill:url(#SVGID_21_);}
- .st28{fill:url(#SVGID_22_);}
- .st29{fill:url(#SVGID_23_);}
- .st30{fill:url(#SVGID_24_);}
- .st31{fill:url(#SVGID_25_);}
- .st32{fill:url(#SVGID_26_);}
- .st33{fill:url(#SVGID_27_);}
- .st34{fill:url(#SVGID_28_);}
- .st35{fill:url(#SVGID_29_);}
- .st36{fill:url(#SVGID_30_);}
- .st37{fill:url(#SVGID_31_);}
- .st38{fill:url(#SVGID_32_);}
- .st39{fill:url(#SVGID_33_);}
- .st40{fill:url(#SVGID_34_);}
- .st41{fill:url(#SVGID_35_);}
- .st42{fill:url(#SVGID_36_);}
- .st43{opacity:0.4;fill:url(#SVGID_37_);}
- .st44{fill:url(#SVGID_38_);}
- .st45{fill:url(#SVGID_39_);}
- .st46{fill:url(#SVGID_40_);}
- .st47{fill:url(#SVGID_41_);}
- .st48{fill:url(#SVGID_42_);}
- .st49{fill:url(#SVGID_43_);}
- .st50{fill:url(#SVGID_44_);}
- .st51{display:inline;opacity:0.29;}
- .st52{display:inline;fill:url(#SVGID_45_);}
- .st53{display:inline;fill:url(#SVGID_46_);}
- .st54{display:inline;fill:#FFFFFF;}
- .st55{display:inline;fill:url(#SVGID_47_);}
- .st56{display:inline;fill:url(#SVGID_48_);}
- .st57{display:inline;fill:url(#SVGID_49_);}
- .st58{display:inline;fill:url(#SVGID_50_);}
- .st59{display:inline;fill:url(#SVGID_51_);}
- .st60{display:inline;fill:url(#SVGID_52_);}
- .st61{opacity:0.4;fill:url(#SVGID_53_);}
- .st62{fill:url(#SVGID_54_);}
- .st63{fill:url(#SVGID_55_);}
- .st64{fill:url(#SVGID_56_);}
- .st65{fill:url(#SVGID_57_);}
- .st66{fill:url(#SVGID_58_);}
- .st67{opacity:0.4;fill:url(#SVGID_59_);}
- .st68{fill:url(#SVGID_60_);}
- .st69{fill:url(#SVGID_61_);}
- .st70{fill:url(#SVGID_62_);}
- .st71{fill:url(#SVGID_63_);}
- .st72{fill:url(#SVGID_64_);}
- .st73{fill:url(#SVGID_65_);}
- .st74{fill:url(#SVGID_66_);}
- .st75{fill:url(#SVGID_67_);}
- .st76{fill:url(#SVGID_68_);}
- .st77{fill:url(#SVGID_69_);}
- .st78{fill:url(#SVGID_70_);}
- .st79{fill:url(#SVGID_71_);}
- .st80{fill:url(#SVGID_72_);}
- .st81{fill:url(#SVGID_73_);}
- .st82{fill:url(#SVGID_74_);}
- .st83{fill:url(#SVGID_75_);}
- .st84{fill:url(#SVGID_76_);}
- .st85{fill:url(#SVGID_77_);}
- .st86{fill:url(#SVGID_78_);}
- .st87{fill:url(#SVGID_79_);}
- .st88{fill:url(#SVGID_80_);}
- .st89{fill:url(#SVGID_81_);}
- .st90{fill:url(#SVGID_82_);}
- .st91{fill:url(#SVGID_83_);}
- .st92{fill:url(#SVGID_84_);}
- .st93{fill:url(#SVGID_85_);}
- .st94{fill:url(#SVGID_86_);}
- .st95{opacity:0.4;fill:url(#SVGID_87_);}
- .st96{fill:url(#SVGID_88_);}
- .st97{fill:url(#SVGID_89_);}
- .st98{fill:url(#SVGID_90_);}
- .st99{fill:url(#SVGID_91_);}
- .st100{fill:url(#SVGID_92_);}
- .st101{fill:url(#SVGID_93_);}
- .st102{fill:url(#SVGID_94_);}
- .st103{opacity:0.4;fill:url(#SVGID_95_);}
- .st104{fill:url(#SVGID_96_);}
- .st105{fill:url(#SVGID_97_);}
- .st106{fill:url(#SVGID_98_);}
- .st107{fill:url(#SVGID_99_);}
- .st108{fill:url(#SVGID_100_);}
- .st109{fill:url(#SVGID_101_);}
- .st110{display:inline;fill:url(#SVGID_102_);}
- .st111{display:inline;fill:url(#SVGID_103_);}
- .st112{fill:url(#SVGID_104_);}
- .st113{fill:url(#SVGID_105_);}
- .st114{fill:url(#SVGID_106_);}
- .st115{fill:url(#SVGID_107_);}
- .st116{fill:url(#SVGID_108_);}
- .st117{opacity:0.4;fill:url(#SVGID_109_);}
- .st118{fill:url(#SVGID_110_);}
- .st119{fill:url(#SVGID_111_);}
- .st120{fill:url(#SVGID_112_);}
- .st121{fill:url(#SVGID_113_);}
- .st122{fill:url(#SVGID_114_);}
- .st123{opacity:0.4;fill:url(#SVGID_115_);}
- .st124{fill:url(#SVGID_116_);}
- .st125{fill:url(#SVGID_117_);}
- .st126{fill:url(#SVGID_118_);}
- .st127{display:inline;fill:url(#SVGID_119_);}
- .st128{display:inline;fill:url(#SVGID_120_);}
- .st129{fill:url(#SVGID_121_);}
- .st130{fill:url(#SVGID_122_);}
-</style><switch
- id="switch6"><g
- i:extraneous="self"
- id="g8"><g
- id="Multimedia_Inactive_copy"><circle
- class="st24"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle884" /><linearGradient
- id="SVGID_91_"
- gradientUnits="userSpaceOnUse"
- x1="115.9317"
- y1="254.1836"
- x2="256.3852"
- y2="-133.5267"><stop
- offset="0"
- style="stop-color:#8BC53F"
- id="stop887" /><stop
- offset="2.015080e-02"
- style="stop-color:#7CCB56;stop-opacity:0.9678"
- id="stop889" /><stop
- offset="6.089833e-02"
- style="stop-color:#62D67D;stop-opacity:0.9028"
- id="stop891" /><stop
- offset="0.1057"
- style="stop-color:#4BDFA0;stop-opacity:0.8312"
- id="stop893" /><stop
- offset="0.1543"
- style="stop-color:#38E7BE;stop-opacity:0.7537"
- id="stop895" /><stop
- offset="0.2077"
- style="stop-color:#28EED6;stop-opacity:0.6684"
- id="stop897" /><stop
- offset="0.2681"
- style="stop-color:#1CF3E8;stop-opacity:0.572"
- id="stop899" /><stop
- offset="0.3394"
- style="stop-color:#13F6F5;stop-opacity:0.4581"
- id="stop901" /><stop
- offset="0.4323"
- style="stop-color:#0EF8FD;stop-opacity:0.3098"
- id="stop903" /><stop
- offset="0.6264"
- style="stop-color:#0DF9FF;stop-opacity:0"
- id="stop905" /></linearGradient><circle
- class="st99"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle907" /><linearGradient
- id="SVGID_92_"
- gradientUnits="userSpaceOnUse"
- x1="4.0481"
- y1="287.9492"
- x2="320.4859"
- y2="-15.4029"
- gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop910" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop912" /></linearGradient><path
- class="st100"
- d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5 c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2 c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9 c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
- id="path914" /><g
- id="g916"><text
- transform="matrix(1 0 0 1 53.5841 284.7119)"
- class="st4 st5 st6 st7"
- id="text918">MULTIMEDIA</text>
-<linearGradient
- id="SVGID_93_"
- gradientUnits="userSpaceOnUse"
- x1="140.5445"
- y1="202.2363"
- x2="186.8444"
- y2="68.7049"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop921" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop923" /></linearGradient><path
- class="st101"
- d="M114.5,190.9c-6.4,0-12-2.6-14.8-7.5c-2.9-4.9-5.4-14.5,9.6-23.2c4.8-2.8,17.1-3.9,20.8-4l0.1,3.6 c-4.6,0.1-15.5,1.4-19.1,3.5c-9.4,5.4-12.1,11.5-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2c6.6-3.8,10.6-10.5,10.7-17.9l-0.1-0.7V95.4 l71.9-14.2l0.1,71.3c0,6.7-3.3,16.4-12.5,21.8c-11.1,6.4-24.1,4.8-28.9-3.5c-2.9-4.9-5.4-14.5,9.6-23.2 c4.4-2.5,14.4-3.8,18.8-3.9l0.1,3.6c-4.2,0.1-13.5,1.4-17.1,3.5c-6.4,3.7-13.1,9.9-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2 c7.9-4.5,10.7-12.8,10.7-18.5l-0.1-0.8V85.6l-64.7,12.7v66.8l0.1,0.7c0,8.7-4.7,16.6-12.5,21.1 C123.9,189.6,119,190.9,114.5,190.9z"
- id="path925" /><linearGradient
- id="SVGID_94_"
- gradientUnits="userSpaceOnUse"
- x1="145.3286"
- y1="203.8951"
- x2="191.6285"
- y2="70.3637"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop928" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop930" /></linearGradient><polygon
- class="st102"
- points="155.6,123.3 154.8,119.8 195.5,110.2 196.3,113.7 "
- id="polygon932" /></g></g></g></switch></svg> \ No newline at end of file
diff --git a/sample/simple-egl/package/root/config.xml b/sample/simple-egl/package/root/config.xml
deleted file mode 100644
index 17abd41..0000000
--- a/sample/simple-egl/package/root/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="simple-egl" version="0.1">
- <name>SIMPLE-EGL</name>
- <icon src="icon.svg"/>
- <content src="bin/simple-egl" type="application/vnd.agl.native"/>
- <description>This is a demo application for simple-egl</description>
- <author>TOYOA</author>
- <license>APL 2.0</license>
- <feature name="urn:AGL:widget:required-api">
- <param name="homescreen" value="ws" />
- <param name="windowmanager" value="ws" />
- </feature>
- <feature name="urn:AGL:widget:required-permission">
- <param name="urn:AGL:permission::public:no-htdocs" value="required" />
- </feature>
-</widget>
diff --git a/sample/simple-egl/package/root/icon.svg b/sample/simple-egl/package/root/icon.svg
deleted file mode 100644
index 91661a7..0000000
--- a/sample/simple-egl/package/root/icon.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
-<svg
- xmlns:i="&amp;ns_ai;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- x="0px"
- y="0px"
- viewBox="0 0 320 320"
- style="enable-background:new 0 0 320 320;"
- xml:space="preserve"
- id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="icon.svg"><metadata
- id="metadata1292"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1290" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2560"
- inkscape:window-height="1464"
- id="namedview1288"
- showgrid="false"
- inkscape:zoom="0.7375"
- inkscape:cx="-572.20339"
- inkscape:cy="160"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" /><style
- type="text/css"
- id="style4">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{opacity:0.4;fill:url(#SVGID_1_);}
- .st3{fill:url(#SVGID_2_);}
- .st4{fill:#FFFFFF;}
- .st5{font-family:'Roboto-Regular';}
- .st6{font-size:25px;}
- .st7{letter-spacing:6;}
- .st8{fill:url(#SVGID_3_);}
- .st9{fill:url(#SVGID_4_);}
- .st10{fill:url(#SVGID_5_);}
- .st11{fill:url(#SVGID_6_);}
- .st12{fill:url(#SVGID_7_);}
- .st13{fill:url(#SVGID_8_);}
- .st14{fill:url(#SVGID_9_);}
- .st15{fill:url(#SVGID_10_);}
- .st16{fill:url(#SVGID_11_);}
- .st17{fill:url(#SVGID_12_);}
- .st18{fill:url(#SVGID_13_);}
- .st19{fill:url(#SVGID_14_);}
- .st20{fill:url(#SVGID_15_);}
- .st21{fill:url(#SVGID_16_);}
- .st22{fill:url(#SVGID_17_);}
- .st23{fill:url(#SVGID_18_);}
- .st24{opacity:0.29;}
- .st25{fill:url(#SVGID_19_);}
- .st26{fill:url(#SVGID_20_);}
- .st27{fill:url(#SVGID_21_);}
- .st28{fill:url(#SVGID_22_);}
- .st29{fill:url(#SVGID_23_);}
- .st30{fill:url(#SVGID_24_);}
- .st31{fill:url(#SVGID_25_);}
- .st32{fill:url(#SVGID_26_);}
- .st33{fill:url(#SVGID_27_);}
- .st34{fill:url(#SVGID_28_);}
- .st35{fill:url(#SVGID_29_);}
- .st36{fill:url(#SVGID_30_);}
- .st37{fill:url(#SVGID_31_);}
- .st38{fill:url(#SVGID_32_);}
- .st39{fill:url(#SVGID_33_);}
- .st40{fill:url(#SVGID_34_);}
- .st41{fill:url(#SVGID_35_);}
- .st42{fill:url(#SVGID_36_);}
- .st43{opacity:0.4;fill:url(#SVGID_37_);}
- .st44{fill:url(#SVGID_38_);}
- .st45{fill:url(#SVGID_39_);}
- .st46{fill:url(#SVGID_40_);}
- .st47{fill:url(#SVGID_41_);}
- .st48{fill:url(#SVGID_42_);}
- .st49{fill:url(#SVGID_43_);}
- .st50{fill:url(#SVGID_44_);}
- .st51{display:inline;opacity:0.29;}
- .st52{display:inline;fill:url(#SVGID_45_);}
- .st53{display:inline;fill:url(#SVGID_46_);}
- .st54{display:inline;fill:#FFFFFF;}
- .st55{display:inline;fill:url(#SVGID_47_);}
- .st56{display:inline;fill:url(#SVGID_48_);}
- .st57{display:inline;fill:url(#SVGID_49_);}
- .st58{display:inline;fill:url(#SVGID_50_);}
- .st59{display:inline;fill:url(#SVGID_51_);}
- .st60{display:inline;fill:url(#SVGID_52_);}
- .st61{opacity:0.4;fill:url(#SVGID_53_);}
- .st62{fill:url(#SVGID_54_);}
- .st63{fill:url(#SVGID_55_);}
- .st64{fill:url(#SVGID_56_);}
- .st65{fill:url(#SVGID_57_);}
- .st66{fill:url(#SVGID_58_);}
- .st67{opacity:0.4;fill:url(#SVGID_59_);}
- .st68{fill:url(#SVGID_60_);}
- .st69{fill:url(#SVGID_61_);}
- .st70{fill:url(#SVGID_62_);}
- .st71{fill:url(#SVGID_63_);}
- .st72{fill:url(#SVGID_64_);}
- .st73{fill:url(#SVGID_65_);}
- .st74{fill:url(#SVGID_66_);}
- .st75{fill:url(#SVGID_67_);}
- .st76{fill:url(#SVGID_68_);}
- .st77{fill:url(#SVGID_69_);}
- .st78{fill:url(#SVGID_70_);}
- .st79{fill:url(#SVGID_71_);}
- .st80{fill:url(#SVGID_72_);}
- .st81{fill:url(#SVGID_73_);}
- .st82{fill:url(#SVGID_74_);}
- .st83{fill:url(#SVGID_75_);}
- .st84{fill:url(#SVGID_76_);}
- .st85{fill:url(#SVGID_77_);}
- .st86{fill:url(#SVGID_78_);}
- .st87{fill:url(#SVGID_79_);}
- .st88{fill:url(#SVGID_80_);}
- .st89{fill:url(#SVGID_81_);}
- .st90{fill:url(#SVGID_82_);}
- .st91{fill:url(#SVGID_83_);}
- .st92{fill:url(#SVGID_84_);}
- .st93{fill:url(#SVGID_85_);}
- .st94{fill:url(#SVGID_86_);}
- .st95{opacity:0.4;fill:url(#SVGID_87_);}
- .st96{fill:url(#SVGID_88_);}
- .st97{fill:url(#SVGID_89_);}
- .st98{fill:url(#SVGID_90_);}
- .st99{fill:url(#SVGID_91_);}
- .st100{fill:url(#SVGID_92_);}
- .st101{fill:url(#SVGID_93_);}
- .st102{fill:url(#SVGID_94_);}
- .st103{opacity:0.4;fill:url(#SVGID_95_);}
- .st104{fill:url(#SVGID_96_);}
- .st105{fill:url(#SVGID_97_);}
- .st106{fill:url(#SVGID_98_);}
- .st107{fill:url(#SVGID_99_);}
- .st108{fill:url(#SVGID_100_);}
- .st109{fill:url(#SVGID_101_);}
- .st110{display:inline;fill:url(#SVGID_102_);}
- .st111{display:inline;fill:url(#SVGID_103_);}
- .st112{fill:url(#SVGID_104_);}
- .st113{fill:url(#SVGID_105_);}
- .st114{fill:url(#SVGID_106_);}
- .st115{fill:url(#SVGID_107_);}
- .st116{fill:url(#SVGID_108_);}
- .st117{opacity:0.4;fill:url(#SVGID_109_);}
- .st118{fill:url(#SVGID_110_);}
- .st119{fill:url(#SVGID_111_);}
- .st120{fill:url(#SVGID_112_);}
- .st121{fill:url(#SVGID_113_);}
- .st122{fill:url(#SVGID_114_);}
- .st123{opacity:0.4;fill:url(#SVGID_115_);}
- .st124{fill:url(#SVGID_116_);}
- .st125{fill:url(#SVGID_117_);}
- .st126{fill:url(#SVGID_118_);}
- .st127{display:inline;fill:url(#SVGID_119_);}
- .st128{display:inline;fill:url(#SVGID_120_);}
- .st129{fill:url(#SVGID_121_);}
- .st130{fill:url(#SVGID_122_);}
-</style><switch
- id="switch6"><g
- i:extraneous="self"
- id="g8"><g
- id="Multimedia_Inactive_copy"><circle
- class="st24"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle884" /><linearGradient
- id="SVGID_91_"
- gradientUnits="userSpaceOnUse"
- x1="115.9317"
- y1="254.1836"
- x2="256.3852"
- y2="-133.5267"><stop
- offset="0"
- style="stop-color:#8BC53F"
- id="stop887" /><stop
- offset="2.015080e-02"
- style="stop-color:#7CCB56;stop-opacity:0.9678"
- id="stop889" /><stop
- offset="6.089833e-02"
- style="stop-color:#62D67D;stop-opacity:0.9028"
- id="stop891" /><stop
- offset="0.1057"
- style="stop-color:#4BDFA0;stop-opacity:0.8312"
- id="stop893" /><stop
- offset="0.1543"
- style="stop-color:#38E7BE;stop-opacity:0.7537"
- id="stop895" /><stop
- offset="0.2077"
- style="stop-color:#28EED6;stop-opacity:0.6684"
- id="stop897" /><stop
- offset="0.2681"
- style="stop-color:#1CF3E8;stop-opacity:0.572"
- id="stop899" /><stop
- offset="0.3394"
- style="stop-color:#13F6F5;stop-opacity:0.4581"
- id="stop901" /><stop
- offset="0.4323"
- style="stop-color:#0EF8FD;stop-opacity:0.3098"
- id="stop903" /><stop
- offset="0.6264"
- style="stop-color:#0DF9FF;stop-opacity:0"
- id="stop905" /></linearGradient><circle
- class="st99"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle907" /><linearGradient
- id="SVGID_92_"
- gradientUnits="userSpaceOnUse"
- x1="4.0481"
- y1="287.9492"
- x2="320.4859"
- y2="-15.4029"
- gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop910" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop912" /></linearGradient><path
- class="st100"
- d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5 c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2 c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9 c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
- id="path914" /><g
- id="g916"><text
- transform="matrix(1 0 0 1 53.5841 284.7119)"
- class="st4 st5 st6 st7"
- id="text918">MULTIMEDIA</text>
-<linearGradient
- id="SVGID_93_"
- gradientUnits="userSpaceOnUse"
- x1="140.5445"
- y1="202.2363"
- x2="186.8444"
- y2="68.7049"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop921" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop923" /></linearGradient><path
- class="st101"
- d="M114.5,190.9c-6.4,0-12-2.6-14.8-7.5c-2.9-4.9-5.4-14.5,9.6-23.2c4.8-2.8,17.1-3.9,20.8-4l0.1,3.6 c-4.6,0.1-15.5,1.4-19.1,3.5c-9.4,5.4-12.1,11.5-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2c6.6-3.8,10.6-10.5,10.7-17.9l-0.1-0.7V95.4 l71.9-14.2l0.1,71.3c0,6.7-3.3,16.4-12.5,21.8c-11.1,6.4-24.1,4.8-28.9-3.5c-2.9-4.9-5.4-14.5,9.6-23.2 c4.4-2.5,14.4-3.8,18.8-3.9l0.1,3.6c-4.2,0.1-13.5,1.4-17.1,3.5c-6.4,3.7-13.1,9.9-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2 c7.9-4.5,10.7-12.8,10.7-18.5l-0.1-0.8V85.6l-64.7,12.7v66.8l0.1,0.7c0,8.7-4.7,16.6-12.5,21.1 C123.9,189.6,119,190.9,114.5,190.9z"
- id="path925" /><linearGradient
- id="SVGID_94_"
- gradientUnits="userSpaceOnUse"
- x1="145.3286"
- y1="203.8951"
- x2="191.6285"
- y2="70.3637"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop928" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop930" /></linearGradient><polygon
- class="st102"
- points="155.6,123.3 154.8,119.8 195.5,110.2 196.3,113.7 "
- id="polygon932" /></g></g></g></switch></svg> \ No newline at end of file
diff --git a/sample/simple-egl/src/simple-egl.cpp b/sample/simple-egl/src/simple-egl.cpp
deleted file mode 100644
index 173d728..0000000
--- a/sample/simple-egl/src/simple-egl.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- * Copyright © 2011 Benjamin Franzke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <mutex>
-#include <chrono>
-
-#include <iostream>
-#include <string>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <thread>
-#include <exception>
-#include <vector>
-#include <sstream>
-
-#include <assert.h>
-#include <signal.h>
-
-#include <wayland-client.h>
-#include <wayland-egl.h>
-
-#include <GLES2/gl2.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#include "libwindowmanager.h"
-#include <libhomescreen.hpp>
-
-#include "ivi-application-client-protocol.h"
-using namespace std;
-
-
-uint32_t g_id_ivisurf = 9009;
-long port = 1700;
-string token = string("wm");
-bool enable_debug = false;
-
-string app_name = string("Navigation");
-
-LibHomeScreen* hs;
-LibWindowmanager *wm;
-
-static const struct wl_interface *types[] = {
- NULL,
- NULL,
- NULL,
- &wl_surface_interface,
- &ivi_surface_interface,
-};
-
-static const struct wl_message ivi_surface_requests[] = {
- { "destroy", "", types + 0 },
-};
-
-static const struct wl_message ivi_surface_events[] = {
- { "configure", "ii", types + 0 },
-};
-
-const struct wl_interface ivi_surface_interface = {
- "ivi_surface", 1,
- 1, ivi_surface_requests,
- 1, ivi_surface_events,
-};
-
-static const struct wl_message ivi_application_requests[] = {
- { "surface_create", "uon", types + 2 },
-};
-
-const struct wl_interface ivi_application_interface = {
- "ivi_application", 1,
- 1, ivi_application_requests,
- 0, NULL,
-};
-
-#include "platform.h"
-
-#ifndef EGL_EXT_swap_buffers_with_damage
-#define EGL_EXT_swap_buffers_with_damage 1
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC)(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
-#endif
-
-#ifndef EGL_EXT_buffer_age
-#define EGL_EXT_buffer_age 1
-#define EGL_BUFFER_AGE_EXT 0x313D
-#endif
-
-struct window;
-struct seat;
-
-struct display {
- struct wl_display *display;
- struct wl_registry *registry;
- struct wl_compositor *compositor;
- struct wl_seat *seat;
- struct {
- EGLDisplay dpy;
- EGLContext ctx;
- EGLConfig conf;
- } egl;
- struct window *window;
- struct ivi_application *ivi_application;
-
- PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC swap_buffers_with_damage;
-};
-
-struct geometry {
- int width, height;
-};
-
-struct window {
- struct display *display;
- struct geometry geometry, window_size;
- struct {
- GLuint rotation_uniform;
- GLuint pos;
- GLuint col;
- } gl;
-
- uint32_t benchmark_time, frames;
- struct wl_egl_window *native;
- struct wl_surface *surface;
- struct ivi_surface *ivi_surface;
- EGLSurface egl_surface;
- struct wl_callback *callback;
- int fullscreen, opaque, buffer_size, frame_sync;
-};
-
-static const char *vert_shader_text =
- "uniform mat4 rotation;\n"
- "attribute vec4 pos;\n"
- "attribute vec4 color;\n"
- "varying vec4 v_color;\n"
- "void main() {\n"
- " gl_Position = rotation * pos;\n"
- " v_color = color;\n"
- "}\n";
-
-static const char *frag_shader_text =
- "precision mediump float;\n"
- "varying vec4 v_color;\n"
- "void main() {\n"
- " gl_FragColor = v_color;\n"
- "}\n";
-
-static int running = 1;
-
-static void debug_out(const char* str, ...)
-{
- if(!enable_debug)
- return;
- char *out;
- va_list arg_ptr;
- va_start(arg_ptr, str);
- vasprintf(&out, str, arg_ptr);
- cout << out;
- va_end(arg_ptr);
- // cout << endl;
-}
-
-static void
-init_egl(struct display *display, struct window *window)
-{
- static const EGLint context_attribs[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_NONE
- };
- const char *extensions;
-
- EGLint config_attribs[] = {
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
- EGL_RED_SIZE, 1,
- EGL_GREEN_SIZE, 1,
- EGL_BLUE_SIZE, 1,
- EGL_ALPHA_SIZE, 1,
- EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
- EGL_NONE
- };
-
- EGLint major, minor, n, count, i, size;
- EGLConfig *configs;
- EGLBoolean ret;
-
- if (window->opaque || window->buffer_size == 16)
- config_attribs[9] = 0;
-
- display->egl.dpy = weston_platform_get_egl_display(EGL_PLATFORM_WAYLAND_KHR, display->display, NULL);
- assert(display->egl.dpy);
-
- ret = eglInitialize(display->egl.dpy, &major, &minor);
- assert(ret == EGL_TRUE);
- ret = eglBindAPI(EGL_OPENGL_ES_API);
- assert(ret == EGL_TRUE);
-
- if (!eglGetConfigs(display->egl.dpy, NULL, 0, &count) || count < 1)
- assert(0);
-
- configs = calloc(count, sizeof *configs);
- assert(configs);
-
- ret = eglChooseConfig(display->egl.dpy, config_attribs,
- configs, count, &n);
- assert(ret && n >= 1);
-
- for (i = 0; i < n; i++) {
- eglGetConfigAttrib(display->egl.dpy,
- configs[i], EGL_BUFFER_SIZE, &size);
- if (window->buffer_size == size) {
- display->egl.conf = configs[i];
- break;
- }
- }
- free(configs);
- if (display->egl.conf == NULL) {
- debug_out("did not find config with buffer size %d\n",
- window->buffer_size);
- exit(EXIT_FAILURE);
- }
-
- display->egl.ctx = eglCreateContext(display->egl.dpy,
- display->egl.conf,
- EGL_NO_CONTEXT, context_attribs);
- assert(display->egl.ctx);
-
- display->swap_buffers_with_damage = NULL;
- extensions = eglQueryString(display->egl.dpy, EGL_EXTENSIONS);
- if (extensions &&
- strstr(extensions, "EGL_EXT_swap_buffers_with_damage") &&
- strstr(extensions, "EGL_EXT_buffer_age"))
- display->swap_buffers_with_damage =
- (PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC)
- eglGetProcAddress("eglSwapBuffersWithDamageEXT");
-
- if (display->swap_buffers_with_damage)
- debug_out("has EGL_EXT_buffer_age and EGL_EXT_swap_buffers_with_damage\n");
-
-}
-
-static void
-fini_egl(struct display *display)
-{
- eglTerminate(display->egl.dpy);
- eglReleaseThread();
-}
-
-static GLuint
-create_shader(struct window *window, const char *source, GLenum shader_type)
-{
- GLuint shader;
- GLint status;
-
- shader = glCreateShader(shader_type);
- assert(shader != 0);
-
- glShaderSource(shader, 1, (const char **) &source, NULL);
- glCompileShader(shader);
-
- glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
- if (!status) {
- char log[1000];
- GLsizei len;
- glGetShaderInfoLog(shader, 1000, &len, log);
- debug_out("Error: compiling %s: %*s\n",
- shader_type == GL_VERTEX_SHADER ? "vertex" : "fragment",
- len, log);
- exit(1);
- }
-
- return shader;
-}
-
-static void
-init_gl(struct window *window)
-{
- GLuint frag, vert;
- GLuint program;
- GLint status;
-
- frag = create_shader(window, frag_shader_text, GL_FRAGMENT_SHADER);
- vert = create_shader(window, vert_shader_text, GL_VERTEX_SHADER);
-
- program = glCreateProgram();
- glAttachShader(program, frag);
- glAttachShader(program, vert);
- glLinkProgram(program);
-
- glGetProgramiv(program, GL_LINK_STATUS, &status);
- if (!status) {
- char log[1000];
- GLsizei len;
- glGetProgramInfoLog(program, 1000, &len, log);
- debug_out("Error: linking:\n%*s\n", len, log);
- exit(1);
- }
-
- glUseProgram(program);
-
- window->gl.pos = 0;
- window->gl.col = 1;
-
- glBindAttribLocation(program, window->gl.pos, "pos");
- glBindAttribLocation(program, window->gl.col, "color");
- glLinkProgram(program);
-
- window->gl.rotation_uniform =
- glGetUniformLocation(program, "rotation");
-}
-
-static void
-handle_ivi_surface_configure(void *data, struct ivi_surface *ivi_surface,
- int32_t width, int32_t height)
-{
- struct window *window = data;
-
- wl_egl_window_resize(window->native, width, height, 0, 0);
-
- window->geometry.width = width;
- window->geometry.height = height;
-
- if (!window->fullscreen)
- window->window_size = window->geometry;
-}
-
-static const struct ivi_surface_listener ivi_surface_listener = {
- handle_ivi_surface_configure,
-};
-
-static void
-create_ivi_surface(struct window *window, struct display *display)
-{
- uint32_t id_ivisurf = g_id_ivisurf;
- window->ivi_surface =
- ivi_application_surface_create(display->ivi_application,
- id_ivisurf, window->surface);
-
- if (window->ivi_surface == NULL) {
- debug_out("Failed to create ivi_client_surface\n");
- abort();
- }
-
- ivi_surface_add_listener(window->ivi_surface,
- &ivi_surface_listener, window);
-}
-
-static void
-create_surface(struct window *window)
-{
- struct display *display = window->display;
- EGLBoolean ret;
-
- window->surface = wl_compositor_create_surface(display->compositor);
-
- window->native =
- wl_egl_window_create(window->surface,
- window->geometry.width,
- window->geometry.height);
- window->egl_surface =
- weston_platform_create_egl_surface(display->egl.dpy,
- display->egl.conf,
- window->native, NULL);
-
-
- if (display->ivi_application ) {
- create_ivi_surface(window, display);
- } else {
- assert(0);
- }
-
- ret = eglMakeCurrent(window->display->egl.dpy, window->egl_surface,
- window->egl_surface, window->display->egl.ctx);
- assert(ret == EGL_TRUE);
-
- if (!window->frame_sync)
- eglSwapInterval(display->egl.dpy, 0);
-
-}
-
-static void
-destroy_surface(struct window *window)
-{
- /* Required, otherwise segfault in egl_dri2.c: dri2_make_current()
- * on eglReleaseThread(). */
- eglMakeCurrent(window->display->egl.dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
- EGL_NO_CONTEXT);
-
- eglDestroySurface(window->display->egl.dpy, window->egl_surface);
- wl_egl_window_destroy(window->native);
-
- if (window->display->ivi_application)
- ivi_surface_destroy(window->ivi_surface);
- wl_surface_destroy(window->surface);
-
- if (window->callback)
- wl_callback_destroy(window->callback);
-}
-
-static void
-redraw(void *data, struct wl_callback *callback, uint32_t time)
-{
- struct window *window = data;
- struct display *display = window->display;
- static const GLfloat verts[3][2] = {
- { -0.5, -0.5 },
- { 0.5, -0.5 },
- { 0, 0.5 }
- };
-
- static const GLfloat colors_H[3][3] = {
- { 1, 1, 1 },
- { 1, 1, 1 },
- { 1, 1, 1 }
- };
-
- static const GLfloat colors_N[3][3] = {
- { 1, 0, 0 },
- { 0, 1, 0 },
- { 0, 0, 1 }
- };
-
- GLfloat angle;
- GLfloat rotation[4][4] = {
- { 1, 0, 0, 0 },
- { 0, 1, 0, 0 },
- { 0, 0, 1, 0 },
- { 0, 0, 0, 1 }
- };
- static const uint32_t speed_div = 5, benchmark_interval = 5;
- struct wl_region *region;
- EGLint rect[4];
- EGLint buffer_age = 0;
- struct timeval tv;
-
- assert(window->callback == callback);
- window->callback = NULL;
-
- if (callback)
- wl_callback_destroy(callback);
-
- gettimeofday(&tv, NULL);
- time = tv.tv_sec * 1000 + tv.tv_usec / 1000;
- if (window->frames == 0)
- window->benchmark_time = time;
- if (time - window->benchmark_time > (benchmark_interval * 1000)) {
- debug_out("%d frames in %d seconds: %f fps\n",
- window->frames,
- benchmark_interval,
- (float) window->frames / benchmark_interval);
- window->benchmark_time = time;
- window->frames = 0;
- }
-
- angle = (time / speed_div) % 360 * M_PI / 180.0;
- rotation[0][0] = cos(angle);
- rotation[0][2] = sin(angle);
- rotation[2][0] = -sin(angle);
- rotation[2][2] = cos(angle);
-
- if (display->swap_buffers_with_damage)
- eglQuerySurface(display->egl.dpy, window->egl_surface,
- EGL_BUFFER_AGE_EXT, &buffer_age);
-
- glViewport(0, 0, window->geometry.width, window->geometry.height);
-
- glUniformMatrix4fv(window->gl.rotation_uniform, 1, GL_FALSE,
- (GLfloat *) rotation);
-
- glClearColor(0.0, 0.0, 0.0, 0.5);
- glClear(GL_COLOR_BUFFER_BIT);
-
- glVertexAttribPointer(window->gl.pos, 2, GL_FLOAT, GL_FALSE, 0, verts);
- if(app_name == string("HVAC")){
- glVertexAttribPointer(window->gl.col, 3, GL_FLOAT, GL_FALSE, 0, colors_H);
- }
- else{
- glVertexAttribPointer(window->gl.col, 3, GL_FLOAT, GL_FALSE, 0, colors_N);
- }
- glEnableVertexAttribArray(window->gl.pos);
- glEnableVertexAttribArray(window->gl.col);
-
- glDrawArrays(GL_TRIANGLES, 0, 3);
-
- glDisableVertexAttribArray(window->gl.pos);
- glDisableVertexAttribArray(window->gl.col);
-
- if (window->opaque || window->fullscreen) {
- region = wl_compositor_create_region(window->display->compositor);
- wl_region_add(region, 0, 0,
- window->geometry.width,
- window->geometry.height);
- wl_surface_set_opaque_region(window->surface, region);
- wl_region_destroy(region);
- } else {
- wl_surface_set_opaque_region(window->surface, NULL);
- }
-
- if (display->swap_buffers_with_damage && buffer_age > 0) {
- rect[0] = window->geometry.width / 4 - 1;
- rect[1] = window->geometry.height / 4 - 1;
- rect[2] = window->geometry.width / 2 + 2;
- rect[3] = window->geometry.height / 2 + 2;
- display->swap_buffers_with_damage(display->egl.dpy,
- window->egl_surface,
- rect, 1);
- } else {
- eglSwapBuffers(display->egl.dpy, window->egl_surface);
- }
-
- window->frames++;
-}
-
-static void
-registry_handle_global(void *data, struct wl_registry *registry,
- uint32_t name, const char *interface, uint32_t version)
-{
- struct display *d = data;
-
- if (strcmp(interface, "wl_compositor") == 0) {
- d->compositor =
- wl_registry_bind(registry, name,
- &wl_compositor_interface, 1);
- } else if (strcmp(interface, "ivi_application") == 0) {
- d->ivi_application =
- wl_registry_bind(registry, name,
- &ivi_application_interface, 1);
- }
-}
-
-static void
-registry_handle_global_remove(void *data, struct wl_registry *registry,
- uint32_t name)
-{
-}
-
-static const struct wl_registry_listener registry_listener = {
- registry_handle_global,
- registry_handle_global_remove
-};
-
-static void
-signal_int(int signum)
-{
- running = 0;
-}
-
-int
-init_wm(LibWindowmanager *wm)
-{
- char* surfaceIdStr;
-
- if (wm->init(port, token.c_str()) != 0) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] wm init failed. \n");
- return -1;
- }
-
- if (wm->requestSurface(app_name.c_str()) != 0) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] wm request surface failed \n");
- return -1;
- }
-
- wm->set_event_handler(LibWindowmanager::Event_Active, [](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got activated! \n", label);
- });
-
- wm->set_event_handler(LibWindowmanager::Event_Inactive, [](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got inactivated!\n", label);
- });
-
- wm->set_event_handler(LibWindowmanager::Event_Visible, [wm](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got visibled!\n", label);
- });
-
- wm->set_event_handler(LibWindowmanager::Event_Invisible, [](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got invisibled!\n", label);
- });
-
- wm->set_event_handler(LibWindowmanager::Event_SyncDraw, [wm](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got syncdraw!\n", label);
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] try to endDraw %s \n", app_name.c_str());
- wm->endDraw(app_name.c_str());
- });
-
- wm->set_event_handler(LibWindowmanager::Event_FlushDraw, [](char const *label) {
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] Surface %s got flushdraw! \n", label);
- });
-
- do
- {
- surfaceIdStr = getenv("QT_IVI_SURFACE_ID");
- } while (surfaceIdStr == NULL);
-
- g_id_ivisurf = atoi(surfaceIdStr);
- debug_out("************** [SIMPLE EGL] [WM SIMPLE >>>>] IVI_SURFACE_ID: %d \n", g_id_ivisurf);
-
- return 0;
-}
-
-int
-init_hs(LibHomeScreen* hs){
- if(hs->init(port, token)!=0)
- {
- debug_out("************** [SIMPLE EGL] [HS SIMPLE >>>>] homescreen init failed. \n");
- return -1;
- }
-
- hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [](const char* application_name){
- debug_out("************** [SIMPLE EGL] [HS SIMPLE >>>>] Event_TapShortcut application_name = %s \n", application_name);
- if(strcmp(application_name, app_name.c_str()) == 0)
- {
- debug_out("************** [SIMPLE EGL] [HS SIMPLE] try to activesurface %s \n", app_name.c_str());
- wm->activateSurface(app_name.c_str());
- }
- });
-
- hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [](const char* display_message){
- debug_out("************** [SIMPLE EGL] [HS SIMPLE >>>>] Event_OnScreenMessage display_message = %s \n", display_message);
- });
-
- return 0;
-}
-
-int
-main(int argc, char **argv)
-{
- struct sigaction sigint;
- struct window window = { 0 };
- struct display display = { 0 };
-
- if(getenv("ENABLE_DEMO_DEBUG"))
- {
- enable_debug = true;
- }
-
- window.display = &display;
- display.window = &window;
- window.geometry.width = 1080;
- window.geometry.height = 1488;
- window.window_size = window.geometry;
- window.buffer_size = 32;
- window.frame_sync = 1;
-
- if(argc > 2)
- {
- if(string(argv[0]).find("hvac") != string::npos)
- app_name = string("HVAC");
- port = strtol(argv[1], NULL, 10);
- token = argv[2];
- }
-
- debug_out("************** [SIMPLE EGL] [MAIN] app_name: %s, port: %d, token: %s. \n", app_name.c_str(), port, token.c_str());
-
- display.display = wl_display_connect(NULL);
- assert(display.display);
-
- display.registry = wl_display_get_registry(display.display);
- wl_registry_add_listener(display.registry,
- &registry_listener, &display);
-
- wl_display_roundtrip(display.display);
-
- init_egl(&display, &window);
-
- wm = new LibWindowmanager();
- hs = new LibHomeScreen();
-
- if(init_wm(wm)!=0){
- fini_egl(&display);
- if (display.ivi_application)
- ivi_application_destroy(display.ivi_application);
- if (display.compositor)
- wl_compositor_destroy(display.compositor);
- wl_registry_destroy(display.registry);
- wl_display_flush(display.display);
- return -1;
- }
-
- if(init_hs(hs)!=0){
- fini_egl(&display);
- if (display.ivi_application)
- ivi_application_destroy(display.ivi_application);
- if (display.compositor)
- wl_compositor_destroy(display.compositor);
- wl_registry_destroy(display.registry);
- wl_display_flush(display.display);
- return -1;
- }
-
- create_surface(&window);
- init_gl(&window);
-
- //Ctrl+C
- sigint.sa_handler = signal_int;
- sigemptyset(&sigint.sa_mask);
- sigint.sa_flags = SA_RESETHAND;
- sigaction(SIGINT, &sigint, NULL);
-
- eglSwapBuffers(display.egl.dpy, window.egl_surface);
- wm->activateSurface(app_name.c_str());
-
- /* The mainloop here is a little subtle. Redrawing will cause
- * EGL to read events so we can just call
- * wl_display_dispatch_pending() to handle any events that got
- * queued up as a side effect. */
- while (running) {
- wl_display_dispatch_pending(display.display);
- redraw(&window, NULL, 0);
- }
-
- debug_out("************** [SIMPLE EGL] [MAIN] simple-egl exiting! \n");
-
- destroy_surface(&window);
- fini_egl(&display);
-
- if (display.ivi_application)
- ivi_application_destroy(display.ivi_application);
-
- if (display.compositor)
- wl_compositor_destroy(display.compositor);
-
- wl_registry_destroy(display.registry);
- wl_display_flush(display.display);
- wl_display_disconnect(display.display);
-
- return 0;
-}
diff --git a/sample/template/README b/sample/template/README
deleted file mode 100644
index 3012b79..0000000
--- a/sample/template/README
+++ /dev/null
@@ -1,28 +0,0 @@
-==========
- Overview
-==========
- This is the templete that is useful for implementation of Qt application
- by using HomeScreen, WindowManager and SoundManager.
-
-
-===========
- Structure
-===========
- - main.cpp
- The templete for implementation main function for Qt application.
-
- - wmhandler.cpp
- - wmhandler.h
- These file is implemented "slot"
- that is needed by Qt application that uses WindowManager.
- These file should be modified according to Qt application.
-
- - smhandler.cpp
- - smhandler.h
- These file is implemented "signal" and "slot"
- that is needed by Qt application that uses SoundManager.
- These file should be modified according to Qt application.
-
- - README
- This document.
-
diff --git a/sample/template/main.cpp b/sample/template/main.cpp
deleted file mode 100644
index ccbe935..0000000
--- a/sample/template/main.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <QtCore/QDebug>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
-#include <QtCore/QSettings>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
-#include <QtQuickControls2/QQuickStyle>
-#include <QQuickWindow>
-
-#include <libhomescreen/libhomescreen.hpp>
-#include "wmhandler.h"
-#include "smhandler.h"
-
-
-static LibHomeScreen* hs;
-static LibWindowmanager* wm;
-static LibSMWrapper* smw;
-static WmHandler* wmh;
-
-static std::string myname = std::string("Templete");
-
-
-static void onRep(struct json_object* reply_contents);
-static void onEv(const std::string& event, struct json_object* event_contents);
-
-
-int main(int argc, char *argv[])
-{
- QGuiApplication app(argc, argv);
- QQmlApplicationEngine engine;
- QQmlContext* context = engine.rootContext();
- QObject* root;
- QQuickWindow* window;
-
- QQuickStyle::setStyle("AGL");
-
- /*
- * Set argument and option
- */
- QCommandLineParser parser;
- parser.addPositionalArgument("port", app.translate("main", "port for binding"));
- parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
- parser.addHelpOption();
- parser.addVersionOption();
- parser.process(app);
- QStringList positionalArguments = parser.positionalArguments();
-
- if (positionalArguments.length() == 2) {
- /*
- * Get argument
- */
- int port = positionalArguments.takeFirst().toInt();
- QString secret = positionalArguments.takeFirst();
- std::string token = secret.toStdString();
-
-
- /*
- * Get instance
- */
- hs = new LibHomeScreen();
- wm = new LibWindowmanager();
- smw = new LibSMWrapper(port, secret);
- wmh = new WmHandler();
-
-
- /*
- * Set WindowManager
- */
- // Initialize
- if(wm->init(port, token.c_str()) != 0){
- exit(EXIT_FAILURE);
- }
-
- // Application should call requestSurface at first
- if (wm->requestSurface(myname.c_str()) != 0) {
- exit(EXIT_FAILURE);
- }
-
- // Set event handlers for each event
- wm->set_event_handler(LibWindowmanager::Event_Active, [](char const *label) {
- fprintf(stderr, "Surface %s got activated!\n", label);
- });
- wm->set_event_handler(LibWindowmanager::Event_Inactive, [](char const *label) {
- fprintf(stderr, "Surface %s got deactivated!\n", label);
- });
- wm->set_event_handler(LibWindowmanager::Event_Visible, [](char const *label) {
- fprintf(stderr, "Surface %s got visible!\n", label);
- });
- wm->set_event_handler(LibWindowmanager::Event_Invisible, [](char const *label) {
- fprintf(stderr, "Surface %s got invisible!\n", label);
- });
- wm->set_event_handler(LibWindowmanager::Event_SyncDraw, [wm](char const *label) {
- fprintf(stderr, "Surface %s got syncDraw!\n", label);
- // Application should call LibWindowmanager::endDraw() in SyncDraw handler
- wm->endDraw(label);
- });
- wm->set_event_handler(LibWindowmanager::Event_FlushDraw, [](char const *label) {
- fprintf(stderr, "Surface %s got flushDraw!\n", label);
- });
-
- // Initialize WmHandler
- wmh->init(wm, myname.c_str());
-
-
- /*
- * Set HomeScreen
- */
- // Initialize
- hs->init(port, token.c_str());
-
- // Set event handler
- hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [wm](const char* appname) {
- if(myname == appname) {
- qDebug("Surface %s got tapShortcut\n", appname);
- // Application should call LibWindowmanager::endDraw() in TapShortcut handler
- wm->activateSurface(myname.c_str());
- }
- });
-
- // Run event loop for HomeScreen
- hs->runEventloop();
-
-
- /*
- * Set SoundManager
- */
- smw->wrapper_registerCallback(onEv, onRep);
- smw->subscribe(QString("newMainConnection"));
- smw->subscribe(QString("mainConnectionStateChanged"));
- smw->subscribe(QString("removedMainConnection"));
- smw->subscribe(QString("asyncSetSourceState"));
- smw->subscribe(QString("asyncConnect"));
- smw->run_eventloop();
-
- // Set context property for SoundManager
- context->setContextProperty("smw", smw);
-
-
- /*
- * Load qml
- */
- engine.load(QUrl(QStringLiteral("qrc:/QmlForThisApp.qml")));
-
-
- /*
- * Set slot for WindowManager and SoundManager
- */
- root = engine.rootObjects().first();
- window = qobject_cast<QQuickWindow *>(root);
-
- // Set slot for calling LibWindowmanager::activateSurface() when loading qml have completed
- QObject::connect(window, SIGNAL(frameSwapped()),
- wmh, SLOT(slotActivateSurface()));
-
- // Set slot for SoundManager
- QObject::connect(smw, SIGNAL(smEvent(QVariant, QVariant)),
- root, SLOT(slotEvent(QVariant, QVariant)));
- QObject::connect(smw, SIGNAL(smReply(QVariant)),
- root, SLOT(slotReply(QVariant)));
- }
-
- return app.exec();
-}
-
-static void onRep(struct json_object* reply_contents)
-{
- qDebug("%s is called", __FUNCTION__);
- QString str = QString(json_object_get_string(reply_contents));
- QJsonParseError error;
- QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error);
- QJsonObject jobj = jdoc.object();
-
- smw->emit_reply(jobj);
- json_object_put(reply_contents);
-}
-
-static void onEv(const std::string& event, struct json_object* event_contents)
-{
- qDebug("%s is called", __FUNCTION__);
- const QString event_name = QString(event.c_str());
- QString str = QString(json_object_get_string(event_contents));
- QJsonParseError error;
- QJsonDocument jdoc = QJsonDocument::fromJson(str.toUtf8(), &error);
- const QJsonObject jobj = jdoc.object();
- smw->emit_event(event_name, jobj);
-
- json_object_put(event_contents);
-}
-
diff --git a/sample/template/smhandler.cpp b/sample/template/smhandler.cpp
deleted file mode 100644
index 54b94d8..0000000
--- a/sample/template/smhandler.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "libsmwrapper.h"
-using namespace std;
-
-static int create_json_object(const QJsonObject& obj, struct json_object* jobj);
-static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj);
-static bool put_array_to_jobj(const char* key, const QJsonArray& qarray, struct json_object* jobj);
-
-LibSMWrapper::LibSMWrapper(QObject *parent) :
- QObject(parent)
-{
- /* This is not enabled */
- //libsm = new LibSoundmanager();
-}
-
-LibSMWrapper::LibSMWrapper(const int port, const QString& token, QObject *parent) :
- QObject(parent)
-{
- libsm = new LibSoundmanager(port, token.toStdString());
-}
-
-LibSMWrapper::~LibSMWrapper()
-{
- delete libsm;
-}
-
-int LibSMWrapper::call(const QString &verb, const QString &arg)
-{
- // translate QJsonObject to struct json_object
- struct json_object* jobj = json_object_new_object();
- QJsonDocument jsonDoc = QJsonDocument::fromJson(arg.toUtf8());
- const QJsonObject jsonObj = jsonDoc.object();
- int ret = create_json_object(jsonObj, jobj);
- if(ret < 0)
- {
- return -1;
- }
- return libsm->call(verb.toStdString().c_str(), jobj);
-}
-
-static int create_json_object(const QJsonObject& obj, struct json_object* jobj)
-{
- try{
- for(auto itr = obj.begin(); itr != obj.end();++itr)
- {
- string key = itr.key().toStdString();
- //const char* key = itr.key().toStdString().c_str(); // Do not code like this. string is removed if size is over 16!!
-
- bool ret = put_val_to_jobj(key.c_str(), itr.value(),jobj);
- if(!ret){
- /*This is not implemented*/
- qDebug("JsonArray can't parse for now");
- return -1;
- // ToDo
- // For now, array may not be inputted for soundmanager
- // But use case absolutely exists
- /*QJsonArray qarray = itr.value().toArray();
- ret = put_array_to_jobj(key, qarray, jobj);*/
- }
- }
- }
- catch(...){
- qDebug("Json parse error occured");
- return -1;
- }
- return 0;
-}
-
-static bool put_val_to_jobj(const char* key, const QJsonValue& val, struct json_object* jobj)
-{
- if(val.isArray()){
- return false; // Array can't input
- }
- if(val.isString()){
- string value = val.toString().toStdString();
- json_object_object_add(jobj, key, json_object_new_string(value.c_str()));
- }
- else{
- const int value = val.toInt();
- json_object_object_add(jobj, key, json_object_new_int(value));
- }
- return true;
-}
-
-static bool put_array_to_jobj(const char* key, const QJsonArray& qarray, struct json_object* jobj)
-{
- // ToDo Fix this !!
-/* struct json_object* jarray = json_object_new_array();
-
- bool ret;
- for(auto jitr = qarray.begin(); jitr != qarray.end(); ++jitr){
- struct json_object* tmp = json_object_new_object();
- ret = put_val_to_jobj(key,jitr,tmp);
- if(!ret)
- {
- put_array_to_jobj(key,jitr,tmp);
- }
- json_object_array_add(jarray, tmp);
- }
- json_object_object_add(jobj, key, jarray);
- return true;*/
-}
-
-void LibSMWrapper::wrapper_registerCallback(
- void (*event_func)(const string& event, struct json_object* event_contents),
- void (*reply_func)(struct json_object* reply_contents))
-{
- libsm->register_callback(event_func, reply_func);
-}
-
-void LibSMWrapper::subscribe(const QString event_name)
-{
- std::string str = event_name.toStdString();
- libsm->subscribe(str);
-}
-
-void LibSMWrapper::unsubscribe(const QString event_name)
-{
- std::string str = event_name.toStdString();
- libsm->unsubscribe(str);
-}
-
-void LibSMWrapper::run_eventloop()
-{
- libsm->run_eventloop();
-}
-
-void LibSMWrapper::print(const QString &str)
-{
- qDebug("%s is called", str.toStdString().c_str());
-}
-
-void LibSMWrapper::emit_event(const QString &event, const QJsonObject &msg)
-{
- qDebug("emit smEvent signal @%s", __FUNCTION__);
- emit smEvent(event, msg);
-}
-void LibSMWrapper::emit_reply(const QJsonObject &msg)
-{
- qDebug("emit smReply signal @%s", __FUNCTION__);
- emit smReply(msg);
-} \ No newline at end of file
diff --git a/sample/template/smhandler.h b/sample/template/smhandler.h
deleted file mode 100644
index 3954a29..0000000
--- a/sample/template/smhandler.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef SIGNALER_H
-#define SIGNALER_H
-
- #include <QObject>
- #include <QVariant>
- #include <QJsonDocument>
- #include <QtCore/QJsonObject>
- #include <libsoundmanager/libsoundmanager.hpp>
- #include <QString>
- #include <string>
-
-
-class LibSMWrapper : public QObject
-{
- Q_OBJECT
-public: // method
- explicit LibSMWrapper(QObject *parent = nullptr);
- LibSMWrapper(const int port, const QString& token, QObject *parent = nullptr);
- ~LibSMWrapper();
-
- void wrapper_registerCallback(
- void (*event_func)(const std::string& event, struct json_object* event_contents),
- void (*reply_func)(struct json_object* reply_contents)
- );
- void subscribe(const QString event_name);
- void unsubscribe(const QString event_name);
- void run_eventloop();
-
- void emit_event(const QString &event, const QJsonObject &msg);
- void emit_reply(const QJsonObject &msg);
-public slots:
- int call(const QString &verb, const QString &arg);
- void print(const QString &str);
-signals:
- void smEvent(const QVariant &event, const QVariant &msg);
- void smReply(const QVariant &msg);
-
-private:
- LibSoundmanager* libsm;
-};
-
-
-#endif /*SIGNALER_H*/ \ No newline at end of file
diff --git a/sample/template/wmhandler.cpp b/sample/template/wmhandler.cpp
deleted file mode 100644
index 761915f..0000000
--- a/sample/template/wmhandler.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "wmhandler.h"
-#include <unistd.h>
-
-
-void WmHandler::init(LibWindowmanager *p_wm, std::string applabel)
-{
- mp_wm = p_wm;
- m_applabel = applabel;
-}
-
-void WmHandler::slotActivateSurface() {
- mp_wm->activateSurface(m_applabel.c_str());
-}
-
-WmHandler::WmHandler(QObject *parent)
- :QObject(parent)
-{
-}
-
-WmHandler::~WmHandler() { }
diff --git a/sample/template/wmhandler.h b/sample/template/wmhandler.h
deleted file mode 100644
index 5442d8e..0000000
--- a/sample/template/wmhandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef WMHANDLER_H
-#define WMHANDLER_H
-#include <QObject>
-#include <QUrl>
-#include <QVariant>
-#include <string>
-#include <vector>
-#include <functional>
-#include <libwindowmanager.h>
-
-class WmHandler : public QObject {
-Q_OBJECT
-public:
- explicit WmHandler(QObject *parent = nullptr);
- ~WmHandler();
-
- WmHandler(const WmHandler &) = delete;
- WmHandler &operator=(const WmHandler &) = delete;
-
-public:
- static WmHandler &instance();
- void init(LibWindowmanager *p_wm, std::string applabel);
-
-public slots:
- void slotActivateSurface();
-
-private:
- LibWindowmanager* mp_wm;
- std::string m_applabel;
-};
-#endif // WMHANDLER_H