1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
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;
|
