projects
/
platform
/
core
/
appfw
/
app-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update log level
[platform/core/appfw/app-core.git]
/
src
/
ui_base
/
appcore_ui_base.c
diff --git
a/src/ui_base/appcore_ui_base.c
b/src/ui_base/appcore_ui_base.c
index
eb14658
..
22de1ee
100644
(file)
--- a/
src/ui_base/appcore_ui_base.c
+++ b/
src/ui_base/appcore_ui_base.c
@@
-456,7
+456,7
@@
static void __raise_win(void)
win_id = __get_main_window();
win_id = __get_main_window();
- _
DBG
("Raise window: %d", win_id);
+ _
INFO
("Raise window: %d", win_id);
win = ecore_wl2_display_window_find(ecore_wl2_connected_display_get(NULL), win_id);
ecore_wl2_window_activate(win);
}
win = ecore_wl2_display_window_find(ecore_wl2_connected_display_get(NULL), win_id);
ecore_wl2_window_activate(win);
}
@@
-552,6
+552,16
@@
static void __unset_bg_state(void)
_DBG("bg state: %d", __context.bg_state);
}
_DBG("bg state: %d", __context.bg_state);
}
+static void __set_app_id(void)
+{
+ if (!tz_policy && __init_wl() < 0)
+ return;
+
+ tizen_policy_set_appid(tz_policy, getpid(), __context.appid);
+ wl_display_roundtrip(dsp);
+ _DBG("set appid: %s", __context.appid);
+}
+
static void __do_start(bundle *b)
{
const char *bg_launch;
static void __do_start(bundle *b)
{
const char *bg_launch;
@@
-624,7
+634,8
@@
EXPORT_API int appcore_ui_base_on_receive(aul_type type, bundle *b)
return 0;
}
return 0;
}
- if (type == AUL_TERMINATE_BGAPP && __context.state != AS_PAUSED)
+ if ((type == AUL_TERMINATE_BGAPP || type == AUL_TERMINATE_BG_INST) &&
+ __context.state != AS_PAUSED)
return 0;
if (type == AUL_START)
return 0;
if (type == AUL_START)
@@
-649,8
+660,10
@@
EXPORT_API int appcore_ui_base_on_receive(aul_type type, bundle *b)
break;
case AUL_TERMINATE:
break;
break;
case AUL_TERMINATE:
break;
+ case AUL_TERMINATE_BG_INST:
+ case AUL_TERMINATE_INST:
case AUL_TERMINATE_BGAPP:
case AUL_TERMINATE_BGAPP:
- _DBG("[APP %d]
is paused.
TERMINATE", getpid());
+ _DBG("[APP %d] TERMINATE", getpid());
__context.state = AS_DYING;
aul_status_update(STATUS_DYING);
if (__context.ops.base.exit)
__context.state = AS_DYING;
aul_status_update(STATUS_DYING);
if (__context.ops.base.exit)
@@
-797,22
+810,29
@@
static void __group_lower()
appcore_ui_base_group_remove();
}
appcore_ui_base_group_remove();
}
-EXPORT_API
void
appcore_ui_base_group_add()
+EXPORT_API
int
appcore_ui_base_group_add()
{
static bool attached = false;
{
static bool attached = false;
+ int ret;
_DBG("__group_attach");
if (attached)
_DBG("__group_attach");
if (attached)
- return;
+ return
0
;
int wid = __get_main_surface();
if (wid == 0) {
_ERR("window wasn't ready");
int wid = __get_main_surface();
if (wid == 0) {
_ERR("window wasn't ready");
- return;
+ return -1;
+ }
+
+ ret = aul_app_group_set_window(wid);
+ if (ret < 0) {
+ _ERR("Failed to set app group window. error(%d)", ret);
+ return ret;
}
}
- aul_app_group_set_window(wid);
attached = true;
attached = true;
+ return 0;
}
EXPORT_API void appcore_ui_base_group_remove()
}
EXPORT_API void appcore_ui_base_group_remove()
@@
-1009,6
+1029,9
@@
EXPORT_API int appcore_ui_base_init(appcore_ui_base_ops ops, int argc, char **ar
}
}
}
}
+ if (__context.hint & APPCORE_UI_BASE_HINT_WINDOW_ID_CONTROL)
+ __set_app_id();
+
return appcore_base_init(ops.base, argc, argv, data);
}
return appcore_base_init(ops.base, argc, argv, data);
}