From 5c0922653889209693ca3f6495c50e6cf900cc1e Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Sun, 1 Feb 2015 13:06:58 +0900 Subject: [PATCH] tizen 2.3 release --- CMakeLists.txt | 55 +- data-provider-master.desktop | 9 - data-provider-master.rule | 5 - data/CMakeLists.txt | 9 +- data/data-provider-master.service | 12 +- data/{ => device}/abi.ini | 3 - data/{ => device}/wayland.mobile.conf.ini | 7 +- data/{ => device}/wayland.mobile.resolution.ini | 0 data/{ => device}/wayland.wearable.conf.ini | 7 +- data/{ => device}/wayland.wearable.resolution.ini | 0 data/device/x11.mobile.320x480.conf.ini | 38 + data/device/x11.mobile.320x480.resolution.ini | 14 + data/device/x11.mobile.360x360.conf.ini | 0 data/device/x11.mobile.360x360.resolution.ini | 0 data/device/x11.mobile.360x480.conf.ini | 0 data/device/x11.mobile.360x480.resolution.ini | 0 data/device/x11.mobile.480x800.conf.ini | 45 + data/device/x11.mobile.480x800.resolution.ini | 14 + data/device/x11.mobile.conf.ini | 40 + data/{ => device}/x11.mobile.resolution.ini | 0 .../x11.wearable.360x360.conf.ini} | 10 +- data/device/x11.wearable.360x360.resolution.ini | 14 + data/device/x11.wearable.360x480.conf.ini | 38 + data/device/x11.wearable.360x480.resolution.ini | 14 + data/device/x11.wearable.conf.ini | 40 + data/device/x11.wearable.resolution.ini | 14 + data/dump_dynamicbox.sh | 8 + data/dump_livebox.sh | 7 - data/emulator/abi.ini | 14 + data/emulator/wayland.mobile.conf.ini | 38 + data/emulator/wayland.mobile.resolution.ini | 13 + data/emulator/wayland.wearable.conf.ini | 38 + .../wayland.wearable.resolution.ini} | 0 data/emulator/x11.mobile.320x480.conf.ini | 38 + data/emulator/x11.mobile.320x480.resolution.ini | 14 + data/emulator/x11.mobile.360x360.conf.ini | 0 data/emulator/x11.mobile.360x360.resolution.ini | 0 data/emulator/x11.mobile.360x480.conf.ini | 0 data/emulator/x11.mobile.360x480.resolution.ini | 0 data/emulator/x11.mobile.480x800.conf.ini | 45 + data/emulator/x11.mobile.480x800.resolution.ini | 14 + data/emulator/x11.mobile.conf.ini | 40 + data/emulator/x11.mobile.resolution.ini | 13 + .../x11.wearable.360x360.conf.ini} | 14 +- data/emulator/x11.wearable.360x360.resolution.ini | 14 + data/emulator/x11.wearable.360x480.conf.ini | 38 + data/emulator/x11.wearable.360x480.resolution.ini | 14 + data/emulator/x11.wearable.conf.ini | 40 + data/emulator/x11.wearable.resolution.ini | 14 + data/mobile.data-provider-master.service | 29 - include/buffer_handler.h | 44 +- include/client_life.h | 4 +- include/conf.h | 173 +- include/debug.h | 2 + include/event.h | 59 +- include/group.h | 4 +- include/instance.h | 117 +- include/io.h | 6 +- include/lite-errno.h | 53 +- include/package.h | 55 +- include/parser.h | 18 +- include/setting.h | 10 + include/slave_life.h | 18 +- include/util.h | 1 - packaging/data-provider-master.manifest | 31 +- packaging/data-provider-master.spec | 82 +- .../CMakeLists.txt | 6 +- .../dynamicbox.xml | 35 +- pkgmgr_dynamicbox/dynamicbox.xsd | 88 + .../include/dlist.h | 0 {pkgmgr_livebox => pkgmgr_dynamicbox}/src/dlist.c | 0 pkgmgr_dynamicbox/src/service_register.c | 3308 +++++++++++ pkgmgr_livebox/src/service_register.c | 3194 ----------- res/edje/CMakeLists.txt | 8 - src/abi.c | 18 +- src/badge_service.c | 28 +- src/buffer_handler.c | 650 +-- src/buffer_handler_wayland.c | 116 +- src/client_life.c | 86 +- src/client_rpc.c | 26 +- src/conf.c | 953 +-- src/critical_log.c | 27 +- src/dead_monitor.c | 1 + src/event.c | 930 ++- src/fault_manager.c | 38 +- src/file_service.c | 53 +- src/group.c | 92 +- src/instance.c | 1619 +++--- src/io.c | 137 +- src/liveinfo.c | 6 +- src/main.c | 109 +- src/notification_service.c | 243 +- src/package.c | 636 ++- src/parser.c | 195 +- src/pkgmgr.c | 80 +- src/script_handler.c | 225 +- src/server.c | 6042 +++++++++++--------- src/service_common.c | 16 +- src/setting.c | 114 +- src/shortcut_service.c | 20 +- src/slave_life.c | 594 +- src/slave_rpc.c | 99 +- src/util.c | 167 +- src/util_wayland.c | 8 +- src/util_x11.c | 18 +- src/utility_service.c | 52 +- src/xmonitor.c | 63 +- src/xmonitor_wayland.c | 28 +- util_liveinfo/CMakeLists.txt | 2 +- util_liveinfo/include/node.h | 8 +- util_liveinfo/src/liveinfo.c | 3133 +++++----- util_liveinfo/src/node.c | 508 +- 112 files changed, 13270 insertions(+), 12019 deletions(-) mode change 100755 => 100644 CMakeLists.txt delete mode 100644 data-provider-master.desktop delete mode 100644 data-provider-master.rule rename data/{ => device}/abi.ini (83%) rename data/{ => device}/wayland.mobile.conf.ini (84%) rename data/{ => device}/wayland.mobile.resolution.ini (100%) rename data/{ => device}/wayland.wearable.conf.ini (87%) rename data/{ => device}/wayland.wearable.resolution.ini (100%) create mode 100644 data/device/x11.mobile.320x480.conf.ini create mode 100644 data/device/x11.mobile.320x480.resolution.ini create mode 100644 data/device/x11.mobile.360x360.conf.ini create mode 100644 data/device/x11.mobile.360x360.resolution.ini create mode 100644 data/device/x11.mobile.360x480.conf.ini create mode 100644 data/device/x11.mobile.360x480.resolution.ini create mode 100644 data/device/x11.mobile.480x800.conf.ini create mode 100644 data/device/x11.mobile.480x800.resolution.ini create mode 100644 data/device/x11.mobile.conf.ini rename data/{ => device}/x11.mobile.resolution.ini (100%) rename data/{x11.wearable.conf.ini => device/x11.wearable.360x360.conf.ini} (88%) create mode 100644 data/device/x11.wearable.360x360.resolution.ini create mode 100644 data/device/x11.wearable.360x480.conf.ini create mode 100644 data/device/x11.wearable.360x480.resolution.ini create mode 100644 data/device/x11.wearable.conf.ini create mode 100644 data/device/x11.wearable.resolution.ini create mode 100644 data/dump_dynamicbox.sh delete mode 100644 data/dump_livebox.sh create mode 100644 data/emulator/abi.ini create mode 100644 data/emulator/wayland.mobile.conf.ini create mode 100644 data/emulator/wayland.mobile.resolution.ini create mode 100644 data/emulator/wayland.wearable.conf.ini rename data/{x11.wearable.resolution.ini => emulator/wayland.wearable.resolution.ini} (100%) create mode 100644 data/emulator/x11.mobile.320x480.conf.ini create mode 100644 data/emulator/x11.mobile.320x480.resolution.ini create mode 100644 data/emulator/x11.mobile.360x360.conf.ini create mode 100644 data/emulator/x11.mobile.360x360.resolution.ini create mode 100644 data/emulator/x11.mobile.360x480.conf.ini create mode 100644 data/emulator/x11.mobile.360x480.resolution.ini create mode 100644 data/emulator/x11.mobile.480x800.conf.ini create mode 100644 data/emulator/x11.mobile.480x800.resolution.ini create mode 100644 data/emulator/x11.mobile.conf.ini create mode 100644 data/emulator/x11.mobile.resolution.ini rename data/{x11.mobile.conf.ini => emulator/x11.wearable.360x360.conf.ini} (83%) create mode 100644 data/emulator/x11.wearable.360x360.resolution.ini create mode 100644 data/emulator/x11.wearable.360x480.conf.ini create mode 100644 data/emulator/x11.wearable.360x480.resolution.ini create mode 100644 data/emulator/x11.wearable.conf.ini create mode 100644 data/emulator/x11.wearable.resolution.ini delete mode 100644 data/mobile.data-provider-master.service rename {pkgmgr_livebox => pkgmgr_dynamicbox}/CMakeLists.txt (83%) rename pkgmgr_livebox/livebox.xml => pkgmgr_dynamicbox/dynamicbox.xml (61%) create mode 100644 pkgmgr_dynamicbox/dynamicbox.xsd rename {pkgmgr_livebox => pkgmgr_dynamicbox}/include/dlist.h (100%) rename {pkgmgr_livebox => pkgmgr_dynamicbox}/src/dlist.c (100%) create mode 100644 pkgmgr_dynamicbox/src/service_register.c delete mode 100644 pkgmgr_livebox/src/service_register.c diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index f11d495..c0a6f7f --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(data-provider-master C) INCLUDE(FindPkgConfig) pkg_check_modules(pkg REQUIRED - ail dlog aul vconf @@ -22,12 +21,13 @@ pkg_check_modules(pkg REQUIRED badge-service libsmack shortcut + pkgmgr-info libsystemd-daemon ) IF (LIVEBOX) pkg_check_modules(pkg_livebox REQUIRED - livebox-service + dynamicbox_service ) ENDIF (LIVEBOX) @@ -52,7 +52,7 @@ pkg_check_modules(pkg_extra REQUIRED ENDIF (WAYLAND_SUPPORT) SET(PACKAGE "${PROJECT_NAME}") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g -fPIE") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -78,6 +78,7 @@ ADD_DEFINITIONS("-DSHORTCUT_SMACK_LABEL=\"data-provider-master::shortcut\"") ADD_DEFINITIONS("-DNOTIFICATION_SMACK_LABEL=\"data-provider-master::notification\"") ADD_DEFINITIONS("-DBADGE_SMACK_LABEL=\"data-provider-master::badge\"") ADD_DEFINITIONS("-DDATA_SHARE_LABEL=\"data-provider-master::share\"") +ADD_DEFINITIONS("-DDEFAULT_SMACK_LABEL=\"data-provider-master\"") ADD_DEFINITIONS("-DDEFAULT_MASTER_CONF=\"/usr/share/data-provider-master/conf.ini\"") @@ -100,7 +101,6 @@ SET(BUILD_SOURCE src/badge_service.c src/notification_service.c src/service_common.c - src/conf.c ) IF (LIVEBOX) @@ -126,11 +126,12 @@ IF (LIVEBOX) src/pkgmgr.c src/event.c src/file_service.c + src/conf.c ) IF (WAYLAND_SUPPORT) ADD_DEFINITIONS("-DHAVE_WAYLAND") - SET(BUILD_SOURCE + SET(BUILD_SOURCE ${BUILD_SOURCE} src/xmonitor_wayland.c src/buffer_handler_wayland.c @@ -140,7 +141,7 @@ IF (LIVEBOX) IF (X11_SUPPORT) ADD_DEFINITIONS("-DHAVE_X11") - SET(BUILD_SOURCE + SET(BUILD_SOURCE ${BUILD_SOURCE} src/xmonitor.c src/buffer_handler.c @@ -151,7 +152,7 @@ ENDIF (LIVEBOX) IF (WAYLAND_SUPPORT) ADD_DEFINITIONS("-DHAVE_WAYLAND") - SET(BUILD_SOURCE + SET(BUILD_SOURCE ${BUILD_SOURCE} src/util_wayland.c ) @@ -159,7 +160,7 @@ ENDIF (WAYLAND_SUPPORT) IF (X11_SUPPORT) ADD_DEFINITIONS("-DHAVE_X11") - SET(BUILD_SOURCE + SET(BUILD_SOURCE ${BUILD_SOURCE} src/util_x11.c ) @@ -176,32 +177,48 @@ ADD_DEFINITIONS(${pkg_livebox_LDFLAGS}) ADD_EXECUTABLE(${PROJECT_NAME} ${BUILD_SOURCE}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkg_LDFLAGS} ${pkg_extra_LDFLAGS} ${pkg_livebox_LDFLAGS} "-ldl -lrt") +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkg_LDFLAGS} ${pkg_extra_LDFLAGS} ${pkg_livebox_LDFLAGS} "-ldl -lrt -pie") IF (LIVEBOX) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/abi.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PRODUCT}.conf.ini DESTINATION /usr/share/data-provider-master RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PRODUCT}.resolution.ini DESTINATION /usr/share/data-provider-master RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/abi.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/${PRODUCT}.conf.ini DESTINATION /usr/share/data-provider-master RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/${PRODUCT}.resolution.ini DESTINATION /usr/share/data-provider-master RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.320x480.conf.ini DESTINATION /usr/share/data-provider-master/320x480 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.320x480.resolution.ini DESTINATION /usr/share/data-provider-master/320x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.480x800.conf.ini DESTINATION /usr/share/data-provider-master/480x800 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.480x800.resolution.ini DESTINATION /usr/share/data-provider-master/480x800 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.360x480.conf.ini DESTINATION /usr/share/data-provider-master/360x480 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.360x480.resolution.ini DESTINATION /usr/share/data-provider-master/360x480 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.360x360.conf.ini DESTINATION /usr/share/data-provider-master/360x360 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.360x360.resolution.ini DESTINATION /usr/share/data-provider-master/360x360 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.conf.ini DESTINATION /usr/share/data-provider-master/720x1280 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.mobile.resolution.ini DESTINATION /usr/share/data-provider-master/720x1280 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.conf.ini DESTINATION /usr/share/data-provider-master/320x320 RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/x11.wearable.resolution.ini DESTINATION /usr/share/data-provider-master/320x320 RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/${PRODUCT}.conf.ini DESTINATION /usr/share/data-provider-master RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${TARGET}/${PRODUCT}.resolution.ini DESTINATION /usr/share/data-provider-master RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) ENDIF (LIVEBOX) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "${PROJECT_NAME}") -IF (MOBILE) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.rule DESTINATION /opt/etc/smack/accesses.d) -ELSE (MOBILE) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -ENDIF (MOBILE) # INCLUDE FOR BUILD & INSTALL .PO FILES ADD_SUBDIRECTORY(res) ADD_SUBDIRECTORY(data) IF (LIVEBOX) -ADD_SUBDIRECTORY(pkgmgr_livebox) +ADD_SUBDIRECTORY(pkgmgr_dynamicbox) +ENDIF (LIVEBOX) IF (X11_SUPPORT) IF ("${ENGINEER_BINARY}" STREQUAL "true") ADD_SUBDIRECTORY(util_liveinfo) ENDIF ("${ENGINEER_BINARY}" STREQUAL "true") ENDIF (X11_SUPPORT) -ENDIF (LIVEBOX) # End of a file diff --git a/data-provider-master.desktop b/data-provider-master.desktop deleted file mode 100644 index 77d74ae..0000000 --- a/data-provider-master.desktop +++ /dev/null @@ -1,9 +0,0 @@ -Name=Live Data Provider - Master -Type=Application -Exec=/usr/bin/data-provider-master -Icon=data-provider-master.png -NoDisplay=True -Network=True -Comment=Homescreen-Live Box content data provider (master) -X-TIZEN-TaskManage=False -X-TIZEN-Multiple=False diff --git a/data-provider-master.rule b/data-provider-master.rule deleted file mode 100644 index c8dc2de..0000000 --- a/data-provider-master.rule +++ /dev/null @@ -1,5 +0,0 @@ -data-provider-master notification::db rw -data-provider-master ail::db rw -data-provider-master svi-data x -data-provider-master data-provider-master::db rw -data-provider-master system::vconf_system rwxat diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index af462e3..56d64c4 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,7 +1,4 @@ -#INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master DESTINATION /etc/rc.d/init.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -IF (MOBILE) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/mobile.data-provider-master.service DESTINATION /usr/lib/systemd/user/ RENAME data-provider-master.service PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -ELSE (MOBILE) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master.service DESTINATION /usr/lib/systemd/system/ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/dump_livebox.sh DESTINATION /opt/etc/dump.d/module.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -ENDIF (MOBILE) +IF (LIVEBOX) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/dump_dynamicbox.sh DESTINATION /opt/etc/dump.d/module.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +ENDIF (LIVEBOX) diff --git a/data/data-provider-master.service b/data/data-provider-master.service index e359660..4994f4e 100644 --- a/data/data-provider-master.service +++ b/data/data-provider-master.service @@ -16,20 +16,12 @@ [Unit] Description=Data Provider daemon -DefaultDependencies=no -After=check-mount.service +After=xorg.target [Service] -Environment=MULTISENSE_SND_PLAYER=tizen_snd_player -Environment=ELM_MODULES=ctxpopup_copypasteUI>entry/api:datetime_input_popup>datetime/api:object_dump>win/api:access_output_tts>access/api -Environment=EINA_LOG_LEVEL=1 -Environment=ECORE_INPUT_TIMEOUT_FIX=0 -Environment=EINA_LOG_LEVELS=ecore_x:4,evas_main:1 Environment=BUFMGR_LOCK_TYPE="once" Environment=BUFMGR_MAP_CACHE="true" -Environment=ELM_PROFILE=mobile -EnvironmentFile=-/run/tizen-mobile-env -Type=simple +Type=notify ExecStart=/usr/bin/data-provider-master RestartSec=1 Restart=always diff --git a/data/abi.ini b/data/device/abi.ini similarity index 83% rename from data/abi.ini rename to data/device/abi.ini index ad8eec3..a587be5 100644 --- a/data/abi.ini +++ b/data/device/abi.ini @@ -12,6 +12,3 @@ package=gi2qxenosh.osp-appwidget-service [app] package=/APPID/ - -[dali] -package=provider.multi-livebox diff --git a/data/wayland.mobile.conf.ini b/data/device/wayland.mobile.conf.ini similarity index 84% rename from data/wayland.mobile.conf.ini rename to data/device/wayland.mobile.conf.ini index c9b95c7..468b696 100644 --- a/data/wayland.mobile.conf.ini +++ b/data/device/wayland.mobile.conf.ini @@ -16,7 +16,7 @@ slave_relaunch_count=3 max_log_line=1000 max_log_file=3 sqilte_flush_max=1048576 -#db_path=/opt/dbspace/.livebox.db +#db_path=/opt/dbspace/.dynamicbox.db #share_path=/opt/usr/share/live_magazine/ log_path=/tmp/.dbox.service #always_path=/opt/usr/share/live_magazine/always @@ -31,7 +31,8 @@ overwrite_content=false com_core_thread=true use_xmonitor=false #input=/dev/input/event2 -pd_request_timeout=5.0 +gbar_request_timeout=5.0 premultiplied=1 #emergency_disk=source=tmpfs;type=tmpfs;option=size=6M -#services=[livebox],[shortcut],[notification],[utility],[badge],[file] +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true diff --git a/data/wayland.mobile.resolution.ini b/data/device/wayland.mobile.resolution.ini similarity index 100% rename from data/wayland.mobile.resolution.ini rename to data/device/wayland.mobile.resolution.ini diff --git a/data/wayland.wearable.conf.ini b/data/device/wayland.wearable.conf.ini similarity index 87% rename from data/wayland.wearable.conf.ini rename to data/device/wayland.wearable.conf.ini index 2866b74..034a081 100644 --- a/data/wayland.wearable.conf.ini +++ b/data/device/wayland.wearable.conf.ini @@ -16,7 +16,7 @@ slave_relaunch_count=3 max_log_line=1000 max_log_file=3 sqilte_flush_max=1048576 -#db_path=/opt/dbspace/.livebox.db +#db_path=/opt/dbspace/.dynamicbox.db #share_path=/opt/usr/share/live_magazine/ log_path=/tmp/.dbox.service #always_path=/opt/usr/share/live_magazine/always @@ -31,7 +31,8 @@ overwrite_content=false com_core_thread=true use_xmonitor=false #input=/dev/input/event2 -pd_request_timeout=5.0 +gbar_request_timeout=5.0 premultiplied=0 #emergency_disk=source=tmpfs;type=tmpfs;option=size=6M -services=[livebox],[shortcut],[badge] +services=[dynamicbox],[shortcut],[badge] +#auto_align=true diff --git a/data/wayland.wearable.resolution.ini b/data/device/wayland.wearable.resolution.ini similarity index 100% rename from data/wayland.wearable.resolution.ini rename to data/device/wayland.wearable.resolution.ini diff --git a/data/device/x11.mobile.320x480.conf.ini b/data/device/x11.mobile.320x480.conf.ini new file mode 100644 index 0000000..4811331 --- /dev/null +++ b/data/device/x11.mobile.320x480.conf.ini @@ -0,0 +1,38 @@ +base_width=320 +base_height=480 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +#input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true diff --git a/data/device/x11.mobile.320x480.resolution.ini b/data/device/x11.mobile.320x480.resolution.ini new file mode 100644 index 0000000..c848adf --- /dev/null +++ b/data/device/x11.mobile.320x480.resolution.ini @@ -0,0 +1,14 @@ +1x1=0x0 +2x1=0x0 +2x2=0x0 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=302x302 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x480 +base=320x480 diff --git a/data/device/x11.mobile.360x360.conf.ini b/data/device/x11.mobile.360x360.conf.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/device/x11.mobile.360x360.resolution.ini b/data/device/x11.mobile.360x360.resolution.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/device/x11.mobile.360x480.conf.ini b/data/device/x11.mobile.360x480.conf.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/device/x11.mobile.360x480.resolution.ini b/data/device/x11.mobile.360x480.resolution.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/device/x11.mobile.480x800.conf.ini b/data/device/x11.mobile.480x800.conf.ini new file mode 100644 index 0000000..0519334 --- /dev/null +++ b/data/device/x11.mobile.480x800.conf.ini @@ -0,0 +1,45 @@ +base_width=480 +base_height=800 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=20.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event1 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +auto_align=false +use_event_time=true +use_gettimeofday=false +slave_event_boost_on=-10 +slave_event_boost_off=0 +event_filter=0.5 +#slave_limit_to_ttl=true +#frame_skip=5 diff --git a/data/device/x11.mobile.480x800.resolution.ini b/data/device/x11.mobile.480x800.resolution.ini new file mode 100644 index 0000000..63ad36e --- /dev/null +++ b/data/device/x11.mobile.480x800.resolution.ini @@ -0,0 +1,14 @@ +1x1=126x126 +2x1=0x0 +2x2=0x0 +4x1=0x0 +4x2=470x234 +4x3=0x0 +4x4=470x470 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=480x800 +base=480x800 diff --git a/data/device/x11.mobile.conf.ini b/data/device/x11.mobile.conf.ini new file mode 100644 index 0000000..174ff1a --- /dev/null +++ b/data/device/x11.mobile.conf.ini @@ -0,0 +1,40 @@ +base_width=720 +base_height=1280 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +#input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true +#use_event_time=true +event_filter=0.5 diff --git a/data/x11.mobile.resolution.ini b/data/device/x11.mobile.resolution.ini similarity index 100% rename from data/x11.mobile.resolution.ini rename to data/device/x11.mobile.resolution.ini diff --git a/data/x11.wearable.conf.ini b/data/device/x11.wearable.360x360.conf.ini similarity index 88% rename from data/x11.wearable.conf.ini rename to data/device/x11.wearable.360x360.conf.ini index 260dadb..0e5aff4 100644 --- a/data/x11.wearable.conf.ini +++ b/data/device/x11.wearable.360x360.conf.ini @@ -1,5 +1,5 @@ -base_width=320 -base_height=320 +base_width=360 +base_height=360 minimum_period=1.0 #script=edje #default_abi=c @@ -7,7 +7,7 @@ minimum_period=1.0 default_period=-1.0 default_packet_time=0.0001 #default_content=default -minimum_space=104857600 +minimum_space=1048576 #replace_tag=/APPID/ slave_ttl=0.0 slave_activate_time=30.0 @@ -30,8 +30,10 @@ debug_mode=false overwrite_content=false com_core_thread=true use_xmonitor=false -#input=/dev/input/event2 +input=/dev/input/event0 pd_request_timeout=5.0 premultiplied=0 #emergency_disk=source=tmpfs;type=tmpfs;option=size=6M services=[livebox],[shortcut],[badge] +auto_align=false +check_lcd=false diff --git a/data/device/x11.wearable.360x360.resolution.ini b/data/device/x11.wearable.360x360.resolution.ini new file mode 100644 index 0000000..b54c8a9 --- /dev/null +++ b/data/device/x11.wearable.360x360.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=360x360 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=360x360 +base=360x360 diff --git a/data/device/x11.wearable.360x480.conf.ini b/data/device/x11.wearable.360x480.conf.ini new file mode 100644 index 0000000..f540ec3 --- /dev/null +++ b/data/device/x11.wearable.360x480.conf.ini @@ -0,0 +1,38 @@ +base_width=360 +base_height=480 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event0 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[dynamicbox],[shortcut],[badge] +check_lcd=false diff --git a/data/device/x11.wearable.360x480.resolution.ini b/data/device/x11.wearable.360x480.resolution.ini new file mode 100644 index 0000000..fea1ffa --- /dev/null +++ b/data/device/x11.wearable.360x480.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=360x480 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=360x480 +base=360x480 diff --git a/data/device/x11.wearable.conf.ini b/data/device/x11.wearable.conf.ini new file mode 100644 index 0000000..6119d57 --- /dev/null +++ b/data/device/x11.wearable.conf.ini @@ -0,0 +1,40 @@ +base_width=320 +base_height=320 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +#input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[dynamicbox],[shortcut],[badge] +#auto_align=true +#use_event_time=true +check_lcd=false diff --git a/data/device/x11.wearable.resolution.ini b/data/device/x11.wearable.resolution.ini new file mode 100644 index 0000000..5b6923e --- /dev/null +++ b/data/device/x11.wearable.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=320x320 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x320 +base=320x320 diff --git a/data/dump_dynamicbox.sh b/data/dump_dynamicbox.sh new file mode 100644 index 0000000..1791a31 --- /dev/null +++ b/data/dump_dynamicbox.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +DBOX_DEBUG=$1/dynamicbox +mkdir -p ${DBOX_DEBUG} +/bin/cp -r /opt/usr/share/live_magazine ${DBOX_DEBUG} +/bin/cp -r /tmp/.dbox.service ${DBOX_DEBUG}/log +/bin/cp -r /opt/dbspace/.dynamicbox.db ${DBOX_DEBUG} +ls -la /tmp/ | /bin/grep srw > ${DBOX_DEBUG}/log/tmp.hidden_files diff --git a/data/dump_livebox.sh b/data/dump_livebox.sh deleted file mode 100644 index 2fb6c32..0000000 --- a/data/dump_livebox.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -LIVEBOX_DEBUG=$1/livebox -mkdir -p ${LIVEBOX_DEBUG} -/bin/cp -r /opt/usr/share/live_magazine ${LIVEBOX_DEBUG} -/bin/cp -r /tmp/.dbox.service ${LIVEBOX_DEBUG}/log -ls -la /tmp/ | /bin/grep srw > ${LIVEBOX_DEBUG}/log/tmp.hidden_files diff --git a/data/emulator/abi.ini b/data/emulator/abi.ini new file mode 100644 index 0000000..a587be5 --- /dev/null +++ b/data/emulator/abi.ini @@ -0,0 +1,14 @@ +[c] +package=org.tizen.data-provider-slave + +[cpp] +package=org.tizen.data-provider-slave + +[html] +package=dbox.web-provider + +[osp] +package=gi2qxenosh.osp-appwidget-service + +[app] +package=/APPID/ diff --git a/data/emulator/wayland.mobile.conf.ini b/data/emulator/wayland.mobile.conf.ini new file mode 100644 index 0000000..f58503f --- /dev/null +++ b/data/emulator/wayland.mobile.conf.ini @@ -0,0 +1,38 @@ +base_width=720 +base_height=1280 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=shm +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=1 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true diff --git a/data/emulator/wayland.mobile.resolution.ini b/data/emulator/wayland.mobile.resolution.ini new file mode 100644 index 0000000..e2b5a17 --- /dev/null +++ b/data/emulator/wayland.mobile.resolution.ini @@ -0,0 +1,13 @@ +1x1=175x175 +2x1=354x175 +2x2=354x354 +4x1=712x175 +4x2=712x354 +4x3=712x533 +4x4=712x712 +4x5=712x891 +4x6=712x1070 +21x21=224x215 +23x21=680x215 +23x23=680x653 +0x0=720x1280 diff --git a/data/emulator/wayland.wearable.conf.ini b/data/emulator/wayland.wearable.conf.ini new file mode 100644 index 0000000..a57f6ba --- /dev/null +++ b/data/emulator/wayland.wearable.conf.ini @@ -0,0 +1,38 @@ +base_width=320 +base_height=320 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=shm +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[dynamicbox],[shortcut],[badge] +#auto_align=true diff --git a/data/x11.wearable.resolution.ini b/data/emulator/wayland.wearable.resolution.ini similarity index 100% rename from data/x11.wearable.resolution.ini rename to data/emulator/wayland.wearable.resolution.ini diff --git a/data/emulator/x11.mobile.320x480.conf.ini b/data/emulator/x11.mobile.320x480.conf.ini new file mode 100644 index 0000000..74a4407 --- /dev/null +++ b/data/emulator/x11.mobile.320x480.conf.ini @@ -0,0 +1,38 @@ +base_width=320 +base_height=480 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true diff --git a/data/emulator/x11.mobile.320x480.resolution.ini b/data/emulator/x11.mobile.320x480.resolution.ini new file mode 100644 index 0000000..c848adf --- /dev/null +++ b/data/emulator/x11.mobile.320x480.resolution.ini @@ -0,0 +1,14 @@ +1x1=0x0 +2x1=0x0 +2x2=0x0 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=302x302 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x480 +base=320x480 diff --git a/data/emulator/x11.mobile.360x360.conf.ini b/data/emulator/x11.mobile.360x360.conf.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/emulator/x11.mobile.360x360.resolution.ini b/data/emulator/x11.mobile.360x360.resolution.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/emulator/x11.mobile.360x480.conf.ini b/data/emulator/x11.mobile.360x480.conf.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/emulator/x11.mobile.360x480.resolution.ini b/data/emulator/x11.mobile.360x480.resolution.ini new file mode 100644 index 0000000..e69de29 diff --git a/data/emulator/x11.mobile.480x800.conf.ini b/data/emulator/x11.mobile.480x800.conf.ini new file mode 100644 index 0000000..3b54d0a --- /dev/null +++ b/data/emulator/x11.mobile.480x800.conf.ini @@ -0,0 +1,45 @@ +base_width=480 +base_height=800 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=20.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +auto_align=false +use_event_time=true +use_gettimeofday=false +slave_event_boost_on=-10 +slave_event_boost_off=0 +event_filter=0.5 +#slave_limit_to_ttl=true +#frame_skip=5 diff --git a/data/emulator/x11.mobile.480x800.resolution.ini b/data/emulator/x11.mobile.480x800.resolution.ini new file mode 100644 index 0000000..63ad36e --- /dev/null +++ b/data/emulator/x11.mobile.480x800.resolution.ini @@ -0,0 +1,14 @@ +1x1=126x126 +2x1=0x0 +2x2=0x0 +4x1=0x0 +4x2=470x234 +4x3=0x0 +4x4=470x470 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=480x800 +base=480x800 diff --git a/data/emulator/x11.mobile.conf.ini b/data/emulator/x11.mobile.conf.ini new file mode 100644 index 0000000..f177788 --- /dev/null +++ b/data/emulator/x11.mobile.conf.ini @@ -0,0 +1,40 @@ +base_width=720 +base_height=1280 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +#services=[dynamicbox],[shortcut],[notification],[utility],[badge],[file] +#auto_align=true +#use_event_time=true +event_filter=0.5 diff --git a/data/emulator/x11.mobile.resolution.ini b/data/emulator/x11.mobile.resolution.ini new file mode 100644 index 0000000..e2b5a17 --- /dev/null +++ b/data/emulator/x11.mobile.resolution.ini @@ -0,0 +1,13 @@ +1x1=175x175 +2x1=354x175 +2x2=354x354 +4x1=712x175 +4x2=712x354 +4x3=712x533 +4x4=712x712 +4x5=712x891 +4x6=712x1070 +21x21=224x215 +23x21=680x215 +23x23=680x653 +0x0=720x1280 diff --git a/data/x11.mobile.conf.ini b/data/emulator/x11.wearable.360x360.conf.ini similarity index 83% rename from data/x11.mobile.conf.ini rename to data/emulator/x11.wearable.360x360.conf.ini index d0bdfb5..8f07e8a 100644 --- a/data/x11.mobile.conf.ini +++ b/data/emulator/x11.wearable.360x360.conf.ini @@ -1,5 +1,5 @@ -base_width=720 -base_height=1280 +base_width=360 +base_height=360 minimum_period=1.0 #script=edje #default_abi=c @@ -7,9 +7,9 @@ minimum_period=1.0 default_period=-1.0 default_packet_time=0.0001 #default_content=default -minimum_space=104857600 +minimum_space=1048576 #replace_tag=/APPID/ -slave_ttl=30.0 +slave_ttl=0.0 slave_activate_time=30.0 slave_relaunch_time=3.0 slave_relaunch_count=3 @@ -30,8 +30,10 @@ debug_mode=false overwrite_content=false com_core_thread=true use_xmonitor=false -#input=/dev/input/event2 +input=/dev/input/event2 pd_request_timeout=5.0 premultiplied=0 #emergency_disk=source=tmpfs;type=tmpfs;option=size=6M -#services=[livebox],[shortcut],[notification],[utility],[badge],[file] +services=[livebox],[shortcut],[badge] +auto_align=false +check_lcd=false diff --git a/data/emulator/x11.wearable.360x360.resolution.ini b/data/emulator/x11.wearable.360x360.resolution.ini new file mode 100644 index 0000000..b54c8a9 --- /dev/null +++ b/data/emulator/x11.wearable.360x360.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=360x360 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=360x360 +base=360x360 diff --git a/data/emulator/x11.wearable.360x480.conf.ini b/data/emulator/x11.wearable.360x480.conf.ini new file mode 100644 index 0000000..9fdd7f6 --- /dev/null +++ b/data/emulator/x11.wearable.360x480.conf.ini @@ -0,0 +1,38 @@ +base_width=360 +base_height=480 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=1048576 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[dynamicbox],[shortcut],[badge] +check_lcd=false diff --git a/data/emulator/x11.wearable.360x480.resolution.ini b/data/emulator/x11.wearable.360x480.resolution.ini new file mode 100644 index 0000000..fea1ffa --- /dev/null +++ b/data/emulator/x11.wearable.360x480.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=360x480 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=360x480 +base=360x480 diff --git a/data/emulator/x11.wearable.conf.ini b/data/emulator/x11.wearable.conf.ini new file mode 100644 index 0000000..f28220a --- /dev/null +++ b/data/emulator/x11.wearable.conf.ini @@ -0,0 +1,40 @@ +base_width=320 +base_height=320 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.dynamicbox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +input=/dev/input/event2 +gbar_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[dynamicbox],[shortcut],[badge] +#auto_align=true +#use_event_time=true +check_lcd=false diff --git a/data/emulator/x11.wearable.resolution.ini b/data/emulator/x11.wearable.resolution.ini new file mode 100644 index 0000000..5b6923e --- /dev/null +++ b/data/emulator/x11.wearable.resolution.ini @@ -0,0 +1,14 @@ +1x1=170x170 +2x1=0x0 +2x2=320x320 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x320 +base=320x320 diff --git a/data/mobile.data-provider-master.service b/data/mobile.data-provider-master.service deleted file mode 100644 index ee61361..0000000 --- a/data/mobile.data-provider-master.service +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2012 Samsung Electronics Co., Ltd -# -# Licensed under the Flora License, Version 1.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.tizenopensource.org/license -# -# 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. -# - -[Unit] -Description=Data Provider daemon -After=xorg.target - -[Service] -Type=notify -Environment=BUFMGR_LOCK_TYPE="once" -Environment=BUFMGR_MAP_CACHE="true" -ExecStart=/usr/bin/data-provider-master -RestartSec=1 - -[Install] -WantedBy=tizen-middleware.target diff --git a/include/buffer_handler.h b/include/buffer_handler.h index e3aa982..ff5cf1d 100644 --- a/include/buffer_handler.h +++ b/include/buffer_handler.h @@ -18,12 +18,7 @@ struct buffer_info; struct inst_info; struct buffer; -enum buffer_type { /*!< Must have to be sync with libprovider, liblivebox-viewer, liblivebox-edje */ - BUFFER_TYPE_FILE, - BUFFER_TYPE_SHM, - BUFFER_TYPE_PIXMAP, - BUFFER_TYPE_ERROR -}; +#include /*! * \brief @@ -33,7 +28,7 @@ enum buffer_type { /*!< Must have to be sync with libprovider, liblivebox-viewer * \param[in] pixel_size * \return buffer_info */ -extern struct buffer_info *buffer_handler_create(struct inst_info *inst, enum buffer_type type, int w, int h, int pixel_size); +extern struct buffer_info *buffer_handler_create(struct inst_info *inst, enum dynamicbox_fb_type type, int w, int h, int pixel_size); /*! * \brief @@ -90,9 +85,9 @@ extern const char *buffer_handler_id(const struct buffer_info *info); /*! * \param[in] info - * \return buffer_type + * \return dynamicbox_fb_type */ -extern enum buffer_type buffer_handler_type(const struct buffer_info *info); +extern enum dynamicbox_fb_type buffer_handler_type(const struct buffer_info *info); /*! * \brief This API is not supported for Pixmap. @@ -140,6 +135,27 @@ extern int buffer_handler_pixmap_release_buffer(void *canvas); /*! * \brief + * \param[in] info + * \return int + */ +extern int buffer_handler_stride(struct buffer_info *info); + +/*! + * \brief + * \param[in] info + * \return int + */ +extern int buffer_handler_pixels(struct buffer_info *info); + +/*! + * \brief + * \param[in] info + * \return int + */ +extern int buffer_handler_auto_align(void); + +/*! + * \brief * \return int */ extern int buffer_handler_init(void); @@ -228,14 +244,14 @@ extern struct inst_info *buffer_handler_instance(struct buffer_info *info); * \remarks * \param[in] type * \param[in] resource - * \return struct buffer * + * \return dynamicbox_fb_t * \retval NULL * \retval address * \pre * \post * \sa */ -extern struct buffer *buffer_handler_raw_open(enum buffer_type type, void *resource); +extern dynamicbox_fb_t buffer_handler_raw_open(enum dynamicbox_fb_type type, void *resource); /*! * \brief @@ -248,7 +264,7 @@ extern struct buffer *buffer_handler_raw_open(enum buffer_type type, void *resou * \post * \sa */ -extern int buffer_handler_raw_close(struct buffer *buffer); +extern int buffer_handler_raw_close(dynamicbox_fb_t buffer); /*! * \brief @@ -261,7 +277,7 @@ extern int buffer_handler_raw_close(struct buffer *buffer); * \post * \sa */ -extern void *buffer_handler_raw_data(struct buffer *buffer); +extern void *buffer_handler_raw_data(dynamicbox_fb_t buffer); /*! * \brief @@ -274,7 +290,7 @@ extern void *buffer_handler_raw_data(struct buffer *buffer); * \post * \sa */ -extern int buffer_handler_raw_size(struct buffer *buffer); +extern int buffer_handler_raw_size(dynamicbox_fb_t buffer); /*! * \brief diff --git a/include/client_life.h b/include/client_life.h index fa88612..b844659 100644 --- a/include/client_life.h +++ b/include/client_life.h @@ -31,7 +31,7 @@ struct packet; * \note * Create & Destroy */ -extern struct client_node *client_create(pid_t pid, int handle); +extern struct client_node *client_create(pid_t pid, int handle, const char *direct_addr); #define client_destroy(client) client_unref(client) /*! @@ -102,4 +102,6 @@ extern int client_browse_list(const char *cluster, const char *category, int (*c extern int client_nr_of_subscriber(const char *cluster, const char *category); extern int client_broadcast(struct inst_info *inst, struct packet *packet); + +extern const char *client_direct_addr(const struct client_node *client); /* End of a file */ diff --git a/include/conf.h b/include/conf.h index aab11d1..a4d0603 100644 --- a/include/conf.h +++ b/include/conf.h @@ -15,173 +15,14 @@ */ struct conf { - int width; - int height; - - int base_width; - int base_height; - double minimum_period; - - struct { - char *script; - char *abi; - char *pd_group; - double period; - int pixels; - } default_conf; - - struct { - char *name; - char *secured; - char *abi; - } launch_key; - - double default_packet_time; - - char *empty_content; - char *empty_title; - - char *default_content; - char *default_title; - - unsigned long minimum_space; - - char *replace_tag; - - double slave_ttl; - double slave_activate_time; - double slave_relaunch_time; - int slave_relaunch_count; - - int max_log_line; - int max_log_file; - - unsigned long sqlite_flush_max; - - struct { - char *conf; - char *image; - char *script; - char *root; - char *script_port; - char *slave_log; - char *reader; - char *always; - char *db; - char *input; - } path; - - int max_size_type; - - int slave_max_load; - - double ping_time; - - char *vconf_sys_cluster; - int max_pended_ctx_events; - - int use_sw_backend; - char *provider_method; int debug_mode; - int overwrite_content; - int com_core_thread; - int use_xmonitor; - int premultiplied; - - double scale_width_factor; - double scale_height_factor; - - double pd_request_timeout; - - char *emergency_disk; - char *services; + int slave_max_load; }; extern struct conf g_conf; -extern int conf_loader(void); -extern void conf_update_size(void); -extern void conf_reset(void); -extern void conf_init(void); - -#define BASE_W g_conf.base_width -#define BASE_H g_conf.base_height - -#define CR 13 -#define LF 10 - -#define EMERGENCY_DISK g_conf.emergency_disk -#define SCALE_WIDTH_FACTOR g_conf.scale_width_factor -#define SCALE_HEIGHT_FACTOR g_conf.scale_height_factor - -#define USE_SW_BACKEND g_conf.use_sw_backend -#define PROVIDER_METHOD g_conf.provider_method -#define DEBUG_MODE g_conf.debug_mode -#define OVERWRITE_CONTENT g_conf.overwrite_content -#define COM_CORE_THREAD g_conf.com_core_thread - -#define MINIMUM_PERIOD g_conf.minimum_period - -#define DEFAULT_SCRIPT g_conf.default_conf.script -#define DEFAULT_ABI g_conf.default_conf.abi -#define DEFAULT_GROUP g_conf.default_conf.pd_group -#define DEFAULT_PERIOD g_conf.default_conf.period -#define DEFAULT_PIXELS g_conf.default_conf.pixels -#define PRIORITY_NO_CHANGE -1.0f - -#define BUNDLE_SLAVE_NAME g_conf.launch_key.name -#define BUNDLE_SLAVE_SECURED g_conf.launch_key.secured -#define BUNDLE_SLAVE_ABI g_conf.launch_key.abi -#define PACKET_TIME g_conf.default_packet_time -#define CONTENT_NO_CHANGE g_conf.empty_content -#define TITLE_NO_CHANGE g_conf.empty_title -#define DEFAULT_TITLE g_conf.default_title -#define DEFAULT_CONTENT g_conf.default_content -#define MINIMUM_SPACE g_conf.minimum_space - -#define IMAGE_PATH g_conf.path.image -#define SCRIPT_PATH g_conf.path.script -#define SCRIPT_PORT_PATH g_conf.path.script_port -#define CONF_PATH g_conf.path.conf -#define ROOT_PATH g_conf.path.root -#define SLAVE_LOG_PATH g_conf.path.slave_log -#define READER_PATH g_conf.path.reader -#define ALWAYS_PATH g_conf.path.always -#define INPUT_PATH g_conf.path.input - -#define REPLACE_TAG_APPID g_conf.replace_tag -#define SLAVE_TTL g_conf.slave_ttl -#define SLAVE_ACTIVATE_TIME g_conf.slave_activate_time -#define SLAVE_RELAUNCH_TIME g_conf.slave_relaunch_time -#define SLAVE_RELAUNCH_COUNT g_conf.slave_relaunch_count - -#define MAX_LOG_LINE g_conf.max_log_line -#define MAX_LOG_FILE g_conf.max_log_file - -#define SQLITE_FLUSH_MAX g_conf.sqlite_flush_max -#define DBFILE g_conf.path.db - -#define PD_REQUEST_TIMEOUT g_conf.pd_request_timeout - -#define SLAVE_MAX_LOAD g_conf.slave_max_load -#define DEFAULT_PING_TIME g_conf.ping_time -#define PREMULTIPLIED_COLOR g_conf.premultiplied -#define SERVICES g_conf.services - -#define SERVICE_LIVEBOX "[livebox]" -#define SERVICE_NOTIFICATION "[notification]" -#define SERVICE_BADGE "[badge]" -#define SERVICE_SHORTCUT "[shortcut]" -#define SERVICE_UTILITY "[utility]" -#define SERVICE_FILE "[file]" - -#define PAUSED_FILE "/tmp/.live.paused" - -#define MAX_ABI 256 -#define MAX_PKGNAME 512 -#define DELAY_TIME 0.0000001f -#define DEFAULT_CLUSTER "user,created" -#define MINIMUM_REACTIVATION_TIME 10 +#define DELAY_TIME 0.0000001f +#define HAPI __attribute__((visibility("hidden"))) #if !defined(VCONFKEY_MASTER_STARTED) #define VCONFKEY_MASTER_STARTED "memory/data-provider-master/started" @@ -191,11 +32,7 @@ extern void conf_init(void); #define VCONFKEY_MASTER_RESTART_COUNT "memory/private/data-provider-master/restart_count" #endif -#define USE_XMONITOR g_conf.use_xmonitor - -#define HAPI __attribute__((visibility("hidden"))) -/*! - * EAPI is defined from eina.h - */ +#define CR 13 +#define LF 10 /* End of a file */ diff --git a/include/debug.h b/include/debug.h index cc4911f..ac1a079 100644 --- a/include/debug.h +++ b/include/debug.h @@ -67,4 +67,6 @@ extern FILE *__file_log_fp; #define PERF_MARK(tag) #endif +#define HAPI __attribute__((visibility("hidden"))) + /* End of a file */ diff --git a/include/event.h b/include/event.h index 800b071..81ce421 100644 --- a/include/event.h +++ b/include/event.h @@ -15,39 +15,50 @@ */ struct event_data { - int x; - int y; - unsigned int keycode; - int device; - int slot; - struct { - int major; - int minor; - } touch; - struct { - int major; - int minor; - } width; - int distance; /* Hovering */ -#if defined(_USE_ECORE_TIME_GET) - double tv; -#else - struct timeval tv; -#endif + int x; + int y; + unsigned int keycode; + int device; + int slot; + struct { + int major; + int minor; + } touch; + struct { + int major; + int minor; + } width; + int distance; /* Hovering */ + int orientation; + int pressure; + int updated; /* Timestamp is updated */ + double tv; }; enum event_state { - EVENT_STATE_DEACTIVATED, - EVENT_STATE_ACTIVATE, - EVENT_STATE_ACTIVATED, - EVENT_STATE_DEACTIVATE, - EVENT_STATE_ERROR + EVENT_STATE_DEACTIVATED, + EVENT_STATE_ACTIVATE, + EVENT_STATE_ACTIVATED, + EVENT_STATE_DEACTIVATE, + EVENT_STATE_ERROR +}; + +enum event_handler_activate_type { + EVENT_HANDLER_DEACTIVATED = 0x00, + EVENT_HANDLER_ACTIVATED_BY_MOUSE_SET = 0x01, + EVENT_HANDLER_ACTIVATED_BY_SHOW = 0x02, + EVENT_HANDLER_UNKNOWN = 0x04 }; extern int event_init(void); extern int event_fini(void); +extern int event_input_fd(void); extern int event_activate(int x, int y, int (*event_cb)(enum event_state state, struct event_data *event, void *data), void *data); extern int event_deactivate(int (*event_cb)(enum event_state state, struct event_data *event, void *data), void *data); extern int event_is_activated(void); +extern int event_reset_cbdata(int (*event_cb)(enum event_state state, struct event_data *event, void *data), void *data, void *new_data); + +extern int event_deactivate_thread(enum event_handler_activate_type activate_type); +extern int event_activate_thread(enum event_handler_activate_type activate_type); /* End of a file */ diff --git a/include/group.h b/include/group.h index 04dfddd..8cda595 100644 --- a/include/group.h +++ b/include/group.h @@ -36,8 +36,8 @@ extern const char *group_cluster_name_by_category(struct category *category); extern int group_add_package(struct category *category, const char *pkgname); extern int group_del_package(struct category *category, const char *pkgname); -extern int group_add_livebox(const char *group, const char *pkgname); -extern int group_del_livebox(const char *pkgname); +extern int group_add_dynamicbox(const char *group, const char *pkgname); +extern int group_del_dynamicbox(const char *pkgname); extern int group_init(void); extern int group_fini(void); diff --git a/include/instance.h b/include/instance.h index a61c32c..781b7a8 100644 --- a/include/instance.h +++ b/include/instance.h @@ -26,7 +26,7 @@ * After master successfully allocate heap for an instance, * It will send a load request to a specified slave * (The slave will be specified when a package informaion is - * prepared via configuration file of each livebox packages.) + * prepared via configuration file of each dynamicbox packages.) * We defined this as "REQUEST_TO_ACTIVATE" state. * * After the slave create a new instance, it will sends back @@ -37,21 +37,21 @@ * Sometimes, slaves can meet some unexpected problems then * it will tries to clear all problems and tries to keep them in safe env. * To do this, master or slave can be terminated. - * In this case, the master has to find the fault module(crashed livebox) + * In this case, the master has to find the fault module(crashed dynamicbox) * and prevent it from loading at the slave. - * And it will send requests for re-creating all other normal liveboxes. + * And it will send requests for re-creating all other normal dynamicboxes. * We defined this as "REQUEST_TO_REACTIVATE". * * After slave is launched again(recovered from fault situation), it will * receives "re-create" event from the master, then it will create all - * instances of requested liveboxes. + * instances of requested dynamicboxes. * * When the master receives "created" event from the slaves, * It will change the instance's state to "ACTIVATED" * But now, the master will not send "created" event to the clients. * - * Because the clients don't want to know the re-created liveboxes. - * They just want to know about fault liveboxes to display deactivated + * Because the clients don't want to know the re-created dynamicboxes. + * They just want to know about fault dynamicboxes to display deactivated * message. * * Sometimes the master can send requests to the slave to unload instances. @@ -80,7 +80,7 @@ * It will change the state of an master to "DESTROYED" * * There is one more event to change the state of an instance to "DESTROYED". - * In case of system created livebox, it could be destroyed itself. + * In case of system created dynamicbox, it could be destroyed itself. * So the slave will send "deleted" event to the master directly. * Even if the master doesn't requests to delete it. * @@ -94,16 +94,6 @@ enum instance_event { INSTNACE_EVENT_UNKNOWN }; -enum instance_destroy_type { - INSTANCE_DESTROY_DEFAULT = 0x00, - INSTANCE_DESTROY_UPGRADE = 0x01, - INSTANCE_DESTROY_UNINSTALL = 0x02, - INSTANCE_DESTROY_TERMINATE = 0x03, - INSTANCE_DESTROY_FAULT = 0x04, - INSTANCE_DESTROY_TEMPORARY = 0x05, - INSTANCE_DESTROY_UNKNOWN = 0x06 -}; - enum instance_state { INST_INIT = 0x0, /*!< Only keeps in the master */ @@ -119,17 +109,17 @@ enum instance_state { INST_REQUEST_TO_DESTROY /*!< Sent a request to a slave, when the master receives deleted event, the master will delete this */ }; -enum livebox_visible_state { /*!< Must be sync'd with livebox-viewer */ - LB_SHOW = 0x00, /*!< Livebox is showed. Default state */ - LB_HIDE = 0x01, /*!< Livebox is hide, with no update event, but keep update timer */ +enum dynamicbox_visible_state { /*!< Must be sync'd with dynamicbox-viewer */ + DBOX_SHOW = 0x00, /*!< Dynamicbox is showed. Default state */ + DBOX_HIDE = 0x01, /*!< Dynamicbox is hide, with no update event, but keep update timer */ - LB_HIDE_WITH_PAUSE = 0x02, /*!< Livebix is hide, it needs to be paused (with freezed update timer) */ + DBOX_HIDE_WITH_PAUSE = 0x02, /*!< Dynamicbox is hide, it needs to be paused (with freezed update timer) */ - LB_VISIBLE_ERROR = 0xFFFFFFFF /* To enlarge the size of this enumeration type */ + DBOX_VISIBLE_ERROR = 0xFFFFFFFF /* To enlarge the size of this enumeration type */ }; -#define IS_PD 1 -#define IS_LB 0 +#define IS_GBAR 1 +#define IS_DBOX 0 struct inst_info; struct pkg_info; @@ -137,8 +127,8 @@ struct script_handle; struct client_node; extern struct inst_info *instance_create(struct client_node *client, double timestamp, const char *pkgname, const char *content, const char *cluster, const char *category, double period, int width, int height); -extern int instance_destroy(struct inst_info *inst, enum instance_destroy_type type); -extern int instance_reload(struct inst_info *inst, enum instance_destroy_type type); +extern int instance_destroy(struct inst_info *inst, dynamicbox_destroy_type_e type); +extern int instance_reload(struct inst_info *inst, dynamicbox_destroy_type_e type); extern struct inst_info * instance_ref(struct inst_info *inst); extern struct inst_info * instance_unref(struct inst_info *inst); @@ -152,9 +142,9 @@ extern int instance_activate(struct inst_info *inst); extern int instance_recover_state(struct inst_info *inst); extern int instance_need_slave(struct inst_info *inst); -extern void instance_set_lb_info(struct inst_info *inst, double priority, const char *content, const char *title); -extern void instance_set_lb_size(struct inst_info *inst, int w, int h); -extern void instance_set_pd_size(struct inst_info *inst, int w, int h); +extern void instance_set_dbox_info(struct inst_info *inst, double priority, const char *content, const char *title); +extern void instance_set_dbox_size(struct inst_info *inst, int w, int h); +extern void instance_set_gbar_size(struct inst_info *inst, int w, int h); extern void instance_set_alt_info(struct inst_info *inst, const char *icon, const char *name); extern int instance_set_pinup(struct inst_info *inst, int pinup); @@ -165,8 +155,8 @@ extern int instance_clicked(struct inst_info *inst, const char *event, double ti extern int instance_text_signal_emit(struct inst_info *inst, const char *emission, const char *source, double sx, double sy, double ex, double ey); extern int instance_signal_emit(struct inst_info *inst, const char *emission, const char *source, double sx, double sy, double ex, double ey, double x, double y, int down); extern int instance_change_group(struct inst_info *inst, const char *cluster, const char *category); -extern int instance_set_visible_state(struct inst_info *inst, enum livebox_visible_state state); -extern enum livebox_visible_state instance_visible_state(struct inst_info *inst); +extern int instance_set_visible_state(struct inst_info *inst, enum dynamicbox_visible_state state); +extern enum dynamicbox_visible_state instance_visible_state(struct inst_info *inst); extern int instance_set_update_mode(struct inst_info *inst, int active_update); extern int instance_active_update(struct inst_info *inst); @@ -176,10 +166,12 @@ extern int instance_active_update(struct inst_info *inst); */ extern const double const instance_timestamp(const struct inst_info *inst); extern struct pkg_info * const instance_package(const struct inst_info *inst); -extern struct script_info * const instance_lb_script(const struct inst_info *inst); -extern struct script_info * const instance_pd_script(const struct inst_info *inst); -extern struct buffer_info * const instance_pd_buffer(const struct inst_info *inst); -extern struct buffer_info * const instance_lb_buffer(const struct inst_info *inst); +extern struct script_info * const instance_dbox_script(const struct inst_info *inst); +extern struct script_info * const instance_gbar_script(const struct inst_info *inst); +extern struct buffer_info * const instance_gbar_buffer(const struct inst_info *inst); +extern struct buffer_info * const instance_gbar_extra_buffer(const struct inst_info *inst, int idx); +extern struct buffer_info * const instance_dbox_buffer(const struct inst_info *inst); +extern struct buffer_info * const instance_dbox_extra_buffer(const struct inst_info *inst, int idx); extern const char * const instance_id(const struct inst_info *inst); extern const char * const instance_content(const struct inst_info *inst); extern const char * const instance_category(const struct inst_info *inst); @@ -190,10 +182,10 @@ extern const int const instance_priority(const struct inst_info *inst); extern const struct client_node * const instance_client(const struct inst_info *inst); extern const double const instance_period(const struct inst_info *inst); extern const int const instance_timeout(const struct inst_info *inst); -extern const int const instance_lb_width(const struct inst_info *inst); -extern const int const instance_lb_height(const struct inst_info *inst); -extern const int const instance_pd_width(const struct inst_info *inst); -extern const int const instance_pd_height(const struct inst_info *inst); +extern const int const instance_dbox_width(const struct inst_info *inst); +extern const int const instance_dbox_height(const struct inst_info *inst); +extern const int const instance_gbar_width(const struct inst_info *inst); +extern const int const instance_gbar_height(const struct inst_info *inst); extern const enum instance_state const instance_state(const struct inst_info *inst); /*! @@ -202,43 +194,53 @@ extern const enum instance_state const instance_state(const struct inst_info *in extern int instance_unicast_created_event(struct inst_info *inst, struct client_node *client); extern int instance_unicast_deleted_event(struct inst_info *inst, struct client_node *client, int reason); -extern int instance_create_lb_buffer(struct inst_info *inst, int pixels); -extern int instance_create_pd_buffer(struct inst_info *inst, int pixels); +extern int instance_create_dbox_buffer(struct inst_info *inst, int pixels); +extern int instance_create_dbox_extra_buffer(struct inst_info *inst, int pixels, int idx); +extern int instance_create_gbar_buffer(struct inst_info *inst, int pixels); +extern int instance_create_gbar_extra_buffer(struct inst_info *inst, int pixels, int idx); -extern void instance_slave_set_pd_pos(struct inst_info *inst, double x, double y); -extern void instance_slave_get_pd_pos(struct inst_info *inst, double *x, double *y); +extern void instance_slave_set_gbar_pos(struct inst_info *inst, double x, double y); +extern void instance_slave_get_gbar_pos(struct inst_info *inst, double *x, double *y); -extern int instance_slave_open_pd(struct inst_info *inst, struct client_node *client); -extern int instance_slave_close_pd(struct inst_info *inst, struct client_node *client, int reason); +extern int instance_slave_open_gbar(struct inst_info *inst, struct client_node *client); +extern int instance_slave_close_gbar(struct inst_info *inst, struct client_node *client, int reason); extern int instance_freeze_updator(struct inst_info *inst); extern int instance_thaw_updator(struct inst_info *inst); extern int instance_send_access_event(struct inst_info *inst, int status); -extern int instance_lb_update_begin(struct inst_info *inst, double priority, const char *content, const char *title); -extern int instance_lb_update_end(struct inst_info *inst); +extern int instance_dbox_update_begin(struct inst_info *inst, double priority, const char *content, const char *title); +extern int instance_dbox_update_end(struct inst_info *inst); -extern int instance_pd_update_begin(struct inst_info *inst); -extern int instance_pd_update_end(struct inst_info *inst); +extern int instance_gbar_update_begin(struct inst_info *inst); +extern int instance_gbar_update_end(struct inst_info *inst); -extern void instance_pd_updated(const char *pkgname, const char *id, const char *descfile); -extern void instance_lb_updated_by_instance(struct inst_info *inst, const char *safe_file); -extern void instance_pd_updated_by_instance(struct inst_info *inst, const char *descfile); +extern void instance_gbar_updated(const char *pkgname, const char *id, const char *descfile, int x, int y, int w, int h); +extern void instance_dbox_updated_by_instance(struct inst_info *inst, const char *safe_file, int x, int y, int w, int h); +extern void instance_gbar_updated_by_instance(struct inst_info *inst, const char *descfile, int x, int y, int w, int h); +extern void instance_extra_updated_by_instance(struct inst_info *inst, int is_gbar, int idx, int x, int y, int w, int h); +extern void instance_extra_info_updated_by_instance(struct inst_info *inst); /*! * \note - * if the status is LB_STATUS_ERROR_FAULT (slave is faulted) - * even though the PD is not created, this will forcely send the PD_DESTROYED event to the client. + * if the status is DBOX_STATUS_ERROR_FAULT (slave is faulted) + * even though the GBAR is not created, this will forcely send the GBAR_DESTROYED event to the client. */ -extern int instance_client_pd_destroyed(struct inst_info *inst, int status); -extern int instance_client_pd_created(struct inst_info *inst, int status); +extern int instance_client_gbar_destroyed(struct inst_info *inst, int status); +extern int instance_client_gbar_created(struct inst_info *inst, int status); + +extern int instance_client_gbar_extra_buffer_created(struct inst_info *inst, int idx); +extern int instance_client_gbar_extra_buffer_destroyed(struct inst_info *inst, int idx); + +extern int instance_client_dbox_extra_buffer_created(struct inst_info *inst, int idx); +extern int instance_client_dbox_extra_buffer_destroyed(struct inst_info *inst, int idx); extern int instance_send_access_status(struct inst_info *inst, int status); extern int instance_send_key_status(struct inst_info *inst, int status); extern int instance_forward_packet(struct inst_info *inst, struct packet *packet); -extern struct client_node *instance_pd_owner(struct inst_info *inst); +extern struct client_node *instance_gbar_owner(struct inst_info *inst); /*! * Multiple viewer @@ -253,6 +255,7 @@ extern int instance_fini(void); extern int instance_event_callback_add(struct inst_info *inst, enum instance_event type, int (*event_cb)(struct inst_info *inst, void *data), void *data); extern int instance_event_callback_del(struct inst_info *inst, enum instance_event type, int (*event_cb)(struct inst_info *inst, void *data), void *data); +extern int instance_event_callback_is_added(struct inst_info *inst, enum instance_event type, int (*event_cb)(struct inst_info *inst, void *data), void *data); /*! */ diff --git a/include/io.h b/include/io.h index c3d83b4..5647d52 100644 --- a/include/io.h +++ b/include/io.h @@ -17,9 +17,9 @@ extern int io_init(void); extern int io_fini(void); extern int io_load_package_db(struct pkg_info *info); -extern char *io_livebox_pkgname(const char *pkgname); -extern int io_update_livebox_package(const char *pkgname, int (*cb)(const char *pkgid, const char *lbid, int prime, void *data), void *data); -extern int io_crawling_liveboxes(int (*cb)(const char *pkgid, const char *lbid, int prime, void *data), void *data); +extern char *io_dynamicbox_pkgname(const char *pkgname); +extern int io_update_dynamicbox_package(const char *pkgname, int (*cb)(const char *pkgid, const char *lbid, int prime, void *data), void *data); +extern int io_crawling_dynamicboxes(int (*cb)(const char *pkgid, const char *lbid, int prime, void *data), void *data); extern int io_is_exists(const char *lbid); /* End of a file */ diff --git a/include/lite-errno.h b/include/lite-errno.h index a46b9f5..3046725 100644 --- a/include/lite-errno.h +++ b/include/lite-errno.h @@ -14,47 +14,48 @@ * limitations under the License. */ -#ifndef __LIVEBOX_ERRNO_H -#define __LIVEBOX_ERRNO_H +#ifndef __DYNAMICBOX_ERRNO_H +#define __DYNAMICBOX_ERRNO_H #ifdef __cplusplus extern "C" { #endif -/*! - * \addtogroup CAPI_LIVEBOX_SERVICE_MODULE - * \{ +/** + * @addtogroup CAPI_DYNAMICBOX_SERVICE_MODULE + * @{ */ -/*! - * \brief - * Definitions for the result status of livebox operation. +/** + * @brief + * Definitions for the result status of dynamicbox operation. */ -enum livebox_status { - LB_STATUS_SUCCESS = 0x00000000, /*!< Operation is successfully completed */ - LB_STATUS_ERROR = 0x80000000, /*!< This will be OR'd with other specific error value */ - LB_STATUS_ERROR_INVALID = LB_STATUS_ERROR | 0x0001, /*!< Invalid request */ - LB_STATUS_ERROR_FAULT = LB_STATUS_ERROR | 0x0002, /*!< Fault - Unable to recover from the error */ - LB_STATUS_ERROR_MEMORY = LB_STATUS_ERROR | 0x0004, /*!< Memory is not enough to do this operation */ - LB_STATUS_ERROR_EXIST = LB_STATUS_ERROR | 0x0008, /*!< Already exists */ - LB_STATUS_ERROR_BUSY = LB_STATUS_ERROR | 0x0010, /*!< Busy so the operation is not started(accepted), try again */ - LB_STATUS_ERROR_PERMISSION = LB_STATUS_ERROR | 0x0020, /*!< Permission error */ - LB_STATUS_ERROR_ALREADY = LB_STATUS_ERROR | 0x0040, /*!< Operation is already started */ - LB_STATUS_ERROR_CANCEL = LB_STATUS_ERROR | 0x0080, /*!< Operation is canceled */ - LB_STATUS_ERROR_IO = LB_STATUS_ERROR | 0x0100, /*!< I/O Error */ - LB_STATUS_ERROR_NOT_EXIST = LB_STATUS_ERROR | 0x0200, /*!< Not exists */ - LB_STATUS_ERROR_TIMEOUT = LB_STATUS_ERROR | 0x0400, /*!< Timeout */ - LB_STATUS_ERROR_NOT_IMPLEMENTED = LB_STATUS_ERROR | 0x0800, /*!< Operation is not implemented */ - LB_STATUS_ERROR_NO_SPACE = LB_STATUS_ERROR | 0x1000, /*!< No space to operate */ - LB_STATUS_ERROR_DISABLED = LB_STATUS_ERROR | 0x2000 /*!< Disabled */ +enum dynamicbox_status { + DBOX_STATUS_ERROR_NONE = 0x00000000, /**< Operation is successfully completed */ + DBOX_STATUS_ERROR = 0x80000000, /**< This will be OR'd with other specific error value */ + DBOX_STATUS_ERROR_INVALID_PARAMETER = DBOX_STATUS_ERROR | 0x0001, /**< Invalid request */ + DBOX_STATUS_ERROR_FAULT = DBOX_STATUS_ERROR | 0x0002, /**< Fault - Unable to recover from the error */ + DBOX_STATUS_ERROR_OUT_OF_MEMORY = DBOX_STATUS_ERROR | 0x0004, /**< Memory is not enough to do this operation */ + DBOX_STATUS_ERROR_EXIST = DBOX_STATUS_ERROR | 0x0008, /**< Already exists */ + DBOX_STATUS_ERROR_BUSY = DBOX_STATUS_ERROR | 0x0010, /**< Busy so the operation is not started(accepted), try again */ + DBOX_STATUS_ERROR_PERMISSION_DENIED = DBOX_STATUS_ERROR | 0x0020, /**< Permission error */ + DBOX_STATUS_ERROR_ALREADY = DBOX_STATUS_ERROR | 0x0040, /**< Operation is already started */ + DBOX_STATUS_ERROR_CANCEL = DBOX_STATUS_ERROR | 0x0080, /**< Operation is canceled */ + DBOX_STATUS_ERROR_IO_ERROR = DBOX_STATUS_ERROR | 0x0100, /**< I/O Error */ + DBOX_STATUS_ERROR_NOT_EXIST = DBOX_STATUS_ERROR | 0x0200, /**< Not exists */ + DBOX_STATUS_ERROR_TIMEOUT = DBOX_STATUS_ERROR | 0x0400, /**< Timeout */ + DBOX_STATUS_ERROR_NOT_IMPLEMENTED = DBOX_STATUS_ERROR | 0x0800, /**< Operation is not implemented */ + DBOX_STATUS_ERROR_NO_SPACE = DBOX_STATUS_ERROR | 0x1000, /**< No space to operate */ + DBOX_STATUS_ERROR_DISABLED = DBOX_STATUS_ERROR | 0x2000 /**< Disabled */ }; + /*! * \brief Check whether given code value indicates error or not. * \param[in] s * \return 1 or 0 */ -#define LB_STATUS_IS_ERROR(s) (!!((s) & LB_STATUS_ERROR)) +#define DBOX_STATUS_IS_ERROR(s) (!!((s) & DBOX_STATUS_ERROR)) /*! * \} diff --git a/include/package.h b/include/package.h index dd5d3f6..4107702 100644 --- a/include/package.h +++ b/include/package.h @@ -14,21 +14,6 @@ * limitations under the License. */ -enum lb_type { - LB_TYPE_NONE = 0x0, - LB_TYPE_SCRIPT, - LB_TYPE_FILE, - LB_TYPE_TEXT, - LB_TYPE_BUFFER -}; - -enum pd_type { - PD_TYPE_NONE = 0x0, - PD_TYPE_SCRIPT, - PD_TYPE_TEXT, - PD_TYPE_BUFFER -}; - enum alter_type { ALTER_CREATE, ALTER_DESTROY @@ -45,8 +30,8 @@ struct slave_node; */ extern struct pkg_info *package_create(const char *pkgid, const char *lbid); extern int package_destroy(struct pkg_info *info); -extern char *package_lb_pkgname(const char *pkgname); -extern int package_is_lb_pkgname(const char *pkgname); +extern char *package_dbox_pkgname(const char *pkgname); +extern int package_is_dbox_pkgname(const char *pkgname); extern struct pkg_info *package_find(const char *pkgname); extern const char *package_find_by_secured_slave(struct slave_node *slave); extern struct inst_info *package_find_instance_by_id(const char *pkgname, const char *id); @@ -66,15 +51,15 @@ extern const double const package_period(const struct pkg_info *info); extern const int const package_secured(const struct pkg_info *info); extern const char * const package_script(const struct pkg_info *info); extern const char * const package_abi(const struct pkg_info *info); -extern const char * const package_lb_path(const struct pkg_info *info); -extern const char * const package_lb_group(const struct pkg_info *info); -extern const char * const package_pd_path(const struct pkg_info *info); -extern const char * const package_pd_group(const struct pkg_info *info); +extern const char * const package_dbox_path(const struct pkg_info *info); +extern const char * const package_dbox_group(const struct pkg_info *info); +extern const char * const package_gbar_path(const struct pkg_info *info); +extern const char * const package_gbar_group(const struct pkg_info *info); extern const int const package_pinup(const struct pkg_info *info); extern const char * const package_auto_launch(const struct pkg_info *info); extern const unsigned int const package_size_list(const struct pkg_info *info); -extern const int const package_pd_width(const struct pkg_info *info); -extern const int const package_pd_height(const struct pkg_info *info); +extern const int const package_gbar_width(const struct pkg_info *info); +extern const int const package_gbar_height(const struct pkg_info *info); extern const char * const package_name(const struct pkg_info *info); extern const char * const package_libexec(struct pkg_info *info); extern int package_network(struct pkg_info *info); @@ -84,22 +69,26 @@ extern int package_set_libexec(struct pkg_info *info, const char *libexec); extern void package_set_pinup(struct pkg_info *info, int pinup); extern void package_set_auto_launch(struct pkg_info *info, const char *auto_launch); extern void package_set_size_list(struct pkg_info *info, unsigned int size_list); -extern void package_set_lb_type(struct pkg_info *info, enum lb_type type); -extern void package_set_pd_type(struct pkg_info *info, enum pd_type type); -extern int package_set_lb_group(struct pkg_info *info, const char *group); -extern int package_set_lb_path(struct pkg_info *info, const char *path); -extern int package_set_pd_group(struct pkg_info *info, const char *group); -extern int package_set_pd_path(struct pkg_info *info, const char *path); +extern void package_set_dbox_type(struct pkg_info *info, enum dynamicbox_dbox_type type); +extern void package_set_gbar_type(struct pkg_info *info, enum dynamicbox_gbar_type type); +extern int package_set_dbox_group(struct pkg_info *info, const char *group); +extern int package_set_dbox_path(struct pkg_info *info, const char *path); +extern int package_set_gbar_group(struct pkg_info *info, const char *group); +extern int package_set_gbar_path(struct pkg_info *info, const char *path); extern int package_set_script(struct pkg_info *info, const char *script); extern void package_set_secured(struct pkg_info *info, int secured); extern void package_set_period(struct pkg_info *info, double period); extern void package_set_timeout(struct pkg_info *info, int timeout); extern void package_set_network(struct pkg_info *info, int network); -extern void package_set_pd_height(struct pkg_info *info, int height); -extern void package_set_pd_width(struct pkg_info *info, int width); +extern void package_set_gbar_height(struct pkg_info *info, int height); +extern void package_set_gbar_width(struct pkg_info *info, int width); extern int package_set_abi(struct pkg_info *info, const char *abi); extern void package_add_ctx_info(struct pkg_info *pkginfo, struct context_info *info); extern void package_del_ctx_info(struct pkg_info *pkginfo, struct context_info *info); +extern void package_set_direct_input(struct pkg_info *info, int direct_input); +extern int package_direct_input(const struct pkg_info *info); +extern const char *package_hw_acceleration(struct pkg_info *info); +extern int package_set_hw_acceleration(struct pkg_info *info, const char *hw_acceleration); /*! * \brief @@ -109,8 +98,8 @@ extern struct pkg_info * const package_ref(struct pkg_info *info); extern struct pkg_info * const package_unref(struct pkg_info *info); extern const int const package_refcnt(const struct pkg_info *info); -extern const enum pd_type const package_pd_type(const struct pkg_info *info); -extern const enum lb_type const package_lb_type(const struct pkg_info *info); +extern const enum dynamicbox_gbar_type const package_gbar_type(const struct pkg_info *info); +extern const enum dynamicbox_dbox_type const package_dbox_type(const struct pkg_info *info); extern int package_add_instance(struct pkg_info *info, struct inst_info *inst); extern int package_del_instance(struct pkg_info *info, struct inst_info *inst); diff --git a/include/parser.h b/include/parser.h index 16e297a..71349e5 100644 --- a/include/parser.h +++ b/include/parser.h @@ -23,22 +23,22 @@ extern int parser_network(struct parser *handle); extern int parser_timeout(struct parser *handle); extern const char *parser_auto_launch(struct parser *handle); extern unsigned int parser_size(struct parser *handle); -extern void parser_get_pdsize(struct parser *handle, unsigned int *width, unsigned int *height); +extern void parser_get_gbar_size(struct parser *handle, unsigned int *width, unsigned int *height); extern const char *parser_group_str(struct parser *handle); extern int parser_secured(struct parser *handle); extern int parser_pinup(struct parser *handler); -extern const char *parser_lb_path(struct parser *handle); -extern const char *parser_lb_group(struct parser *handle); -extern const char *parser_pd_path(struct parser *handle); -extern const char *parser_pd_group(struct parser *handle); +extern const char *parser_dbox_path(struct parser *handle); +extern const char *parser_dbox_group(struct parser *handle); +extern const char *parser_gbar_path(struct parser *handle); +extern const char *parser_gbar_group(struct parser *handle); extern const char *parser_abi(struct parser *handle); -extern int parser_text_pd(struct parser *handle); -extern int parser_text_lb(struct parser *handle); -extern int parser_buffer_lb(struct parser *handle); -extern int parser_buffer_pd(struct parser *handle); +extern int parser_text_gbar(struct parser *handle); +extern int parser_text_dbox(struct parser *handle); +extern int parser_buffer_dbox(struct parser *handle); +extern int parser_buffer_gbar(struct parser *handle); extern const char *parser_script(struct parser *handle); diff --git a/include/setting.h b/include/setting.h index 6d0700f..d2138a5 100644 --- a/include/setting.h +++ b/include/setting.h @@ -18,4 +18,14 @@ extern int setting_is_lcd_off(void); extern int setting_init(void); extern int setting_fini(void); +enum oom_event_type { + OOM_TYPE_NORMAL = 0x00, + OOM_TYPE_LOW = 0x01, + OOM_ERROR = 0xFF +}; + +extern int setting_add_oom_event_callback(int (*handler)(enum oom_event_type type, void *data), void *data); +extern int setting_del_oom_event_callback(int (*handler)(enum oom_event_type type, void *data), void *data); +extern enum oom_event_type setting_oom_level(void); + /* End of a file */ diff --git a/include/slave_life.h b/include/slave_life.h index 7f477f3..07e8130 100644 --- a/include/slave_life.h +++ b/include/slave_life.h @@ -23,7 +23,8 @@ struct slave_node; enum slave_event { SLAVE_EVENT_ACTIVATE, SLAVE_EVENT_DEACTIVATE, /* deactivate callback, can return REACTIVATE, DEFAULT */ - SLAVE_EVENT_DELETE, + SLAVE_EVENT_DELETE, /* Callbacks for this event type, must has not to do something with slave object. + use this only for just notice the state of slave */ SLAVE_EVENT_FAULT, /* Critical fault */ SLAVE_EVENT_PAUSE, @@ -95,7 +96,7 @@ extern const int const slave_refcnt(struct slave_node *slave); * \param[in] period * \return slave_node */ -extern struct slave_node *slave_create(const char *name, int is_secured, const char *abi, const char *pkgname, int network); +extern struct slave_node *slave_create(const char *name, int is_secured, const char *abi, const char *pkgname, int network, const char *hw_acceleration); /*! * \brief @@ -113,12 +114,6 @@ extern void slave_destroy(struct slave_node *slave); extern int slave_activate(struct slave_node *slave); /*! - * \brief After this function call, the slave object can be deleted - * \param[in] slave - */ -extern struct slave_node *slave_deactivate(struct slave_node *slave, int direct) __attribute__((warn_unused_result)); - -/*! * To check the slave's activation state */ extern const int const slave_is_activated(struct slave_node *slave); @@ -169,7 +164,7 @@ extern int slave_set_pid(struct slave_node *slave, pid_t pid); extern void slave_load_package(struct slave_node *slave); extern void slave_unload_package(struct slave_node *slave); extern int const slave_loaded_package(struct slave_node *slave); -extern struct slave_node *slave_find_available(const char *abi, int secured, int network); +extern struct slave_node *slave_find_available(const char *slave_pkgname, const char *abi, int secured, int network, const char *hw_acceleration); extern double const slave_ttl(const struct slave_node *slave); @@ -212,4 +207,9 @@ extern int slave_activate_all(void); extern void slave_set_control_option(struct slave_node *slave, int ctrl); extern int slave_control_option(struct slave_node *slave); +extern char *slave_package_name(const char *abi, const char *lbid); + +extern int slave_priority(struct slave_node *slave); +extern int slave_set_priority(struct slave_node *slave, int priority); + /* End of a file */ diff --git a/include/util.h b/include/util.h index 4f32a76..56348f1 100644 --- a/include/util.h +++ b/include/util.h @@ -17,7 +17,6 @@ extern unsigned long util_string_hash(const char *str); extern double util_timestamp(void); extern int util_check_ext(const char *filename, const char *check_ptr); -extern int util_validate_livebox_package(const char *pkgname); extern int util_unlink(const char *filename); extern int util_unlink_files(const char *folder); extern char *util_slavename(void); diff --git a/packaging/data-provider-master.manifest b/packaging/data-provider-master.manifest index 5efa5e7..3c5ea52 100644 --- a/packaging/data-provider-master.manifest +++ b/packaging/data-provider-master.manifest @@ -15,6 +15,9 @@