* 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 *
struct weston_desktop_client *dclient;
struct wl_client *client;
struct ivi_surface *surface;
+ struct ivi_output *active_output = NULL;
+ const char *app_id = NULL;
dclient = weston_desktop_surface_get_client(dsurface);
client = weston_desktop_client_get_client(dclient);
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);
+ app_id = weston_desktop_surface_get_app_id(dsurface);
+
+ if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
+ ivi_set_pending_desktop_surface_remote(active_output, app_id);
+
if (ivi->shell_client.ready) {
- ivi_set_desktop_surface(surface);
+ ivi_check_pending_desktop_surface(surface);
+ weston_log("Added surface %p, app_id %s, role %s\n", surface,
+ app_id, ivi_layout_get_surface_role_name(surface));
} else {
/*
* We delay creating "normal" desktop surfaces until later, to
* give the shell-client an oppurtunity to set the surface as a
* background/panel.
*/
+ weston_log("Added surface %p, app_id %s to pending list\n",
+ surface, app_id);
wl_list_insert(&ivi->pending_surfaces, &surface->link);
}
}
+static bool
+desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role)
+{
+ int count = 0;
+ struct ivi_surface *surf;
+
+ wl_list_for_each(surf, &ivi->surfaces, link)
+ if (surf->role == role)
+ count++;
+
+ return (count == 1);
+}
+
static void
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
{
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
- /* TODO */
- if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
- return;
+ struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+
+ /* special corner-case, pending_surfaces which are never activated or
+ * being assigned an output might land here so just remove the surface */
+ if (output == NULL && surface->role == IVI_SURFACE_ROLE_NONE)
+ goto skip_output_asignment;
+
+ assert(output != NULL);
+
+ /* 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 && 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;
+ }
+
+ /* check if there's a last 'remote' surface and insert a black
+ * surface view if there's no background set for that output
+ */
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_REMOTE))
+ if (!output->background)
+ insert_black_surface(output);
+
+ if (desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_DESKTOP))
+ if (!output->background)
+ insert_black_surface(output);
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;
+ }
+
+skip_output_asignment:
+ weston_log("Removed surface %p, app_id %s, role %s\n", surface,
+ weston_desktop_surface_get_app_id(dsurface),
+ ivi_layout_get_surface_role_name(surface));
+ wl_list_remove(&surface->link);
free(surface);
}
{
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_DESKTOP:
+ case IVI_SURFACE_ROLE_REMOTE:
ivi_layout_desktop_committed(surface);
break;
- case IVI_SURFACE_ROLE_PANEL:
- ivi_layout_panel_committed(surface);
+ case IVI_SURFACE_ROLE_POPUP:
+ ivi_layout_popup_committed(surface);
+ break;
+ case IVI_SURFACE_ROLE_FULLSCREEN:
+ ivi_layout_fullscreen_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:
+ case IVI_SURFACE_ROLE_PANEL:
default: /* fall through */
break;
}
Code Review / src / agl-compositor.git / blobdiff