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
|
diff --git a/Makefile.am b/Makefile.am
index cdf82ab4..d990d400 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -993,6 +993,7 @@ ivi_shell_la_LDFLAGS = -module -avoid-version
ivi_shell_la_LIBADD = \
libshared.la \
libweston-@LIBWESTON_MAJOR@.la \
+ libweston-desktop-@LIBWESTON_MAJOR@.la \
$(COMPOSITOR_LIBS)
ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
ivi_shell_la_SOURCES = \
diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
index fe5be01a..c054130b 100644
--- a/ivi-shell/ivi-layout-private.h
+++ b/ivi-shell/ivi-layout-private.h
@@ -30,6 +30,7 @@
#include "compositor.h"
#include "ivi-layout-export.h"
+#include "libweston-desktop/libweston-desktop.h"
struct ivi_layout_view {
struct wl_list link; /* ivi_layout::view_list */
@@ -52,6 +53,7 @@ struct ivi_layout_surface {
struct ivi_layout *layout;
struct weston_surface *surface;
+ struct weston_desktop_surface *weston_desktop_surface;
struct ivi_layout_surface_properties prop;
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index f3156d35..84db2c97 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -44,7 +44,7 @@
#include "ivi-shell.h"
#include "ivi-application-server-protocol.h"
-#include "ivi-layout-export.h"
+#include "ivi-layout-private.h"
#include "ivi-layout-shell.h"
#include "shared/helpers.h"
#include "compositor/weston.h"
@@ -271,6 +271,8 @@ application_surface_create(struct wl_client *client,
return;
}
+ layout_surface->weston_desktop_surface = NULL;
+
ivisurf = zalloc(sizeof *ivisurf);
if (ivisurf == NULL) {
wl_resource_post_no_memory(resource);
diff --git a/ivi-shell/ivi-shell.h b/ivi-shell/ivi-shell.h
index e35f75f2..be430853 100644
--- a/ivi-shell/ivi-shell.h
+++ b/ivi-shell/ivi-shell.h
@@ -30,6 +30,7 @@
#include <stdint.h>
#include "compositor.h"
+#include "libweston-desktop/libweston-desktop.h"
struct ivi_shell
{
@@ -37,6 +38,7 @@ struct ivi_shell
struct weston_compositor *compositor;
+ struct weston_desktop *desktop;
struct wl_list ivi_surface_list; /* struct ivi_shell_surface::link */
struct text_backend *text_backend;
|
