diff options
Diffstat (limited to 'meta-application-manager/recipes-application-framework/app-core/files')
4 files changed, 624 insertions, 766 deletions
diff --git a/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch b/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch index 69e904d..06640cb 100644 --- a/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch +++ b/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch @@ -1,88 +1,107 @@ +diff --git a/src/appcore-efl.c b/src/appcore-efl.c +index b70ee32..559b6d3 100644 --- a/src/appcore-efl.c +++ b/src/appcore-efl.c -@@ -610,7 +610,7 @@ +@@ -769,21 +769,22 @@ static void __set_wm_rotation_support(unsigned int win, unsigned int set) static Eina_Bool __show_cb(void *data, int type, void *event) { - #ifdef WAYLAND -- Ecore_Wl_Event_Window_Activate *ev; -+ /*Ecore_Wl_Event_Window_Activate *ev; + #if defined(WAYLAND) +- Ecore_Wl_Event_Window_Show *ev; ++// Ecore_Wl_Event_Window_Show *ev; - ev = event; - -@@ -618,14 +618,14 @@ - { - // This is child window. Skip!!! - return ECORE_CALLBACK_PASS_ON; +- ev = event; +- if (ev->parent_win != 0) { +- /* This is child window. Skip!!! */ +- return ECORE_CALLBACK_PASS_ON; - } -+ }*/ ++// ev = event; ++// if (ev->parent_win != 0) { ++// /* This is child window. Skip!!! */ ++// return ECORE_CALLBACK_PASS_ON; ++// } -- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); +- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x, %d\n", ev->win, ev->data[0]); + _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!.\n"); -- if (!__exist_win((unsigned int)ev->win)) -+ /*if (!__exist_win((unsigned int)ev->win)) - __add_win((unsigned int)ev->win); ++/* + if (!__find_win((unsigned int)ev->win)) + __add_win((unsigned int)ev->win, (unsigned int)ev->data[0]); else -- __update_win((unsigned int)ev->win, FALSE); -+ __update_win((unsigned int)ev->win, FALSE);*/ + __update_win((unsigned int)ev->win, (unsigned int)ev->data[0], FALSE); +- ++*/ + #elif defined(X11) + Ecore_X_Event_Window_Show *ev; - __visibility_cb(data, type, event); - #else -@@ -661,14 +661,14 @@ +@@ -808,7 +809,7 @@ static Eina_Bool __show_cb(void *data, int type, void *event) static Eina_Bool __hide_cb(void *data, int type, void *event) { - #ifdef WAYLAND -- Ecore_Wl_Event_Window_Deactivate *ev; -+ //Ecore_Wl_Event_Window_Deactivate *ev; - int bvisibility = 0; + #if defined(WAYLAND) +- Ecore_Wl_Event_Window_Hide *ev; ++// Ecore_Wl_Event_Window_Hide *ev; + #elif defined(X11) + Ecore_X_Event_Window_Hide *ev; + #endif +@@ -816,8 +817,9 @@ static Eina_Bool __hide_cb(void *data, int type, void *event) -- ev = event; -+ //ev = event; + ev = event; - _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); + _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!.\n"); -- if (__exist_win((unsigned int)ev->win)) { -+ /*if (__exist_win((unsigned int)ev->win)) { ++/* + if (__find_win((unsigned int)ev->win)) { __delete_win((unsigned int)ev->win); - bvisibility = __check_visible(); -@@ -677,7 +677,7 @@ - b_active = 0; +@@ -827,6 +829,7 @@ static Eina_Bool __hide_cb(void *data, int type, void *event) __do_app(AE_PAUSE, data, NULL); } -- } -+ }*/ - #else - Ecore_X_Event_Window_Hide *ev; - int bvisibility = 0; -@@ -704,12 +704,12 @@ + } ++*/ + + return ECORE_CALLBACK_RENEW; + } +@@ -834,10 +837,12 @@ static Eina_Bool __hide_cb(void *data, int type, void *event) + #if defined(WAYLAND) + static Eina_Bool __lower_cb(void *data, int type, void *event) + { ++/* + Ecore_Wl_Event_Window_Lower *ev; + ev = event; + if (!ev) return ECORE_CALLBACK_RENEW; +- _DBG("ECORE_WL_EVENT_WINDOW_LOWER window id:%u\n", ev->win); ++*/ ++ _DBG("ECORE_WL_EVENT_WINDOW_LOWER\n"); + appcore_group_lower(); + return ECORE_CALLBACK_RENEW; + } +@@ -846,10 +851,10 @@ static Eina_Bool __lower_cb(void *data, int type, void *event) static Eina_Bool __visibility_cb(void *data, int type, void *event) { - #ifdef WAYLAND -- Ecore_Wl_Event_Window_Activate *ev; -+ //Ecore_Wl_Event_Window_Activate *ev; + #if defined(WAYLAND) +- Ecore_Wl_Event_Window_Visibility_Change *ev; ++// Ecore_Wl_Event_Window_Visibility_Change *ev; int bvisibility = 0; - - ev = event; -+ //ev = event; - -- __update_win((unsigned int)ev->win, ev->fobscured); -+ //__update_win((unsigned int)ev->win, ev->fobscured); - #else +- __update_win((unsigned int)ev->win, 0, ev->fully_obscured); ++// ev = event; ++// __update_win((unsigned int)ev->win, 0, ev->fully_obscured); + #elif defined(X11) Ecore_X_Event_Window_Visibility_Change *ev; int bvisibility = 0; -@@ -777,10 +777,10 @@ +@@ -931,6 +936,7 @@ static void __add_climsg_cb(struct ui_priv *ui) { _ret_if(ui == NULL); - #ifdef WAYLAND -- ui->hshow = -+ /*ui->hshow = - ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ACTIVATE, __show_cb, ui); + #if defined(WAYLAND) ++/* + ui->hshow = + ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_SHOW, __show_cb, ui); ui->hhide = -- ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui); -+ ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui);*/ - #else - atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW"); - if (!atom_parent) - +@@ -941,6 +947,7 @@ static void __add_climsg_cb(struct ui_priv *ui) + ui->hlower = + ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_LOWER, + __lower_cb, ui); ++*/ + #elif defined(X11) + ui->hshow = + ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui); diff --git a/meta-application-manager/recipes-application-framework/app-core/files/0002-remove-efl-appcore-efl.patch b/meta-application-manager/recipes-application-framework/app-core/files/0002-remove-efl-appcore-efl.patch index c6ba8cf..2a2fa3d 100644 --- a/meta-application-manager/recipes-application-framework/app-core/files/0002-remove-efl-appcore-efl.patch +++ b/meta-application-manager/recipes-application-framework/app-core/files/0002-remove-efl-appcore-efl.patch @@ -1,88 +1,152 @@ ---- a/src/appcore-efl.c -+++ b/src/appcore-efl.c -@@ -30,19 +30,21 @@ +diff -ru a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2016-11-03 18:01:31.546096215 +0900 ++++ b/CMakeLists.txt 2016-12-16 14:49:37.370894113 +0900 +@@ -42,12 +42,12 @@ + SET(HEADERS_common appcore-common.h) + + INCLUDE(FindPkgConfig) +-SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog ecore") ++SET(APPCORE_PKG_CHECK_MODULES "gio-2.0 vconf sensor aul dlog") + IF(_WITH_X11) +- SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 eina ecore-x") ++ SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11") + ENDIF(_WITH_X11) + IF(_WITH_WAYLAND) +- SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} ecore-wayland wayland-client tizen-extension-client wayland-tbm-client") ++ SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} wayland-client tizen-extension-client wayland-tbm-client") + ENDIF(_WITH_WAYLAND) + + +@@ -85,9 +85,9 @@ + SET(HEADERS_efl appcore-efl.h) + + INCLUDE(FindPkgConfig) +-SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul pkgmgr-info ttrace") ++SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul pkgmgr-info ttrace") + IF(_WITH_X11) +- SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x") ++ SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2}") + ENDIF(_WITH_X11) + + pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2}) +diff -ru a/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c b/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c +--- a/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c 2016-11-03 18:01:31.546096215 +0900 ++++ b/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c 2016-12-16 14:50:24.074894725 +0900 +@@ -19,7 +19,7 @@ + * + */ + #include <tet_api.h> +-#include <Elementary.h> ++//#include <Elementary.h> + #include <appcore-efl.h> + + static void startup(void); +@@ -52,7 +52,7 @@ + + static int app_reset(bundle *b, void *data) + { +- elm_exit(); ++// elm_exit(); + return 0; + } + +diff -ru a/appcore-efl.pc.in b/appcore-efl.pc.in +--- a/appcore-efl.pc.in 2016-11-03 18:01:31.546096215 +0900 ++++ b/appcore-efl.pc.in 2016-12-16 14:51:12.290895357 +0900 +@@ -8,7 +8,7 @@ + Name: app-core-efl + Description: SAMSUNG Linux platform efl application library + Version: @VERSION@ +-Requires.private: elementary dlog ++Requires.private: dlog + Requires: appcore-common + Libs: -L${libdir} -lappcore-efl + Cflags: -I${includedir} -I${includedir}/appcore +diff -ru a/src/appcore-efl.c b/src/appcore-efl.c +--- a/src/appcore-efl.c 2016-12-16 14:54:33.602897995 +0900 ++++ b/src/appcore-efl.c 2016-12-16 14:44:35.214890154 +0900 +@@ -25,20 +25,22 @@ #include <stdlib.h> - #ifdef WAYLAND + #if defined(WAYLAND) -#include <Ecore_Wayland.h> +//#include <Ecore_Wayland.h> - #endif - - #ifdef X11 + #include <wayland-client.h> + #include <wayland-tbm-client.h> + #include <tizen-extension-client-protocol.h> + #elif defined(X11) #include <X11/Xatom.h> #include <X11/Xlib.h> -#include <Ecore_X.h> +//#include <Ecore_X.h> #endif --#include <Ecore.h> --#include <Ecore_Evas.h> --#include <Ecore_Input_Evas.h> --#include <Elementary.h> +/* -+ * #include <Ecore.h> -+ * #include <Ecore_Evas.h> -+ * #include <Ecore_Input_Evas.h> -+ * #include <Elementary.h> -+ */ + #include <Ecore.h> + #include <Ecore_Evas.h> + #include <Ecore_Input_Evas.h> + #include <Elementary.h> ++*/ #include <glib-object.h> #include <malloc.h> #include <glib.h> -@@ -83,12 +85,12 @@ +@@ -60,15 +62,15 @@ const char *name; enum app_state state; - Ecore_Event_Handler *hshow; - Ecore_Event_Handler *hhide; - Ecore_Event_Handler *hvchange; ++// Ecore_Event_Handler *hshow; ++// Ecore_Event_Handler *hhide; ++// Ecore_Event_Handler *hvchange; + #if defined(WAYLAND) +- Ecore_Event_Handler *hlower; ++// Ecore_Event_Handler *hlower; + #endif - Ecore_Event_Handler *hcmsg; /* WM_ROTATE */ -+/* Ecore_Event_Handler *hshow; -+ * Ecore_Event_Handler *hhide; -+ Ecore_Event_Handler *hvchange; */ +// Ecore_Event_Handler *hcmsg; /* WM_ROTATE */ -- Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */ -+// Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */ +- Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */ ++// Ecore_Timer *mftimer; /* Ecore Timer for memory flushing */ - struct appcore_ops *ops; - void (*mfcb) (void); /* Memory Flushing Callback */ -@@ -129,7 +131,7 @@ + #ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT + struct appcore *app_core; +@@ -111,7 +111,7 @@ static const char *_as_name[] = { + [AS_DYING] = "DYING", }; +-static bool b_active = FALSE; ++//static bool b_active = FALSE; + static bool first_launch = TRUE; + + struct win_node { +@@ -123,7 +125,7 @@ + #if defined(X11) static struct ui_wm_rotate wm_rotate; + #endif -static Eina_Bool __visibility_cb(void *data, int type, void *event); +//static Eina_Bool __visibility_cb(void *data, int type, void *event); + static GSList *g_winnode_list; - static inline int send_int(int fd, int val) - { -@@ -282,16 +284,16 @@ - GSList *g_winnode_list = NULL; + static struct wl_display *dsp; +@@ -257,6 +259,7 @@ + #endif #if defined(MEMORY_FLUSH_ACTIVATE) --static Eina_Bool __appcore_memory_flush_cb(void *data) --{ -- struct ui_priv *ui = (struct ui_priv *)data; -- -- appcore_flush_memory(); -- ui->mftimer = NULL; -- -- return ECORE_CALLBACK_CANCEL; --} -- -+/* static Eina_Bool __appcore_memory_flush_cb(void *data) -+ * { -+ * struct ui_priv *ui = (struct ui_priv *)data; -+ * -+ * appcore_flush_memory(); -+ * ui->mftimer = NULL; -+ * -+ * return ECORE_CALLBACK_CANCEL; -+ * } -+ */ ++/* + static Eina_Bool __appcore_memory_flush_cb(void *data) + { + struct ui_priv *ui = (struct ui_priv *)data; +@@ -274,6 +277,7 @@ + + return ECORE_CALLBACK_CANCEL; + } ++*/ + static int __appcore_low_memory_post_cb(struct ui_priv *ui) { - if (ui->state == AS_PAUSED) { -@@ -305,15 +307,16 @@ +@@ -287,15 +291,17 @@ static void __appcore_timer_add(struct ui_priv *ui) { @@ -92,591 +156,156 @@ static void __appcore_timer_del(struct ui_priv *ui) { -- if (ui->mftimer) { -- ecore_timer_del(ui->mftimer); -- ui->mftimer = NULL; -- } -+/* if (ui->mftimer) { -+ * ecore_timer_del(ui->mftimer); -+ * ui->mftimer = NULL; -+ * } -+ */ ++/* + if (ui->mftimer) { + ecore_timer_del(ui->mftimer); + ui->mftimer = NULL; + } ++*/ } #else -@@ -331,7 +334,7 @@ +@@ -313,25 +319,27 @@ + + #endif + ++#if 0 static void __appcore_efl_memory_flush_cb(void) { _DBG("[APP %d] __appcore_efl_memory_flush_cb()", _pid); -- elm_cache_all_flush(); -+// elm_cache_all_flush(); + elm_cache_all_flush(); } ++#endif + #if defined(WAYLAND) + static void wl_raise_win(void) + { +- Ecore_Wl_Window *win; ++// Ecore_Wl_Window *win; + unsigned int win_id = appcore_get_main_window(); + + _DBG("Raise window: %d", win_id); +- win = ecore_wl_window_find(win_id); +- ecore_wl_window_activate(win); ++// win = ecore_wl_window_find(win_id); ++// ecore_wl_window_activate(win); + } + + static void wl_pause_win(void) + { +- Ecore_Wl_Window *win; ++// Ecore_Wl_Window *win; + GSList *wlist = g_winnode_list; + struct win_node *entry = NULL; + +@@ -338,8 +344,8 @@ + entry = wlist->data; + + _DBG("Pause window: %d", entry->win); +- win = ecore_wl_window_find(entry->win); +- ecore_wl_window_iconified_set(win, EINA_TRUE); ++// win = ecore_wl_window_find(entry->win); ++// ecore_wl_window_iconified_set(win, EINA_TRUE); + + wlist = wlist->next; + } +@@ -379,7 +385,7 @@ - static void __do_app(enum app_event event, void *data, bundle * b) -@@ -360,7 +363,7 @@ if (event == AE_TERMINATE) { _DBG("[APP %d] TERMINATE", _pid); - ui->state = AS_DYING; - elm_exit(); +// elm_exit(); + aul_status_update(STATUS_DYING); return; } +@@ -532,7 +534,7 @@ static void __do_app(enum app_event event, void *data, bundle * b) + _DBG("[APP %d] is paused. TERMINATE", _pid); + ui->state = AS_DYING; + aul_status_update(STATUS_DYING); +- elm_exit(); ++// elm_exit(); + } else if (ui->state == AS_RUNNING) { + _DBG("[APP %d] is running.", _pid); + } else { +@@ -550,6 +554,7 @@ static struct ui_ops efl_ops = { + .cb_app = __do_app, + }; -@@ -543,236 +546,238 @@ ++#if 0 + static bool __check_visible(void) + { + GSList *iter = NULL; +@@ -709,8 +716,10 @@ static bool __update_win(unsigned int win, unsigned int surf, bool bfobscured) + return TRUE; } - - /* WM_ROTATE */ --#ifdef X11 --static Ecore_X_Atom _WM_WINDOW_ROTATION_SUPPORTED = 0; --static Ecore_X_Atom _WM_WINDOW_ROTATION_CHANGE_REQUEST = 0; -- --static int __check_wm_rotation_support(void) --{ -- _DBG("Disable window manager rotation"); -- return -1; -- -- Ecore_X_Window root, win, win2; -- int ret; -- -- if (!_WM_WINDOW_ROTATION_SUPPORTED) { -- _WM_WINDOW_ROTATION_SUPPORTED = -- ecore_x_atom_get("_E_WINDOW_ROTATION_SUPPORTED"); -- } -- -- if (!_WM_WINDOW_ROTATION_CHANGE_REQUEST) { -- _WM_WINDOW_ROTATION_CHANGE_REQUEST = -- ecore_x_atom_get("_E_WINDOW_ROTATION_CHANGE_REQUEST"); -- } -- -- root = ecore_x_window_root_first_get(); -- ret = ecore_x_window_prop_xid_get(root, -- _WM_WINDOW_ROTATION_SUPPORTED, -- ECORE_X_ATOM_WINDOW, -- &win, 1); -- if ((ret == 1) && (win)) -- { -- ret = ecore_x_window_prop_xid_get(win, -- _WM_WINDOW_ROTATION_SUPPORTED, -- ECORE_X_ATOM_WINDOW, -- &win2, 1); -- if ((ret == 1) && (win2 == win)) -- return 0; -- } -- -- return -1; --} -- --static void __set_wm_rotation_support(unsigned int win, unsigned int set) --{ -- GSList *iter = NULL; -- struct win_node *entry = NULL; -- -- if (0 == win) { -- for (iter = g_winnode_list; iter != NULL; iter = g_slist_next(iter)) { -- entry = iter->data; -- if (entry->win) { -- ecore_x_window_prop_card32_set(entry->win, -- _WM_WINDOW_ROTATION_SUPPORTED, -- &set, 1); -- } -- } -- } else { -- ecore_x_window_prop_card32_set(win, -- _WM_WINDOW_ROTATION_SUPPORTED, -- &set, 1); -- } --} -- --Ecore_X_Atom atom_parent; --#endif -- --static Eina_Bool __show_cb(void *data, int type, void *event) --{ --#ifdef WAYLAND -- /*Ecore_Wl_Event_Window_Activate *ev; -- -- ev = event; -- -- if (ev->parent_win != 0) -- { -- // This is child window. Skip!!! -- return ECORE_CALLBACK_PASS_ON; -- }*/ -- -- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!.\n"); -- -- /*if (!__exist_win((unsigned int)ev->win)) -- __add_win((unsigned int)ev->win); -- else -- __update_win((unsigned int)ev->win, FALSE);*/ -- -- __visibility_cb(data, type, event); --#else -- Ecore_X_Event_Window_Show *ev; -- int ret; -- Ecore_X_Window parent; -- -- ev = event; -- -- ret = ecore_x_window_prop_window_get(ev->win, atom_parent, &parent, 1); -- if (ret != 1) -- { -- // This is child window. Skip!!! -- return ECORE_CALLBACK_PASS_ON; -- } -- -- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); -- -- if (!__exist_win((unsigned int)ev->win)) { -- /* WM_ROTATE */ -- if ((priv.wm_rot_supported) && (1 == priv.rot_started)) { -- __set_wm_rotation_support(ev->win, 1); -- } -- __add_win((unsigned int)ev->win); -- } -- else -- __update_win((unsigned int)ev->win, FALSE); --#endif -- -- return ECORE_CALLBACK_RENEW; --} -- --static Eina_Bool __hide_cb(void *data, int type, void *event) --{ --#ifdef WAYLAND -- //Ecore_Wl_Event_Window_Deactivate *ev; -- int bvisibility = 0; -- -- //ev = event; -- -- _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!.\n"); -- -- /*if (__exist_win((unsigned int)ev->win)) { -- __delete_win((unsigned int)ev->win); -- -- bvisibility = __check_visible(); -- if (!bvisibility && b_active == 1) { -- _DBG(" Go to Pasue state \n"); -- b_active = 0; -- __do_app(AE_PAUSE, data, NULL); -- } -- }*/ --#else -- Ecore_X_Event_Window_Hide *ev; -- int bvisibility = 0; -- -- ev = event; -- -- _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); -- -- if (__exist_win((unsigned int)ev->win)) { -- __delete_win((unsigned int)ev->win); -- -- bvisibility = __check_visible(); -- if (!bvisibility && b_active == 1) { -- _DBG(" Go to Pasue state \n"); -- b_active = 0; -- __do_app(AE_PAUSE, data, NULL); -- } -- } --#endif -- -- return ECORE_CALLBACK_RENEW; --} -- --static Eina_Bool __visibility_cb(void *data, int type, void *event) --{ --#ifdef WAYLAND -- //Ecore_Wl_Event_Window_Activate *ev; -- int bvisibility = 0; -- -- //ev = event; -- -- //__update_win((unsigned int)ev->win, ev->fobscured); --#else -- Ecore_X_Event_Window_Visibility_Change *ev; -- int bvisibility = 0; -- -- ev = event; -- -- __update_win((unsigned int)ev->win, ev->fully_obscured); --#endif -- bvisibility = __check_visible(); -- -- if (bvisibility && b_active == 0) { -- _DBG(" Go to Resume state\n"); -- b_active = 1; -- __do_app(AE_RESUME, data, NULL); -- -- } else if (!bvisibility && b_active == 1) { -- _DBG(" Go to Pasue state \n"); -- b_active = 0; -- __do_app(AE_PAUSE, data, NULL); -- } else -- _DBG(" No change state \n"); -- -- return ECORE_CALLBACK_RENEW; -- --} -- --#ifdef X11 -+//#ifdef X11 -+/* -+ * static Ecore_X_Atom _WM_WINDOW_ROTATION_SUPPORTED = 0; -+ * static Ecore_X_Atom _WM_WINDOW_ROTATION_CHANGE_REQUEST = 0; -+ * -+ * static int __check_wm_rotation_support(void) -+ * { -+ * _DBG("Disable window manager rotation"); -+ * return -1; -+ * -+ * Ecore_X_Window root, win, win2; -+ * int ret; -+ * -+ * if (!_WM_WINDOW_ROTATION_SUPPORTED) { -+ * _WM_WINDOW_ROTATION_SUPPORTED = -+ * ecore_x_atom_get("_E_WINDOW_ROTATION_SUPPORTED"); -+ * } -+ * -+ * if (!_WM_WINDOW_ROTATION_CHANGE_REQUEST) { -+ * _WM_WINDOW_ROTATION_CHANGE_REQUEST = -+ * ecore_x_atom_get("_E_WINDOW_ROTATION_CHANGE_REQUEST"); -+ * } -+ * -+ * root = ecore_x_window_root_first_get(); -+ * ret = ecore_x_window_prop_xid_get(root, -+ * _WM_WINDOW_ROTATION_SUPPORTED, -+ * ECORE_X_ATOM_WINDOW, -+ * &win, 1); -+ * if ((ret == 1) && (win)) -+ * { -+ * ret = ecore_x_window_prop_xid_get(win, -+ * _WM_WINDOW_ROTATION_SUPPORTED, -+ * ECORE_X_ATOM_WINDOW, -+ * &win2, 1); -+ * if ((ret == 1) && (win2 == win)) -+ * return 0; -+ * } -+ * -+ * return -1; -+ * } -+ * -+ * static void __set_wm_rotation_support(unsigned int win, unsigned int set) -+ * { -+ * GSList *iter = NULL; -+ * struct win_node *entry = NULL; -+ * -+ * if (0 == win) { -+ * for (iter = g_winnode_list; iter != NULL; iter = g_slist_next(iter)) { -+ * entry = iter->data; -+ * if (entry->win) { -+ * ecore_x_window_prop_card32_set(entry->win, -+ * _WM_WINDOW_ROTATION_SUPPORTED, -+ * &set, 1); -+ * } -+ * } -+ * } else { -+ * ecore_x_window_prop_card32_set(win, -+ * _WM_WINDOW_ROTATION_SUPPORTED, * -+ * &set, 1); -+ * } -+ * } -+ * -+ * Ecore_X_Atom atom_parent; + #endif +#endif -+ -+/* static Eina_Bool __show_cb(void *data, int type, void *event) -+ * { -+ * #ifdef WAYLAND -+ * Ecore_Wl_Event_Window_Activate *ev; -+ * -+ * ev = event; -+ * -+ * if (ev->parent_win != 0) -+ * { -+ * // This is child window. Skip!!! -+ * return ECORE_CALLBACK_PASS_ON; -+ * } -+ * -+ * _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!.\n"); -+ * -+ * if (!__exist_win((unsigned int)ev->win)) -+ * __add_win((unsigned int)ev->win); -+ * else -+ * __update_win((unsigned int)ev->win, FALSE); -+ * -+ * __visibility_cb(data, type, event); -+ * #else -+ * Ecore_X_Event_Window_Show *ev; -+ * int ret; -+ * Ecore_X_Window parent; -+ * -+ * ev = event; -+ * -+ * ret = ecore_x_window_prop_window_get(ev->win, atom_parent, &parent, 1); -+ * if (ret != 1) -+ * { -+ * // This is child window. Skip!!! -+ * return ECORE_CALLBACK_PASS_ON; -+ * } -+ * -+ * _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); -+ */ -+// if (!__exist_win((unsigned int)ev->win)) { -+// /* WM_ROTATE */ -+/* if ((priv.wm_rot_supported) && (1 == priv.rot_started)) { -+ * __set_wm_rotation_support(ev->win, 1); -+ * } -+ * __add_win((unsigned int)ev->win); -+ * } -+ * else -+ * __update_win((unsigned int)ev->win, FALSE); -+ * #endif -+ * -+ * return ECORE_CALLBACK_RENEW; -+ * } -+ */ -+/* static Eina_Bool __hide_cb(void *data, int type, void *event) -+ * { -+ * #ifdef WAYLAND -+ * //Ecore_Wl_Event_Window_Deactivate *ev; -+ * int bvisibility = 0; -+ * -+ * //ev = event; -+ * -+ * _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!.\n"); -+ * -+ * if (__exist_win((unsigned int)ev->win)) { -+ * __delete_win((unsigned int)ev->win); -+ * -+ * bvisibility = __check_visible(); -+ * if (!bvisibility && b_active == 1) { -+ * _DBG(" Go to Pasue state \n"); -+ * b_active = 0; -+ * __do_app(AE_PAUSE, data, NULL); -+ * } -+ * } -+ * #else -+ * Ecore_X_Event_Window_Hide *ev; -+ * int bvisibility = 0; -+ * -+ * ev = event; -+ * -+ * _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); -+ * -+ * if (__exist_win((unsigned int)ev->win)) { -+ * __delete_win((unsigned int)ev->win); -+ * -+ * bvisibility = __check_visible(); -+ * if (!bvisibility && b_active == 1) { -+ * _DBG(" Go to Pasue state \n"); -+ * b_active = 0; -+ * __do_app(AE_PAUSE, data, NULL); -+ * } -+ * } -+ * #endif -+ * -+ * return ECORE_CALLBACK_RENEW; -+ * } -+ */ -+/* static Eina_Bool __visibility_cb(void *data, int type, void *event) -+ * { -+ * #ifdef WAYLAND -+ * //Ecore_Wl_Event_Window_Activate *ev; -+ * int bvisibility = 0; -+ * -+ * //ev = event; -+ * -+ * //__update_win((unsigned int)ev->win, ev->fobscured); -+ * #else -+ * Ecore_X_Event_Window_Visibility_Change *ev; -+ * int bvisibility = 0; -+ * -+ * ev = event; -+ * -+ * __update_win((unsigned int)ev->win, ev->fully_obscured); -+ * #endif -+ * bvisibility = __check_visible(); -+ * -+ * if (bvisibility && b_active == 0) { -+ * _DBG(" Go to Resume state\n"); -+ * b_active = 1; -+ * __do_app(AE_RESUME, data, NULL); -+ * -+ * } else if (!bvisibility && b_active == 1) { -+ * _DBG(" Go to Pasue state \n"); -+ * b_active = 0; -+ * __do_app(AE_PAUSE, data, NULL); -+ * } else -+ * _DBG(" No change state \n"); -+ * -+ * return ECORE_CALLBACK_RENEW; -+ * -+ * } -+ */ -+//#ifdef X11 + /* WM_ROTATE */ --static Eina_Bool __cmsg_cb(void *data, int type, void *event) --{ -- struct ui_priv *ui = (struct ui_priv *)data; -- Ecore_X_Event_Client_Message *e = event; -- -- if (!ui) return ECORE_CALLBACK_PASS_ON; -- if (e->format != 32) return ECORE_CALLBACK_PASS_ON; -- if (e->message_type == _WM_WINDOW_ROTATION_CHANGE_REQUEST) { -- if ((0 == ui->wm_rot_supported) || -- (0 == ui->rot_started) || -- (NULL == ui->rot_cb)) { -- return ECORE_CALLBACK_PASS_ON; -- } -- -- enum appcore_rm rm; -- switch (e->data.l[1]) -- { -- case 0: rm = APPCORE_RM_PORTRAIT_NORMAL; break; -- case 90: rm = APPCORE_RM_LANDSCAPE_REVERSE; break; -- case 180: rm = APPCORE_RM_PORTRAIT_REVERSE; break; -- case 270: rm = APPCORE_RM_LANDSCAPE_NORMAL; break; -- default: rm = APPCORE_RM_UNKNOWN; break; -- } -- -- ui->rot_mode = rm; -- -- if (APPCORE_RM_UNKNOWN != rm) { -- ui->rot_cb(rm, ui->rot_cb_data); -- } -- } -- -- return ECORE_CALLBACK_PASS_ON; --} --#endif -- -+/* static Eina_Bool __cmsg_cb(void *data, int type, void *event) -+ * { -+ * struct ui_priv *ui = (struct ui_priv *)data; -+ * Ecore_X_Event_Client_Message *e = event; -+ * -+ * if (!ui) return ECORE_CALLBACK_PASS_ON; -+ * if (e->format != 32) return ECORE_CALLBACK_PASS_ON; -+ * if (e->message_type == _WM_WINDOW_ROTATION_CHANGE_REQUEST) { -+ * if ((0 == ui->wm_rot_supported) || -+ * (0 == ui->rot_started) || -+ * (NULL == ui->rot_cb)) { -+ * return ECORE_CALLBACK_PASS_ON; -+ * } -+ * -+ * enum appcore_rm rm; -+ * switch (e->data.l[1]) -+ * { -+ * case 0: rm = APPCORE_RM_PORTRAIT_NORMAL; break; -+ * case 90: rm = APPCORE_RM_LANDSCAPE_REVERSE; break; -+ * case 180: rm = APPCORE_RM_PORTRAIT_REVERSE; break; -+ * case 270: rm = APPCORE_RM_LANDSCAPE_NORMAL; break; -+ * default: rm = APPCORE_RM_UNKNOWN; break; -+ * } -+ * -+ * ui->rot_mode = rm; -+ * -+ * if (APPCORE_RM_UNKNOWN != rm) { -+ * ui->rot_cb(rm, ui->rot_cb_data); -+ * } -+ * } -+ * -+ * return ECORE_CALLBACK_PASS_ON; -+ * } -+ * -+ * #endif -+ */ ++#if 0 /* remove-efl */ + #ifdef X11 + static Ecore_X_Atom _WM_WINDOW_ROTATION_SUPPORTED = 0; + static Ecore_X_Atom _WM_WINDOW_ROTATION_CHANGE_REQUEST = 0; +@@ -931,6 +938,7 @@ + return ECORE_CALLBACK_PASS_ON; + } + #endif ++#endif /* remove-efl */ + static void __add_climsg_cb(struct ui_priv *ui) { - _ret_if(ui == NULL); -@@ -782,25 +787,25 @@ +@@ -949,6 +957,7 @@ + __lower_cb, ui); + */ + #elif defined(X11) ++#if 0 /* remove-efl */ + ui->hshow = + ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui); ui->hhide = - ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui);*/ - #else -- atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW"); -- if (!atom_parent) -- { -- // Do Error Handling -- } -- -- ui->hshow = -- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui); -- ui->hhide = -- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, __hide_cb, ui); -- ui->hvchange = -- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, -- __visibility_cb, ui); -- -+/* atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW"); -+ * if (!atom_parent) -+ * { -+ * // Do Error Handling -+ * } -+ * -+ * ui->hshow = -+ * ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui); -+ * ui->hhide = -+ * ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, __hide_cb, ui); -+ * ui->hvchange = -+ * ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, -+ * __visibility_cb, ui); -+ */ +@@ -956,11 +965,14 @@ + ui->hvchange = + ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, + __visibility_cb, ui); ++#endif /* remove-efl */ + /* Add client message callback for WM_ROTATE */ - if(!__check_wm_rotation_support()) - { -- ui->hcmsg = -- ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __cmsg_cb, ui); -+/* ui->hcmsg = -+ ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __cmsg_cb, ui); */ + if (!__check_wm_rotation_support()) { ++#if 0 /* remove-efl */ + ui->hcmsg = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, + __cmsg_cb, ui); ++#endif /* remove-efl */ ui->wm_rot_supported = 1; appcore_set_wm_rotation(&wm_rotate); } -@@ -819,30 +824,30 @@ - } - +@@ -986,19 +998,19 @@ + #if !(GLIB_CHECK_VERSION(2, 36, 0)) g_type_init(); + #endif - elm_init(*argc, *argv); +// elm_init(*argc, *argv); hwacc = getenv("HWACC"); - - if(hwacc == NULL) { -- _DBG("elm_config_preferred_engine_set is not called"); -+// _DBG("elm_config_preferred_engine_set is not called"); - } else if(strcmp(hwacc, "USE") == 0) { - #ifdef WAYLAND -- elm_config_preferred_engine_set("wayland_egl"); -- _DBG("elm_config_preferred_engine_set : wayland_egl"); -+// elm_config_preferred_engine_set("wayland_egl"); -+// _DBG("elm_config_preferred_engine_set : wayland_egl"); - #else -- elm_config_preferred_engine_set("opengl_x11"); -- _DBG("elm_config_preferred_engine_set : opengl_x11"); -+// elm_config_preferred_engine_set("opengl_x11"); -+// _DBG("elm_config_preferred_engine_set : opengl_x11"); - #endif - } else if(strcmp(hwacc, "NOT_USE") == 0) { - #ifdef WAYLAND -- elm_config_preferred_engine_set("wayland_shm"); -- _DBG("elm_config_preferred_engine_set : wayland_shm"); -+// elm_config_preferred_engine_set("wayland_shm"); -+// _DBG("elm_config_preferred_engine_set : wayland_shm"); - #else -- elm_config_preferred_engine_set("software_x11"); -- _DBG("elm_config_preferred_engine_set : software_x11"); -+// elm_config_preferred_engine_set("software_x11"); -+// _DBG("elm_config_preferred_engine_set : software_x11"); - #endif + if (hwacc == NULL) { +- _DBG("elm_config_accel_preference_set is not called"); ++// _DBG("elm_config_accel_preference_set is not called"); + } else if (strcmp(hwacc, "USE") == 0) { +- elm_config_accel_preference_set("hw"); +- _DBG("elm_config_accel_preference_set : hw"); ++// elm_config_accel_preference_set("hw"); ++// _DBG("elm_config_accel_preference_set : hw"); + } else if (strcmp(hwacc, "NOT_USE") == 0) { +- elm_config_accel_preference_set("none"); +- _DBG("elm_config_accel_preference_set : none"); ++// elm_config_accel_preference_set("none"); ++// _DBG("elm_config_accel_preference_set : none"); } else { -- _DBG("elm_config_preferred_engine_set is not called"); -+// _DBG("elm_config_preferred_engine_set is not called"); +- _DBG("elm_config_accel_preference_set is not called"); ++// _DBG("elm_config_accel_preference_set is not called"); } r = appcore_init(ui->name, &efl_ops, *argc, *argv); -@@ -875,16 +880,16 @@ - if (ui->ops && ui->ops->terminate) - ui->ops->terminate(ui->ops->data); +@@ -1069,21 +1081,21 @@ + + ui->state = AS_DYING; - if (ui->hshow) - ecore_event_handler_del(ui->hshow); @@ -684,45 +313,114 @@ - ecore_event_handler_del(ui->hhide); - if (ui->hvchange) - ecore_event_handler_del(ui->hvchange); -- -+/* if (ui->hshow) -+ * ecore_event_handler_del(ui->hshow); -+ * if (ui->hhide) -+ * ecore_event_handler_del(ui->hhide); -+ * if (ui->hvchange) -+ * ecore_event_handler_del(ui->hvchange); -+ */ ++// if (ui->hshow) ++// ecore_event_handler_del(ui->hshow); ++// if (ui->hhide) ++// ecore_event_handler_del(ui->hhide); ++// if (ui->hvchange) ++// ecore_event_handler_del(ui->hvchange); + #if defined(WAYLAND) +- if (ui->hlower) +- ecore_event_handler_del(ui->hlower); ++// if (ui->hlower) ++// ecore_event_handler_del(ui->hlower); + #endif + __appcore_timer_del(ui); -- elm_shutdown(); -+// elm_shutdown(); + /* Check the launchpad-loader case */ +- while (elm_shutdown() > 0); ++// while (elm_shutdown() > 0); } static int __set_data(struct ui_priv *ui, const char *name, -@@ -913,7 +918,7 @@ +@@ -1111,7 +1123,7 @@ + _retv_if(ui->name == NULL, -1); ui->ops = ops; - - ui->mfcb = __appcore_efl_memory_flush_cb; +// ui->mfcb = __appcore_efl_memory_flush_cb; - _pid = getpid(); -@@ -1025,7 +1030,7 @@ - return -1; - } + /* WM_ROTATE */ +@@ -1123,8 +1135,8 @@ + + #ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT + ui->app_core = NULL; +- ui->prepare_to_suspend = __appcore_efl_prepare_to_suspend; +- ui->exit_from_suspend = __appcore_efl_exit_from_suspend; ++// ui->prepare_to_suspend = __appcore_efl_prepare_to_suspend; ++// ui->exit_from_suspend = __appcore_efl_exit_from_suspend; + #endif + + return 0; +@@ -1247,7 +1259,7 @@ + r = appcore_efl_init(name, argc, argv, ops); + _retv_if(r == -1, -1); - elm_run(); +// elm_run(); - aul_status_update(STATUS_DYING); + appcore_efl_fini(); + +@@ -1272,27 +1284,31 @@ EXPORT_API int appcore_set_preinit_window_name(const char *win_name) + EXPORT_API int appcore_set_preinit_window_name(const char *win_name) + { + int ret = -1; +- void *preinit_window = NULL; +- const Evas *e = NULL; ++// void *preinit_window = NULL; ++// const Evas *e = NULL; + + if (!win_name) { + _ERR("invalid parameter"); + return ret; + } + ++/* + preinit_window = elm_win_precreated_object_get(); + if (!preinit_window) { + _ERR("Failed to get preinit window"); + return ret; + } ++*/ - ---- a/src/appcore-rotation.c -+++ b/src/appcore-rotation.c -@@ -26,25 +26,25 @@ ++/* + e = evas_object_evas_get((const Evas_Object *)preinit_window); + if (e) { + Ecore_Evas *ee = ecore_evas_ecore_evas_get(e); + if (ee) { + ecore_evas_name_class_set(ee, win_name, win_name); + ret = 0; + } + } ++*/ + + return ret; +diff --git a/src/appcore-group.c b/src/appcore-group.c +index dcdcb6f..915264d 100644 +--- a/src/appcore-group.c ++++ b/src/appcore-group.c +@@ -1,4 +1,4 @@ +-#include <Elementary.h> ++//#include <Elementary.h> + #include <stdio.h> + #include <glib.h> + #include <aul.h> +@@ -37,6 +37,6 @@ void appcore_group_lower() + aul_app_group_lower(&exit); + if (exit) { + _DBG("appcore_group_lower : sub-app!"); +- elm_exit(); ++// elm_exit(); + } + } +diff -ru a/src/appcore-rotation.c b/src/appcore-rotation.c +--- a/src/appcore-rotation.c 2016-11-03 18:01:31.550096215 +0900 ++++ b/src/appcore-rotation.c 2016-12-16 14:47:09.954892182 +0900 +@@ -26,20 +26,22 @@ - #include <sensor.h> + #include <sensor_internal.h> #include <vconf.h> -#include <Ecore.h> +//#include <Ecore.h> @@ -733,91 +431,26 @@ +//#include <Ecore_X.h> #include <X11/Xlib.h> - /*Fixme: to be added for wayland works*/ - #define _MAKE_ATOM(a, s) \ -- do { \ -+/* do { \ - a = ecore_x_atom_get(s); \ - if (!a) \ - _ERR("##s creation failed.\n"); \ - } while(0) -- + /* Fixme: to be added for wayland works */ + #define _MAKE_ATOM(a, s) \ ++/* + do { \ + a = ecore_x_atom_get(s); \ + if (!a) \ + _ERR("##s creation failed.\n"); \ + } while (0) +*/ - #define STR_ATOM_ROTATION_LOCK "_E_ROTATION_LOCK" --static Ecore_X_Atom ATOM_ROTATION_LOCK = 0; --static Ecore_X_Window root; -+//static Ecore_X_Atom ATOM_ROTATION_LOCK = 0; -+//static Ecore_X_Window root; - #endif + #define STR_ATOM_ROTATION_LOCK "_E_ROTATION_LOCK" - struct rot_s { -@@ -245,8 +245,8 @@ +@@ -246,8 +248,10 @@ #ifdef X11 - _MAKE_ATOM(ATOM_ROTATION_LOCK, STR_ATOM_ROTATION_LOCK ); -- root = ecore_x_window_root_first_get(); -- XSelectInput(ecore_x_display_get(), root, PropertyChangeMask); -+ /*root = ecore_x_window_root_first_get(); -+ XSelectInput(ecore_x_display_get(), root, PropertyChangeMask);*/ + _MAKE_ATOM(ATOM_ROTATION_LOCK, STR_ATOM_ROTATION_LOCK); ++/* + root = ecore_x_window_root_first_get(); + XSelectInput(ecore_x_display_get(), root, PropertyChangeMask); ++*/ #endif } return 0; - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,9 +36,9 @@ - SET(HEADERS_common appcore-common.h) - - INCLUDE(FindPkgConfig) --SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config ecore") -+SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config") - IF (with_x11) -- SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 ecore-x") -+ SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11") - ENDIF (with_x11) - - pkg_check_modules(pkg_common REQUIRED ${APPCORE_PKG_CHECK_MODULES}) -@@ -75,9 +75,9 @@ - SET(HEADERS_efl appcore-efl.h) - - INCLUDE(FindPkgConfig) --SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul") -+SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul") - IF (with_x11) -- SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x") -+ SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ") - ENDIF (with_x11) - - pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2}) - ---- a/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c -+++ b/TC/unit/utc_ApplicationFW_appcore_efl_main_func.c -@@ -19,7 +19,7 @@ - * - */ - #include <tet_api.h> --#include <Elementary.h> -+//#include <Elementary.h> - #include <appcore-efl.h> - - static void startup(void); -@@ -52,7 +52,7 @@ - - static int app_reset(bundle *b, void *data) - { -- elm_exit(); -+ //elm_exit(); - return 0; - } - ---- a/appcore-efl.pc.in -+++ b/appcore-efl.pc.in -@@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@ - Name: app-core-efl - Description: SAMSUNG Linux platform efl application library - Version: @VERSION@ --Requires: elementary appcore-common dlog -+Requires: appcore-common dlog - Libs: -L${libdir} -lappcore-efl - Cflags: -I${includedir} -I${includedir}/appcore diff --git a/meta-application-manager/recipes-application-framework/app-core/files/0003-remove-disused-package.patch b/meta-application-manager/recipes-application-framework/app-core/files/0003-remove-disused-package.patch new file mode 100644 index 0000000..88354d8 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/files/0003-remove-disused-package.patch @@ -0,0 +1,206 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e2c508..41ef8b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,7 @@ IF(_WITH_X11) + SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11") + ENDIF(_WITH_X11) + IF(_WITH_WAYLAND) +- SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} wayland-client tizen-extension-client wayland-tbm-client") ++ SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} ") + ENDIF(_WITH_WAYLAND) + + +@@ -85,7 +85,7 @@ SET(SRCS_efl src/appcore-efl.c src/appcore-group.c) + SET(HEADERS_efl appcore-efl.h) + + INCLUDE(FindPkgConfig) +-SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul pkgmgr-info ttrace") ++SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul pkgmgr-info") + IF(_WITH_X11) + SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2}") + ENDIF(_WITH_X11) +diff --git a/src/appcore-efl.c b/src/appcore-efl.c +index c3fee93..e2262d9 100644 +--- a/src/appcore-efl.c ++++ b/src/appcore-efl.c +@@ -27,8 +27,8 @@ + #if defined(WAYLAND) + //#include <Ecore_Wayland.h> + #include <wayland-client.h> +-#include <wayland-tbm-client.h> +-#include <tizen-extension-client-protocol.h> ++//#include <wayland-tbm-client.h> ++//#include <tizen-extension-client-protocol.h> + #elif defined(X11) + #include <X11/Xatom.h> + #include <X11/Xlib.h> +@@ -49,7 +49,7 @@ + #include <aul.h> + #include <aul_svc.h> + #include <bundle_internal.h> +-#include <ttrace.h> ++//#include <ttrace.h> + + #include "appcore-internal.h" + #include "appcore-efl.h" +@@ -128,6 +128,7 @@ static struct ui_wm_rotate wm_rotate; + //static Eina_Bool __visibility_cb(void *data, int type, void *event); + static GSList *g_winnode_list; + ++#if 0 + static struct wl_display *dsp; + static struct wl_registry *reg; + static struct tizen_policy *tz_policy; +@@ -223,6 +224,7 @@ static void __unset_bg_state(void) + _DBG("bg state: %d", bg_state); + __finish_wl(); + } ++#endif + + #ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT + static void __appcore_efl_prepare_to_suspend(void *data) +@@ -358,7 +360,7 @@ static void __do_app(enum app_event event, void *data, bundle * b) + int r = -1; + struct ui_priv *ui = data; + const char *below_app; +- const char *bg_launch; ++// const char *bg_launch; + + _DBG("[APP %d] Event: %d", _pid, event); + _ret_if(ui == NULL || event >= AE_MAX); +@@ -432,10 +434,10 @@ static void __do_app(enum app_event event, void *data, bundle * b) + #endif + + if (ui->ops->reset) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, +- "APPCORE:RESET"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, ++// "APPCORE:RESET"); + r = ui->ops->reset(b, ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:done]", ui->name); + +@@ -447,11 +449,11 @@ static void __do_app(enum app_event event, void *data, bundle * b) + first_launch = FALSE; + } else { + _INFO("[APP %d] App already running, raise the window", _pid); +- if (bg_state) { +- bg_launch = bundle_get_val(b, AUL_SVC_K_BG_LAUNCH); +- if (!bg_launch || strcmp(bg_launch, "enable")) +- __unset_bg_state(); +- } ++// if (bg_state) { ++// bg_launch = bundle_get_val(b, AUL_SVC_K_BG_LAUNCH); ++// if (!bg_launch || strcmp(bg_launch, "enable")) ++// __unset_bg_state(); ++// } + #ifdef X11 + x_raise_win(getpid()); + #else +@@ -465,10 +467,10 @@ static void __do_app(enum app_event event, void *data, bundle * b) + if (ui->state == AS_RUNNING) { + _DBG("[APP %d] PAUSE", _pid); + if (ui->ops->pause) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, +- "APPCORE:PAUSE"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, ++// "APPCORE:PAUSE"); + r = ui->ops->pause(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + ui->state = AS_PAUSED; + if (r >= 0 && resource_reclaiming == TRUE) +@@ -506,10 +508,10 @@ static void __do_app(enum app_event event, void *data, bundle * b) + } + + if (ui->ops->resume) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, +- "APPCORE:RESUME"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, ++// "APPCORE:RESUME"); + ui->ops->resume(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + ui->state = AS_RUNNING; + +@@ -986,8 +988,8 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) + #if _APPFW_FEATURE_BACKGROUND_MANAGEMENT + struct appcore *ac = NULL; + #endif +- bundle *b; +- const char *bg_launch; ++// bundle *b; ++// const char *bg_launch; + + if (argc == NULL || argv == NULL) { + _ERR("argc/argv is NULL"); +@@ -1022,28 +1024,28 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) + SECURE_LOGD("[__SUSPEND__] appcore initialized, appcore addr: #%x", ac); + #endif + +- b = bundle_import_from_argv(*argc, *argv); +- if (b) { +- bg_launch = bundle_get_val(b, AUL_SVC_K_BG_LAUNCH); +- if (bg_launch && strcmp(bg_launch, "enable") == 0) +- __set_bg_state(); +- +- bundle_free(b); +- } ++// b = bundle_import_from_argv(*argc, *argv); ++// if (b) { ++// bg_launch = bundle_get_val(b, AUL_SVC_K_BG_LAUNCH); ++// if (bg_launch && strcmp(bg_launch, "enable") == 0) ++// __set_bg_state(); ++// ++// bundle_free(b); ++// } + + LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:appcore_init:done]", ui->name); + if (ui->ops && ui->ops->create) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "APPCORE:CREATE"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "APPCORE:CREATE"); + r = ui->ops->create(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + if (r < 0) { + _ERR("create() return error"); + appcore_exit(); + if (ui->ops && ui->ops->terminate) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, +- "APPCORE:TERMINATE"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, ++// "APPCORE:TERMINATE"); + ui->ops->terminate(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + errno = ECANCELED; + return -1; +@@ -1066,17 +1068,17 @@ static void __after_loop(struct ui_priv *ui) + if (ui->state == AS_RUNNING) { + _DBG("[APP %d] PAUSE before termination", _pid); + if (ui->ops && ui->ops->pause) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, +- "APPCORE:PAUSE"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, ++// "APPCORE:PAUSE"); + ui->ops->pause(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + } + + if (ui->ops && ui->ops->terminate) { +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "APPCORE:TERMINATE"); ++// traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "APPCORE:TERMINATE"); + ui->ops->terminate(ui->ops->data); +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++// traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + } + + ui->state = AS_DYING; diff --git a/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch index 0199c60..bfc07b9 100644 --- a/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch +++ b/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd053b7..2403d3d 100644 +index fd053b7..83c7f2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,17 +26,14 @@ SET(APPCORE_COMMON "appcore-common") @@ -16,8 +16,8 @@ index fd053b7..2403d3d 100644 SET(HEADERS_common appcore-common.h) INCLUDE(FindPkgConfig) --SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config ecore") -+SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul libtzplatform-config ecore") +-SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config") ++SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul libtzplatform-config") IF (with_x11) SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 ecore-x") ENDIF (with_x11) @@ -25,8 +25,8 @@ index fd053b7..2403d3d 100644 SET(HEADERS_efl appcore-efl.h) INCLUDE(FindPkgConfig) --SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul") -+SET(APPCORE_PKG_CHECK_MODULES2 "elementary ecore gobject-2.0 glib-2.0 aul") +-SET(APPCORE_PKG_CHECK_MODULES2 "dlog gobject-2.0 glib-2.0 aul") ++SET(APPCORE_PKG_CHECK_MODULES2 "gobject-2.0 glib-2.0 aul") IF (with_x11) SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x") ENDIF (with_x11) |