*/
#include "ivi-compositor.h"
+#include "policy.h"
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
#if 0
static struct weston_output *
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
+ surface->activated_by_default = false;
+
+ if (ivi->policy && ivi->policy->api.surface_create &&
+ !ivi->policy->api.surface_create(surface, ivi)) {
+ free(surface);
+ wl_client_post_no_memory(client);
+ return;
+ }
weston_desktop_surface_set_user_data(dsurface, surface);
if (ivi->shell_client.ready) {
- ivi_set_desktop_surface(surface);
+ ivi_check_pending_desktop_surface(surface);
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
- struct ivi_output *output = surface->desktop.last_output;
-
- /* TODO */
- if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
+ struct ivi_output *output;
+
+ if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
+ output = surface->desktop.last_output;
+ else if (surface->role == IVI_SURFACE_ROLE_POPUP)
+ output = surface->popup.output;
+ else if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
+ surface->role == IVI_SURFACE_ROLE_SPLIT_V)
+ output = surface->split.output;
+ else if (surface->role == IVI_SURFACE_ROLE_FS)
+ output = surface->fs.output;
+ else
return;
+ /* resize the active surface to the original size */
+ if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
+ surface->role == IVI_SURFACE_ROLE_SPLIT_V) {
+ if (output && output->active) {
+ ivi_layout_desktop_resize(output->active, output->area_saved);
+ }
+ /* restore the area back so we can re-use it again if needed */
+ output->area = output->area_saved;
+ }
+
/* reset the active surface as well */
- if (output && output->active) {
+ if (output && output->active && output->active == surface) {
output->active->view->is_mapped = false;
output->active->view->surface->is_mapped = false;
{
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
+ struct ivi_policy *policy = surface->ivi->policy;
+
+ if (policy && policy->api.surface_commited &&
+ !policy->api.surface_commited(surface, surface->ivi))
+ return;
+
weston_compositor_schedule_repaint(surface->ivi->compositor);
switch (surface->role) {
case IVI_SURFACE_ROLE_PANEL:
ivi_layout_panel_committed(surface);
break;
+ case IVI_SURFACE_ROLE_POPUP:
+ ivi_layout_popup_committed(surface);
+ break;
+ case IVI_SURFACE_ROLE_FS:
+ ivi_layout_fs_committed(surface);
+ break;
+ case IVI_SURFACE_ROLE_SPLIT_H:
+ case IVI_SURFACE_ROLE_SPLIT_V:
+ ivi_layout_split_committed(surface);
+ break;
case IVI_SURFACE_ROLE_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
default: /* fall through */