diff options
author | Yuta Doi <yuta-d@witz-inc.co.jp> | 2017-01-18 15:05:05 +0900 |
---|---|---|
committer | Yuta Doi <yuta-d@witz-inc.co.jp> | 2017-01-18 15:05:05 +0900 |
commit | 978c6cfa7b9d072167083c3d17ccc9f89f038c2d (patch) | |
tree | 0966fe344ea7d393f54e7b34e92fc205befa8ba0 /meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch | |
parent | e20eca9f6d67e20d6a0b8a1ee63ac8f5efc18d5e (diff) |
Update app-core and add sensordupdate-appmgr3rd
from: d86d0066b93cf402badc408de591e54d6db6c164
to : 73f688b07dab4d695cc1f7bee4eec6701500eab4
Add sensord because app-core needs sensord instead of sensor.
Change-Id: I8f342c9dae12c27f730080edea57126bc39ffc1b
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch')
-rw-r--r-- | meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch | 133 |
1 files changed, 76 insertions, 57 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); |