* SOFTWARE.
*/
+#include <assert.h>
#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);
- /* 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
return;
+ /* reset the active surface as well */
+ if (output && output->active && output->active == surface) {
+ output->active->view->is_mapped = false;
+ output->active->view->surface->is_mapped = false;
+
+ weston_layer_entry_remove(&output->active->view->layer_link);
+ output->active = NULL;
+ }
if (weston_surface_is_mapped(wsurface)) {
weston_desktop_surface_unlink_view(surface->view);
weston_view_destroy(surface->view);
- wl_list_remove(&surface->link);
}
+
+ /* invalidate agl-shell surfaces so we can re-use them when
+ * binding again */
+ if (surface->role == IVI_SURFACE_ROLE_PANEL) {
+ switch (surface->panel.edge) {
+ case AGL_SHELL_EDGE_TOP:
+ output->top = NULL;
+ break;
+ case AGL_SHELL_EDGE_BOTTOM:
+ output->bottom = NULL;
+ break;
+ case AGL_SHELL_EDGE_LEFT:
+ output->left = NULL;
+ break;
+ case AGL_SHELL_EDGE_RIGHT:
+ output->right = NULL;
+ break;
+ default:
+ assert(!"Invalid edge detected\n");
+ }
+ } else if (surface->role == IVI_SURFACE_ROLE_BACKGROUND) {
+ output->background = NULL;
+ }
+
+ wl_list_remove(&surface->link);
free(surface);
}
{
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
- if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
+ 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_DESKTOP:
ivi_layout_desktop_committed(surface);
+ break;
+ 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_NONE:
+ case IVI_SURFACE_ROLE_BACKGROUND:
+ default: /* fall through */
+ break;
+ }
}
static void