mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-layout: introduced surface create and configure

Browse Source 
Introduced surface create and configure function for xdg-apps.

Signed-off-by: Michael Teyfel <mteyfel@de.adit-jv.com>
This commit is contained in:
Michael Teyfel
2019-02-05 15:15:22 +01:00
committed by Daniel Stone
parent 65e1be1234
commit 4d886d6058
2 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-layout-shell.h
+7
View File
@@ -39,6 +39,13 @@ struct weston_view;
struct weston_surface; struct weston_surface;
struct ivi_layout_surface; struct ivi_layout_surface;
void
ivi_layout_desktop_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height);
struct ivi_layout_surface*
ivi_layout_desktop_surface_create(struct weston_surface *wl_surface);
void void
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height); int32_t width, int32_t height);
ivi-shell/ivi-layout.c
+50 -23
View File
@@ -1905,20 +1905,8 @@ ivi_layout_surface_dump(struct weston_surface *surface,
* methods of interaction between ivi-shell with ivi-layout * methods of interaction between ivi-shell with ivi-layout
*/ */
void static struct ivi_layout_surface*
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, surface_create(struct weston_surface *wl_surface, uint32_t id_surface)
int32_t width, int32_t height)
{
struct ivi_layout *layout = get_instance();
/* emit callback which is set by ivi-layout api user */
wl_signal_emit(&layout->surface_notification.configure_changed,
ivisurf);
}
struct ivi_layout_surface*
ivi_layout_surface_create(struct weston_surface *wl_surface,
uint32_t id_surface)
{ {
struct ivi_layout *layout = get_instance(); struct ivi_layout *layout = get_instance();
struct ivi_layout_surface *ivisurf = NULL; struct ivi_layout_surface *ivisurf = NULL;
@@ -1928,14 +1916,6 @@ ivi_layout_surface_create(struct weston_surface *wl_surface,
return NULL; return NULL;
} }
ivisurf = get_surface(&layout->surface_list, id_surface);
if (ivisurf != NULL) {
if (ivisurf->surface != NULL) {
weston_log("id_surface(%d) is already created\n", id_surface);
return NULL;
}
}
ivisurf = calloc(1, sizeof *ivisurf); ivisurf = calloc(1, sizeof *ivisurf);
if (ivisurf == NULL) { if (ivisurf == NULL) {
weston_log("fails to allocate memory\n"); weston_log("fails to allocate memory\n");
@@ -1959,7 +1939,54 @@ ivi_layout_surface_create(struct weston_surface *wl_surface,
wl_list_insert(&layout->surface_list, &ivisurf->link); wl_list_insert(&layout->surface_list, &ivisurf->link);
wl_signal_emit(&layout->surface_notification.created, ivisurf); return ivisurf;
}
void
ivi_layout_desktop_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height)
{
struct ivi_layout *layout = get_instance();
/* emit callback which is set by ivi-layout api user */
wl_signal_emit(&layout->surface_notification.configure_desktop_changed,
ivisurf);
}
struct ivi_layout_surface*
ivi_layout_desktop_surface_create(struct weston_surface *wl_surface)
{
return surface_create(wl_surface, IVI_INVALID_ID);
}
void
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height)
{
struct ivi_layout *layout = get_instance();
/* emit callback which is set by ivi-layout api user */
wl_signal_emit(&layout->surface_notification.configure_changed,
ivisurf);
}
struct ivi_layout_surface*
ivi_layout_surface_create(struct weston_surface *wl_surface,
uint32_t id_surface)
{
struct ivi_layout *layout = get_instance();
struct ivi_layout_surface *ivisurf = NULL;
ivisurf = get_surface(&layout->surface_list, id_surface);
if (ivisurf) {
weston_log("id_surface(%d) is already created\n", id_surface);
return NULL;
}
ivisurf = surface_create(wl_surface, id_surface);
if (ivisurf)
wl_signal_emit(&layout->surface_notification.created, ivisurf);
return ivisurf; return ivisurf;
} }