* SOFTWARE.
*/
+#include <assert.h>
#include "ivi-compositor.h"
+#include "policy.h"
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include "shared/helpers.h"
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
+
+#include "agl-shell-desktop-server-protocol.h"
#if 0
static struct weston_output *
}
#endif
+static void
+desktop_advertise_app(struct wl_listener *listener, void *data)
+{
+ struct ivi_surface *surface;
+
+ surface = wl_container_of(listener, surface, listener_advertise_app);
+
+ agl_shell_desktop_advertise_application_id(surface->ivi, surface);
+}
+
static void
desktop_ping_timeout(struct weston_desktop_client *dclient, void *userdata)
{
/* not supported */
}
+struct weston_output *
+get_default_output(struct weston_compositor *compositor)
+{
+ if (wl_list_empty(&compositor->output_list))
+ return NULL;
+
+ return container_of(compositor->output_list.next,
+ struct weston_output, link);
+}
+
+struct weston_output *
+get_focused_output(struct weston_compositor *compositor)
+{
+ struct weston_seat *seat;
+ struct weston_output *output = NULL;
+
+ wl_list_for_each(seat, &compositor->seat_list, link) {
+ struct weston_touch *touch = weston_seat_get_touch(seat);
+ struct weston_pointer *pointer = weston_seat_get_pointer(seat);
+ struct weston_keyboard *keyboard =
+ weston_seat_get_keyboard(seat);
+
+ if (touch && touch->focus)
+ output = touch->focus->output;
+ else if (pointer && pointer->focus)
+ output = pointer->focus->output;
+ else if (keyboard && keyboard->focus)
+ output = keyboard->focus->output;
+
+ if (output)
+ break;
+ }
+
+ return output;
+}
+
+
static void
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
{
struct weston_desktop_client *dclient;
struct wl_client *client;
struct ivi_surface *surface;
+ struct ivi_output *active_output = NULL;
+ struct weston_output *output = NULL;
+ const char *app_id = NULL;
dclient = weston_desktop_surface_get_client(dsurface);
client = weston_desktop_client_get_client(dclient);
return;
}
+ surface->view = weston_desktop_surface_create_view(dsurface);
+ if (!surface->view) {
+ free(surface);
+ wl_client_post_no_memory(client);
+ return;
+ }
+
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
- surface->old_geom.width = -1;
- surface->old_geom.height = -1;
+ surface->activated_by_default = false;
+ surface->advertised_on_launch = false;
+ surface->checked_pending = false;
+ wl_list_init(&surface->link);
- weston_desktop_surface_set_user_data(dsurface, surface);
+ wl_signal_init(&surface->signal_advertise_app);
- if (ivi->shell_client.ready) {
- ivi_set_desktop_surface(surface);
-
- ivi_reflow_outputs(ivi);
- } else {
- /*
- * We delay creating "normal" desktop surfaces until later, to
- * give the shell-client an oppurtunity to set the surface as a
- * background/panel.
- */
- wl_list_insert(&ivi->pending_surfaces, &surface->link);
- }
-}
+ surface->listener_advertise_app.notify = desktop_advertise_app;
+ wl_signal_add(&surface->signal_advertise_app,
+ &surface->listener_advertise_app);
-static void
-desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
-{
- struct ivi_surface *surface =
- weston_desktop_surface_get_user_data(dsurface);
- struct weston_surface *wsurface =
- weston_desktop_surface_get_surface(dsurface);
- struct ivi_compositor *ivi = surface->ivi;
+ weston_desktop_surface_set_user_data(dsurface, surface);
- /* TODO */
- if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
+ if (ivi->policy && ivi->policy->api.surface_create &&
+ !ivi->policy->api.surface_create(surface, ivi)) {
+ wl_client_post_no_memory(client);
return;
-
- if (weston_surface_is_mapped(wsurface)) {
- weston_desktop_surface_unlink_view(surface->desktop.view);
- weston_view_destroy(surface->desktop.view);
- wl_list_remove(&surface->link);
}
- free(surface);
- ivi_reflow_outputs(ivi);
-}
-static void
-surface_committed(struct ivi_surface *surface)
-{
- struct ivi_compositor *ivi = surface->ivi;
- struct weston_desktop_surface *dsurface = surface->dsurface;
- struct weston_geometry geom, old_geom;
+ 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);
+
+ /* reset any caps to make sure we apply the new caps */
+ ivi_seat_reset_caps_sent(ivi);
- old_geom = surface->old_geom;
- geom = weston_desktop_surface_get_geometry(dsurface);
+ output = get_focused_output(ivi->compositor);
+ if (!output)
+ output = get_default_output(ivi->compositor);
- surface->old_geom = geom;
+ if (output && ivi->shell_client.ready) {
+ struct ivi_output *ivi_output = to_ivi_output(output);
- if (geom.width != old_geom.width || geom.height != old_geom.height) {
- ivi_reflow_outputs(ivi);
+ /* verify if by any chance this surfaces hasn't been assigned a
+ * different role before sending the maximized state */
+ if (!ivi_check_pending_surface(surface)) {
+ weston_log("Setting surface to initial size of surface to %dx%d\n",
+ ivi_output->area.width, ivi_output->area.height);
+ weston_desktop_surface_set_maximized(dsurface, true);
+ weston_desktop_surface_set_size(dsurface,
+ ivi_output->area.width, ivi_output->area.height);
+ }
}
+ /*
+ * We delay creating "normal" desktop surfaces until later, to
+ * give the shell-client an oppurtunity to set the surface as a
+ * background/panel.
+ * Also delay the creation in order to have a valid app_id
+ * which will be used to set the proper role.
+ */
+ weston_log("Added surface %p, app_id %s to pending list\n",
+ surface, app_id);
+ wl_list_insert(&ivi->pending_surfaces, &surface->link);
- //wl_list_insert(&ivi->surfaces, &surface->link);
}
-static void
-background_committed(struct ivi_surface *surface)
+static bool
+desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role)
{
- struct ivi_compositor *ivi = surface->ivi;
- struct ivi_output *output = surface->bg.output;
- struct weston_output *woutput = output->output;
- struct weston_desktop_surface *dsurface = surface->dsurface;
- struct weston_surface *wsurface =
- weston_desktop_surface_get_surface(dsurface);
+ int count = 0;
+ struct ivi_surface *surf;
- if (wsurface->is_mapped)
- return;
-
- surface->bg.view = weston_desktop_surface_create_view(dsurface);
-
- weston_view_set_output(surface->bg.view, woutput);
- weston_view_set_position(surface->bg.view,
- woutput->x,
- woutput->y);
- weston_layer_entry_insert(&ivi->background.view_list,
- &surface->bg.view->layer_link);
+ wl_list_for_each(surf, &ivi->surfaces, link)
+ if (surf->role == role)
+ count++;
- weston_view_update_transform(surface->bg.view);
- weston_view_schedule_repaint(surface->bg.view);
-
- wsurface->is_mapped = true;
+ return (count == 1);
}
static void
-panel_committed(struct ivi_surface *surface)
+desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
{
- struct ivi_compositor *ivi = surface->ivi;
- struct ivi_output *output = surface->bg.output;
- struct weston_output *woutput = output->output;
- struct weston_desktop_surface *dsurface = surface->dsurface;
+ struct ivi_surface *surface =
+ weston_desktop_surface_get_user_data(dsurface);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
- struct weston_geometry geom;
- int32_t x = woutput->x;
- int32_t y = woutput->y;
+ const char *app_id = NULL;
+
+ struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+
+ wl_list_remove(&surface->listener_advertise_app.link);
+ surface->listener_advertise_app.notify = NULL;
+
+ app_id = weston_desktop_surface_get_app_id(dsurface);
+
+ /* special corner-case, pending_surfaces which are never activated or
+ * being assigned an output might land here so just remove the surface;
+ *
+ * the DESKTOP role can happen here as well, because we can fall-back
+ * to that when we try to determine the role type. Application that
+ * do not set the app_id will be land here, when destroyed */
+ if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+ surface->role == IVI_SURFACE_ROLE_DESKTOP))
+ 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;
+ }
- if (wsurface->is_mapped)
- 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;
+ }
- surface->panel.view = weston_desktop_surface_create_view(dsurface);
+ if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
+ output->type == OUTPUT_REMOTE)
+ ivi_destroy_waltham_destroy(surface);
- geom = weston_desktop_surface_get_geometry(dsurface);
- switch (surface->panel.edge) {
- case AGL_SHELL_EDGE_TOP:
- /* Do nothing */
- break;
- case AGL_SHELL_EDGE_BOTTOM:
- y += woutput->height - geom.height;
- break;
- case AGL_SHELL_EDGE_LEFT:
- /* Do nothing */
- break;
- case AGL_SHELL_EDGE_RIGHT:
- x += woutput->width - geom.width;
- break;
+ /* 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) ||
+ desktop_surface_check_last_remote_surfaces(output->ivi,
+ IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE)
+ 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);
}
- weston_view_set_output(surface->panel.view, woutput);
- weston_view_set_position(surface->panel.view, x, y);
- weston_layer_entry_insert(&ivi->normal.view_list,
- &surface->panel.view->layer_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,
+ app_id, ivi_layout_get_surface_role_name(surface));
+
+ if (app_id && output)
+ shell_advertise_app_state(output->ivi, app_id,
+ NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
- weston_view_update_transform(surface->panel.view);
- weston_view_schedule_repaint(surface->panel.view);
+ wl_list_remove(&surface->link);
- wsurface->is_mapped = true;
+ free(surface);
}
static void
desktop_committed(struct weston_desktop_surface *dsurface,
int32_t sx, int32_t sy, void *userdata)
{
+ struct ivi_compositor *ivi = userdata;
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;
+
+ if (ivi->shell_client.ready && !surface->checked_pending) {
+ const char * app_id = weston_desktop_surface_get_app_id(dsurface);
+ weston_log("Checking pending surface %p, app_id %s\n", surface,
+ app_id);
+ wl_list_remove(&surface->link);
+ wl_list_init(&surface->link);
+ ivi_check_pending_desktop_surface(surface);
+ surface->checked_pending = true;
+ }
+
+ if (!surface->advertised_on_launch &&
+ !wl_list_empty(&surface->ivi->desktop_clients))
+ wl_signal_emit(&surface->signal_advertise_app, surface);
weston_compositor_schedule_repaint(surface->ivi->compositor);
switch (surface->role) {
- case IVI_SURFACE_ROLE_NONE:
- break;
case IVI_SURFACE_ROLE_DESKTOP:
- surface_committed(surface);
+ case IVI_SURFACE_ROLE_REMOTE:
+ ivi_layout_desktop_committed(surface);
break;
- case IVI_SURFACE_ROLE_BACKGROUND:
- background_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:
- panel_committed(surface);
+ default: /* fall through */
break;
}
}