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
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
From fb66405f4f8ee200a443e22d3b4f56a0e917f785 Mon Sep 17 00:00:00 2001
From: Manuel Bachmann <mbc@iot.bzh>
Date: Wed, 30 Sep 2015 05:22:25 +0200
Subject: [PATCH] Backport to Wayland/Weston 1.9.0 > 1.5.0.
Downgrade requirements to Wayland/Weston 1.9.0 > 1.5.0.
"wl_display_roundtrip_queue()" did not exist at the time,
so just use the wrapper functions instead.
Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
---
.../ilmClient/src/ilm_client_wayland_platform.c | 15 ++----
.../ilmControl/src/ilm_control_wayland_platform.c | 52 +++++++++++++++++---
protocol/CMakeLists.txt | 4 +-
weston-ivi-shell/CMakeLists.txt | 4 +-
weston-ivi-shell/src/ivi-extension.c | 9 +++-
weston-ivi-shell/src/ivi-layout-export.h | 2 +
6 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
index 55b1621..8730616 100644
--- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c
@@ -61,7 +61,6 @@ struct ilm_client_context {
struct wl_registry *registry;
struct wl_compositor *compositor;
struct ivi_application *ivi_application;
- struct wl_event_queue *queue;
struct wl_list list_surface;
@@ -167,12 +166,6 @@ destroy_client_resouses(void)
ctx->ivi_application = NULL;
}
- if (ctx->queue)
- {
- wl_event_queue_destroy(ctx->queue);
- ctx->queue = NULL;
- }
-
if (ctx->registry)
{
wl_registry_destroy(ctx->registry);
@@ -203,21 +196,19 @@ init_client(void)
wl_list_init(&ctx->list_surface);
- ctx->queue = wl_display_create_queue(ctx->display);
ctx->registry = wl_display_get_registry(ctx->display);
if (ctx->registry == NULL) {
- wl_event_queue_destroy(ctx->queue);
fprintf(stderr, "Failed to get registry\n");
return;
}
- wl_proxy_set_queue((void*)ctx->registry, ctx->queue);
if (wl_registry_add_listener(ctx->registry,
®istry_client_listener, ctx)) {
fprintf(stderr, "Failed to add registry listener\n");
return;
}
- wl_display_roundtrip_queue(ctx->display, ctx->queue);
+ wl_display_dispatch(ctx->display);
+ wl_display_roundtrip(ctx->display);
if ((ctx->display == NULL) || (ctx->ivi_application == NULL)) {
fprintf(stderr, "Failed to connect display at ilm_client\n");
@@ -239,7 +230,7 @@ get_client_instance(void)
exit(0);
}
- wl_display_roundtrip_queue(ctx->display, ctx->queue);
+ wl_display_roundtrip(ctx->display);
return ctx;
}
diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index 8910df5..61bdfc5 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -76,6 +76,46 @@ struct screen_context {
struct ilm_control_context *ctx;
};
+static void roundtrip_done(void *data, struct wl_callback *callback,
+ uint32_t serial)
+{
+ (void) serial;
+
+ *(int *)data = 1;
+
+ wl_callback_destroy(callback);
+}
+
+static struct wl_callback_listener roundtrip_listener = {roundtrip_done};
+
+int display_roundtrip_queue(struct wl_display *display,
+ struct wl_event_queue *queue)
+{
+ int done = 0;
+ int ret = 0;
+ struct wl_callback *callback = wl_display_sync(display);
+
+ if (! callback)
+ {
+ return -1;
+ }
+
+ wl_proxy_set_queue((void *)callback, queue);
+ wl_callback_add_listener(callback, &roundtrip_listener, &done);
+
+ while (ret != -1 && !done)
+ {
+ ret = wl_display_dispatch_queue(display, queue);
+ }
+
+ if (ret == -1 && !done)
+ {
+ wl_callback_destroy(callback);
+ }
+
+ return ret;
+}
+
static inline void lock_context(struct ilm_control_context *ctx)
{
pthread_mutex_lock(&ctx->mutex);
@@ -1304,11 +1344,11 @@ init_control(void)
if (
// first level objects; ivi_controller
- wl_display_roundtrip_queue(wl->display, wl->queue) == -1 ||
+ display_roundtrip_queue(wl->display, wl->queue) == -1 ||
// second level object: ivi_controller_surfaces/layers
- wl_display_roundtrip_queue(wl->display, wl->queue) == -1 ||
+ display_roundtrip_queue(wl->display, wl->queue) == -1 ||
// third level objects: ivi_controller_surfaces/layers properties
- wl_display_roundtrip_queue(wl->display, wl->queue) == -1)
+ display_roundtrip_queue(wl->display, wl->queue) == -1)
{
fprintf(stderr, "Failed to initialize wayland connection: %s\n", strerror(errno));
return -1;
@@ -1349,7 +1389,7 @@ ilmErrorTypes impl_sync_and_acquire_instance(struct ilm_control_context *ctx)
lock_context(ctx);
- if (wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) == -1) {
+ if (display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) == -1) {
int err = wl_display_get_error(ctx->wl.display);
fprintf(stderr, "Error communicating with wayland: %s\n", strerror(err));
unlock_context(ctx);
@@ -2454,7 +2494,7 @@ ilm_getPropertiesOfSurface(t_ilm_uint surfaceID,
// request statistics for surface
ivi_controller_surface_send_stats(ctx_surf->controller);
// force submission
- int ret = wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue);
+ int ret = display_roundtrip_queue(ctx->wl.display, ctx->wl.queue);
// If we got an error here, there is really no sense
// in returning the properties as something is fundamentally
@@ -2567,7 +2607,7 @@ ilm_commitChanges(void)
if (ctx->wl.controller != NULL) {
ivi_controller_commit_changes(ctx->wl.controller);
- if (wl_display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) != -1)
+ if (display_roundtrip_queue(ctx->wl.display, ctx->wl.queue) != -1)
{
returnValue = ILM_SUCCESS;
}
diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
index 6842131..207b8f1 100644
--- a/protocol/CMakeLists.txt
+++ b/protocol/CMakeLists.txt
@@ -22,8 +22,8 @@ cmake_minimum_required (VERSION 2.6)
project(ivi-extension-protocol)
find_package(PkgConfig REQUIRED)
-pkg_check_modules(WAYLAND_CLIENT wayland-client>=1.9.0 REQUIRED)
-pkg_check_modules(WAYLAND_SERVER wayland-server>=1.9.0 REQUIRED)
+pkg_check_modules(WAYLAND_CLIENT wayland-client>=1.5.0 REQUIRED)
+pkg_check_modules(WAYLAND_SERVER wayland-server>=1.5.0 REQUIRED)
find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt
index c2664df..927e3f5 100644
--- a/weston-ivi-shell/CMakeLists.txt
+++ b/weston-ivi-shell/CMakeLists.txt
@@ -23,8 +23,8 @@ cmake_minimum_required (VERSION 2.6)
project(ivi-controller)
find_package(PkgConfig REQUIRED)
-pkg_check_modules(WAYLAND_SERVER wayland-server>=1.9.0 REQUIRED)
-pkg_check_modules(WESTON weston>=1.9.0 REQUIRED)
+pkg_check_modules(WAYLAND_SERVER wayland-server>=1.5.0 REQUIRED)
+pkg_check_modules(WESTON weston>=1.5.0 REQUIRED)
pkg_check_modules(PIXMAN pixman-1 REQUIRED)
GET_TARGET_PROPERTY(IVI_EXTENSION_INCLUDE_DIRS ivi-extension-protocol INCLUDE_DIRECTORIES)
diff --git a/weston-ivi-shell/src/ivi-extension.c b/weston-ivi-shell/src/ivi-extension.c
index bb3b23d..ba2d7e6 100755
--- a/weston-ivi-shell/src/ivi-extension.c
+++ b/weston-ivi-shell/src/ivi-extension.c
@@ -702,11 +702,17 @@ ivi_extension_layer_set_fade_info(struct ivishell *shell,
start_alpha, end_alpha);
}
+#if 0 // this is for weston/wayland 1.7.0
WL_EXPORT int
controller_module_init(struct weston_compositor *compositor,
int *argc, char *argv[],
const struct ivi_controller_interface *interface,
size_t interface_version)
+#else
+WL_EXPORT int
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[])
+#endif
{
struct ivi_controller_shell *controller_shell;
(void)argc;
@@ -718,7 +724,8 @@ controller_module_init(struct weston_compositor *compositor,
memset(controller_shell, 0, sizeof *controller_shell);
- controller_shell->interface = interface;
+ //controller_shell->interface = interface;
+ controller_shell->interface = get_ivi_controller_interface();
init_ivi_shell(compositor, &controller_shell->base);
diff --git a/weston-ivi-shell/src/ivi-layout-export.h b/weston-ivi-shell/src/ivi-layout-export.h
index d38d6ea..e07acb2 100644
--- a/weston-ivi-shell/src/ivi-layout-export.h
+++ b/weston-ivi-shell/src/ivi-layout-export.h
@@ -169,6 +169,8 @@ typedef void (*ivi_controller_surface_content_callback)(
struct ivi_layout_surface *ivisurf,
int32_t content,
void *userdata);
+
+struct ivi_controller_interface *get_ivi_controller_interface(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
--
1.7.9.5
|
