#include <libweston/config-parser.h>
#include "shared/os-compatibility.h"
+#include "shared/helpers.h"
#include "agl-shell-server-protocol.h"
#include "agl-shell-desktop-server-protocol.h"
static void
create_black_surface_view(struct ivi_output *output);
+static void
+_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
+ uint32_t orientation, bool to_activate);
+
+static uint32_t
+reverse_orientation(uint32_t orientation);
+
void
agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
struct ivi_surface *surface)
agl_shell_desktop_advertise_application_id(ivi, surface);
}
+static struct pending_popup *
+ivi_ensure_popup(struct ivi_output *ioutput, int x, int y, int bx, int by,
+ int width, int height, const char *app_id)
+{
+ struct pending_popup *p_popup = zalloc(sizeof(*p_popup));
+ size_t len_app_id = strlen(app_id);
+
+ if (!p_popup)
+ return NULL;
+ p_popup->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_popup->app_id) {
+ free(p_popup);
+ return NULL;
+ }
+ memcpy(p_popup->app_id, app_id, len_app_id);
+ p_popup->ioutput = ioutput;
+ p_popup->x = x;
+ p_popup->y = y;
+
+ p_popup->bb.x = bx;
+ p_popup->bb.y = by;
+ p_popup->bb.width = width;
+ p_popup->bb.height = height;
+
+ return p_popup;
+}
+
static void
-ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
- int x, int y, int bx, int by, int width, int height,
- const char *app_id)
+ivi_update_popup(struct ivi_output *ioutput, int x, int y, int bx, int by,
+ int width, int height, const char *app_id, struct pending_popup *p_popup)
{
- struct ivi_compositor *ivi = ioutput->ivi;
size_t len_app_id = strlen(app_id);
- struct pending_popup *p_popup = zalloc(sizeof(*p_popup));
+ wl_list_remove(&p_popup->link);
+ wl_list_init(&p_popup->link);
+
+ memset(p_popup->app_id, 0, strlen(app_id) + 1);
+ free(p_popup->app_id);
p_popup->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_popup->app_id)
+ return;
memcpy(p_popup->app_id, app_id, len_app_id);
+
p_popup->ioutput = ioutput;
p_popup->x = x;
p_popup->y = y;
p_popup->bb.y = by;
p_popup->bb.width = width;
p_popup->bb.height = height;
+}
+
+static struct pending_fullscreen *
+ivi_ensure_fullscreen(struct ivi_output *ioutput, const char *app_id)
+{
+ struct pending_fullscreen *p_fullscreen = zalloc(sizeof(*p_fullscreen));
+ size_t len_app_id = strlen(app_id);
+
+ if (!p_fullscreen)
+ return NULL;
+ p_fullscreen->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_fullscreen->app_id) {
+ free(p_fullscreen);
+ return NULL;
+ }
+ memcpy(p_fullscreen->app_id, app_id, len_app_id);
+
+ p_fullscreen->ioutput = ioutput;
+ return p_fullscreen;
+}
+
+static void
+ivi_update_fullscreen(struct ivi_output *ioutput, const char *app_id,
+ struct pending_fullscreen *p_fullscreen)
+{
+ size_t len_app_id = strlen(app_id);
+
+ wl_list_remove(&p_fullscreen->link);
+ wl_list_init(&p_fullscreen->link);
+
+ memset(p_fullscreen->app_id, 0, strlen(app_id) + 1);
+ free(p_fullscreen->app_id);
+
+ p_fullscreen->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_fullscreen->app_id)
+ return;
+ memcpy(p_fullscreen->app_id, app_id, len_app_id);
+
+ p_fullscreen->ioutput = ioutput;
+}
+
+static struct pending_remote *
+ivi_ensure_remote(struct ivi_output *ioutput, const char *app_id)
+{
+ struct pending_remote *p_remote = zalloc(sizeof(*p_remote));
+ size_t len_app_id = strlen(app_id);
+
+ if (!p_remote)
+ return NULL;
+ p_remote->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_remote->app_id) {
+ free(p_remote);
+ return NULL;
+ }
+ memcpy(p_remote->app_id, app_id, len_app_id);
+
+ p_remote->ioutput = ioutput;
+ return p_remote;
+}
+
+static void
+ivi_update_remote(struct ivi_output *ioutput, const char *app_id,
+ struct pending_remote *p_remote)
+{
+ size_t len_app_id = strlen(app_id);
+
+ wl_list_remove(&p_remote->link);
+ wl_list_init(&p_remote->link);
+
+ memset(p_remote->app_id, 0, strlen(app_id) + 1);
+ free(p_remote->app_id);
+
+ p_remote->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!p_remote->app_id)
+ return;
+ memcpy(p_remote->app_id, app_id, len_app_id);
+
+ p_remote->ioutput = ioutput;
+}
+
+static void
+ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput, int x, int y, int bx,
+ int by, int width, int height, const char *app_id)
+{
+ struct ivi_compositor *ivi = ioutput->ivi;
+ struct pending_popup *p_popup = NULL;
+ struct pending_popup *popup;
+
+ wl_list_for_each(popup, &ivi->popup_pending_apps, link)
+ if (!strcmp(app_id, popup->app_id))
+ p_popup = popup;
+
+ if (!p_popup)
+ p_popup = ivi_ensure_popup(ioutput, x, y, bx, by, width, height, app_id);
+ else
+ ivi_update_popup(ioutput, x, y, bx, by, width, height, app_id, p_popup);
+ if (!p_popup)
+ return;
wl_list_insert(&ivi->popup_pending_apps, &p_popup->link);
}
const char *app_id)
{
struct ivi_compositor *ivi = ioutput->ivi;
- size_t len_app_id = strlen(app_id);
-
- struct pending_fullscreen *fs = zalloc(sizeof(*fs));
+ struct pending_fullscreen *p_fullscreen = NULL;
+ struct pending_fullscreen *fullscreen;
- fs->app_id = zalloc(sizeof(char) * (len_app_id + 1));
- memcpy(fs->app_id, app_id, len_app_id);
+ wl_list_for_each(fullscreen, &ivi->fullscreen_pending_apps, link)
+ if (!strcmp(app_id, fullscreen->app_id))
+ p_fullscreen = fullscreen;
- fs->ioutput = ioutput;
+ if (!p_fullscreen)
+ p_fullscreen = ivi_ensure_fullscreen(ioutput, app_id);
+ else
+ ivi_update_fullscreen(ioutput, app_id, p_fullscreen);
- wl_list_insert(&ivi->fullscreen_pending_apps, &fs->link);
+ if (!p_fullscreen)
+ return;
+ wl_list_insert(&ivi->fullscreen_pending_apps, &p_fullscreen->link);
}
static void
return;
split = zalloc(sizeof(*split));
+ if (!split)
+ return;
split->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+ if (!split->app_id) {
+ free(split);
+ return;
+ }
memcpy(split->app_id, app_id, len_app_id);
split->ioutput = ioutput;
const char *app_id)
{
struct ivi_compositor *ivi = ioutput->ivi;
- size_t len_app_id = strlen(app_id);
+ struct pending_remote *remote;
+ struct pending_remote *p_remote = NULL;
- struct pending_remote *remote = zalloc(sizeof(*remote));
+ wl_list_for_each(remote, &ivi->remote_pending_apps, link)
+ if (!strcmp(app_id, remote->app_id))
+ p_remote = remote;
- remote->app_id = zalloc(sizeof(char) * (len_app_id + 1));
- memcpy(remote->app_id, app_id, len_app_id);
-
- remote->ioutput = ioutput;
+ if (!p_remote)
+ p_remote = ivi_ensure_remote(ioutput, app_id);
+ else
+ ivi_update_remote(ioutput, app_id, p_remote);
+ if (!p_remote)
+ return;
- wl_list_insert(&ivi->remote_pending_apps, &remote->link);
+ wl_list_insert(&ivi->remote_pending_apps, &p_remote->link);
}
return false;
}
-
-bool
-ivi_check_pending_surface(struct ivi_surface *surface)
+void
+ivi_check_pending_surface_desktop(struct ivi_surface *surface,
+ enum ivi_surface_role *role)
{
struct ivi_compositor *ivi = surface->ivi;
struct wl_list *role_pending_list;
const char *app_id =
weston_desktop_surface_get_app_id(surface->dsurface);
- if (!app_id)
- return false;
-
role_pending_list = &ivi->popup_pending_apps;
wl_list_for_each(p_popup, role_pending_list, link) {
- if (!strcmp(app_id, p_popup->app_id)) {
- return true;
+ if (app_id && !strcmp(app_id, p_popup->app_id)) {
+ *role = IVI_SURFACE_ROLE_POPUP;
+ return;
}
}
role_pending_list = &ivi->split_pending_apps;
wl_list_for_each(p_split, role_pending_list, link) {
- if (!strcmp(app_id, p_split->app_id)) {
- return true;
+ if (app_id && !strcmp(app_id, p_split->app_id)) {
+ *role = IVI_SURFACE_ROLE_SPLIT_V;
+ return;
}
}
role_pending_list = &ivi->fullscreen_pending_apps;
wl_list_for_each(p_fullscreen, role_pending_list, link) {
- if (!strcmp(app_id, p_fullscreen->app_id)) {
- return true;
+ if (app_id && !strcmp(app_id, p_fullscreen->app_id)) {
+ *role = IVI_SURFACE_ROLE_FULLSCREEN;
+ return;
}
}
role_pending_list = &ivi->remote_pending_apps;
wl_list_for_each(p_remote, role_pending_list, link) {
- if (!strcmp(app_id, p_remote->app_id)) {
- return true;
+ if (app_id && !strcmp(app_id, p_remote->app_id)) {
+ *role = IVI_SURFACE_ROLE_REMOTE;
+ return;
}
}
/* else, we are a regular desktop surface */
- return false;
+ *role = IVI_SURFACE_ROLE_DESKTOP;
}
+struct pending_app *
+ivi_check_pending_app_type(struct ivi_surface *surface, enum ivi_surface_role role)
+{
+ struct pending_app *papp;
+ const char *app_id = NULL;
+
+ // get app id
+ app_id = weston_desktop_surface_get_app_id(surface->dsurface);
+
+ if (!app_id)
+ return NULL;
+
+ wl_list_for_each(papp, &surface->ivi->pending_apps, link) {
+ if (strcmp(app_id, papp->app_id) == 0 && papp->role == role)
+ return papp;
+ }
+
+ return NULL;
+}
void
ivi_check_pending_desktop_surface(struct ivi_surface *surface)
return;
}
+ /* new way of doing it */
+ struct pending_app *papp =
+ ivi_check_pending_app_type(surface, IVI_SURFACE_ROLE_TILE);
+ if (papp) {
+ struct pending_app_tile *papp_tile =
+ container_of(papp, struct pending_app_tile, base);
+
+ // handle the currently active surface
+ if (papp->ioutput->active) {
+ _ivi_set_shell_surface_split(papp->ioutput->active, NULL,
+ reverse_orientation(papp_tile->orientation), false);
+ }
+
+ surface->role = IVI_SURFACE_ROLE_TILE;
+ wl_list_insert(&surface->ivi->surfaces, &surface->link);
+
+ _ivi_set_shell_surface_split(surface, papp->ioutput,
+ papp_tile->orientation, true);
+
+ /* remove it from pending */
+ wl_list_remove(&papp->link);
+ free(papp->app_id);
+ free(papp);
+
+ return;
+ }
+
+
/* if we end up here means we have a regular desktop app and
* try to activate it */
ivi_set_desktop_surface(surface);
return 0;
}
+
+static void
+ivi_surf_destroy(struct ivi_surface *surf)
+{
+ struct weston_surface *wsurface = surf->view->surface;
+
+ if (weston_surface_is_mapped(wsurface)) {
+ weston_desktop_surface_unlink_view(surf->view);
+ weston_view_destroy(surf->view);
+ }
+
+ wl_list_remove(&surf->link);
+ free(surf);
+}
+
+static void
+ivi_shell_destroy_views_on_layer(struct weston_layer *layer)
+{
+ struct weston_view *view, *view_next;
+
+ wl_list_for_each_safe(view, view_next, &layer->view_list.link, layer_link.link) {
+ struct ivi_surface *ivi_surf =
+ get_ivi_shell_surface(view->surface);
+ if (ivi_surf)
+ ivi_surf_destroy(ivi_surf);
+ }
+}
+
+void
+ivi_shell_finalize(struct ivi_compositor *ivi)
+{
+ struct ivi_output *output;
+
+ ivi_shell_destroy_views_on_layer(&ivi->hidden);
+ weston_layer_fini(&ivi->hidden);
+
+ ivi_shell_destroy_views_on_layer(&ivi->background);
+ weston_layer_fini(&ivi->background);
+
+ ivi_shell_destroy_views_on_layer(&ivi->normal);
+ weston_layer_fini(&ivi->normal);
+
+ ivi_shell_destroy_views_on_layer(&ivi->panel);
+ weston_layer_fini(&ivi->panel);
+
+ ivi_shell_destroy_views_on_layer(&ivi->popup);
+ weston_layer_fini(&ivi->popup);
+
+ wl_list_for_each(output, &ivi->outputs, link) {
+ if (output->fullscreen_view.fs->view) {
+ weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+ output->fullscreen_view.fs->view = NULL;
+ }
+ }
+ weston_layer_fini(&ivi->fullscreen);
+}
+
static void
ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource *resource)
{
return;
surface = weston_surface_create(wc);
+ if (!surface)
+ return;
view = weston_view_create(surface);
-
- assert(view || surface);
+ if (!view) {
+ weston_surface_destroy(surface);
+ return;
+ }
weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1);
weston_surface_set_size(surface, woutput->width, woutput->height);
weston_view_set_position(view, woutput->x, woutput->y);
output->fullscreen_view.fs = zalloc(sizeof(struct ivi_surface));
+ if (!output->fullscreen_view.fs) {
+ weston_surface_destroy(surface);
+ return;
+ }
output->fullscreen_view.fs->view = view;
output->fullscreen_view.fs_destroy.notify = destroy_black_view;
struct ivi_output *output;
struct ivi_surface *surface, *tmp;
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ wl_resource_post_error(shell_res,
+ WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell has already been bound. "
+ "Check out bound_fail event");
+ return;
+ }
+
/* Init already finished. Do nothing */
if (ivi->shell_client.ready)
return;
+
ivi->shell_client.ready = true;
wl_list_for_each(output, &ivi->outputs, link) {
struct weston_output *woutput = weston_head_get_output(head);
struct ivi_output *output = to_ivi_output(woutput);
struct weston_surface *wsurface = wl_resource_get_user_data(surface_res);
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
struct weston_desktop_surface *dsurface;
struct ivi_surface *surface;
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ wl_resource_post_error(shell_res,
+ WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell has already been bound. "
+ "Check out bound_fail event");
+ return;
+ }
+
dsurface = weston_surface_get_desktop_surface(wsurface);
if (!dsurface) {
wl_resource_post_error(shell_res,
struct weston_output *woutput = weston_head_get_output(head);
struct ivi_output *output = to_ivi_output(woutput);
struct weston_surface *wsurface = wl_resource_get_user_data(surface_res);
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
struct weston_desktop_surface *dsurface;
struct ivi_surface *surface;
struct ivi_surface **member;
int32_t width = 0, height = 0;
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ wl_resource_post_error(shell_res,
+ WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell has already been bound. "
+ "Check out bound_fail event");
+ return;
+ }
+
dsurface = weston_surface_get_desktop_surface(wsurface);
if (!dsurface) {
wl_resource_post_error(shell_res,
{
struct weston_head *head = weston_head_from_resource(output_res);
struct weston_output *woutput = weston_head_get_output(head);
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
struct ivi_output *output = to_ivi_output(woutput);
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ wl_resource_post_error(shell_res,
+ WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell has already been bound. "
+ "Check out bound_fail event");
+ return;
+ }
+
ivi_layout_activate(output, app_id);
}
NULL, AGL_SHELL_DESKTOP_APP_STATE_DEACTIVATED);
}
+/* stub, no usage for the time being */
+static void
+shell_destroy(struct wl_client *client, struct wl_resource *res)
+{
+}
+
+static void
+_ivi_set_pending_desktop_surface_split(struct wl_resource *output,
+ const char *app_id, uint32_t orientation)
+{
+ weston_log("%s() added split surface for app_id '%s' with "
+ "orientation %d to pending\n", __func__, app_id, orientation);
+
+ struct weston_head *head = weston_head_from_resource(output);
+ struct weston_output *woutput = weston_head_get_output(head);
+ struct ivi_output *ivi_output = to_ivi_output(woutput);
+
+ struct pending_app_tile *app_tile = zalloc(sizeof(*app_tile));
+
+ app_tile->base.app_id = strdup(app_id);
+ app_tile->base.ioutput = ivi_output;
+ app_tile->base.role = IVI_SURFACE_ROLE_TILE;
+
+ app_tile->orientation = orientation;
+ wl_list_insert(&ivi_output->ivi->pending_apps, &app_tile->base.link);
+}
+
+static uint32_t
+reverse_orientation(uint32_t orientation)
+{
+
+ switch (orientation) {
+ case AGL_SHELL_TILE_ORIENTATION_LEFT:
+ return AGL_SHELL_TILE_ORIENTATION_RIGHT;
+ break;
+ case AGL_SHELL_TILE_ORIENTATION_RIGHT:
+ return AGL_SHELL_TILE_ORIENTATION_LEFT;
+ break;
+ case AGL_SHELL_TILE_ORIENTATION_TOP:
+ return AGL_SHELL_TILE_ORIENTATION_BOTTOM;
+ break;
+ case AGL_SHELL_TILE_ORIENTATION_BOTTOM:
+ return AGL_SHELL_TILE_ORIENTATION_TOP;
+ break;
+ default:
+ return AGL_SHELL_TILE_ORIENTATION_NONE;
+ }
+}
+
+static void
+_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *ioutput,
+ uint32_t orientation, bool to_activate)
+{
+ struct ivi_compositor *ivi = surface->ivi;
+ struct weston_geometry geom = {};
+ struct ivi_output *output = NULL;
+
+ int width, height;
+ int x, y;
+
+ geom = weston_desktop_surface_get_geometry(surface->dsurface);
+ output = ivi_layout_get_output_from_surface(surface);
+
+ if (!output)
+ output = ioutput;
+
+ width = output->area.width;
+ height = output->area.height;
+
+ switch (orientation) {
+ case AGL_SHELL_TILE_ORIENTATION_LEFT:
+ case AGL_SHELL_TILE_ORIENTATION_RIGHT:
+ width /= 2;
+ break;
+ case AGL_SHELL_TILE_ORIENTATION_TOP:
+ case AGL_SHELL_TILE_ORIENTATION_BOTTOM:
+ height /= 2;
+ break;
+ case AGL_SHELL_TILE_ORIENTATION_NONE:
+ break;
+ default:
+ /* nothing */
+ assert(!"Invalid orientation passed");
+
+ }
+
+ x = output->area.x - geom.x;
+ y = output->area.y - geom.y;
+
+ if (orientation == AGL_SHELL_TILE_ORIENTATION_RIGHT)
+ x += width;
+ else if (orientation == AGL_SHELL_TILE_ORIENTATION_BOTTOM)
+ y += height;
+
+ if (to_activate) {
+ struct weston_view *ev = surface->view;
+ struct ivi_shell_seat *ivi_seat = NULL;
+ struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
+
+ if (wseat)
+ ivi_seat = get_ivi_shell_seat(wseat);
+
+ if (!weston_view_is_mapped(ev))
+ weston_view_update_transform(ev);
+ else
+ weston_layer_entry_remove(&ev->layer_link);
+
+
+ // mark view as mapped
+ ev->is_mapped = true;
+ ev->surface->is_mapped = true;
+ surface->mapped = true;
+
+ // update older/new active surface
+ output->previous_active = output->active;
+ output->active = surface;
+
+ // add to the layer and inflict damage
+ weston_view_set_output(ev, output->output);
+ weston_layer_entry_insert(&ivi->normal.view_list, &ev->layer_link);
+ weston_view_geometry_dirty(ev);
+ weston_surface_damage(ev->surface);
+
+ // handle input / keyboard
+ if (ivi_seat)
+ ivi_shell_activate_surface(surface, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
+ }
+
+ weston_view_set_position(surface->view, x, y);
+ weston_desktop_surface_set_size(surface->dsurface, width, height);
+ weston_desktop_surface_set_orientation(surface->dsurface, orientation);
+ surface->orientation = orientation;
+
+ weston_compositor_schedule_repaint(ivi->compositor);
+
+ weston_log("%s() Setting to x=%d, y=%d, width=%d, height=%d, orientation=%d\n",
+ __func__, x, y, width, height, orientation);
+
+}
+
+static int
+shell_ivi_surf_count_split_surfaces(struct ivi_compositor *ivi)
+{
+ int count = 0;
+ struct ivi_surface *surf;
+
+ wl_list_for_each(surf, &ivi->surfaces, link) {
+ if (surf->orientation > AGL_SHELL_TILE_ORIENTATION_NONE)
+ count++;
+ }
+
+ return count;
+}
+
+
+static
+void shell_set_app_split(struct wl_client *client, struct wl_resource *res,
+ const char *app_id, uint32_t orientation,
+ struct wl_resource *output_res)
+{
+ struct ivi_surface *surf;
+ struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+
+ struct weston_head *head = weston_head_from_resource(output_res);
+ struct weston_output *woutput = weston_head_get_output(head);
+ struct ivi_output *output = to_ivi_output(woutput);
+
+ if (!app_id)
+ return;
+
+ if (shell_ivi_surf_count_split_surfaces(ivi) > 2) {
+ weston_log("Found more than two split surfaces in tile orientation.\n");
+ return;
+ }
+
+ /* add it as pending until */
+ surf = ivi_find_app(ivi, app_id);
+ if (!surf) {
+ _ivi_set_pending_desktop_surface_split(output_res, app_id, orientation);
+ return;
+ }
+
+ /* otherwise, take actions now */
+ weston_log("%s() added split surface for app_id '%s' with orientation %d\n",
+ __func__, app_id, orientation);
+
+ if (output->previous_active) {
+ struct weston_view *ev = output->previous_active->view;
+
+ ev->is_mapped = true;
+ ev->surface->is_mapped = true;
+ output->previous_active->mapped = true;
+
+ weston_view_update_transform(ev);
+ weston_view_set_output(ev, woutput);
+ weston_layer_entry_insert(&ivi->normal.view_list, &ev->layer_link);
+
+ _ivi_set_shell_surface_split(output->previous_active, NULL,
+ reverse_orientation(orientation), false);
+ }
+ _ivi_set_shell_surface_split(surf, NULL, orientation, false);
+}
+
static const struct agl_shell_interface agl_shell_implementation = {
+ .destroy = shell_destroy,
.ready = shell_ready,
.set_background = shell_set_background,
.set_panel = shell_set_panel,
.activate_app = shell_activate_app,
+ .set_app_split = shell_set_app_split,
};
static void
}
}
-static void
+void
ivi_compositor_destroy_pending_surfaces(struct ivi_compositor *ivi)
{
struct pending_popup *p_popup, *next_p_popup;
struct ivi_surface *surf, *surf_tmp;
ivi = wl_resource_get_user_data(resource);
+
+ /* reset status to allow other clients issue legit requests */
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ ivi->shell_client.status = BOUND_OK;
+ return;
+ }
+
wl_list_for_each(output, &ivi->outputs, link) {
/* reset the active surf if there's one present */
if (output->active) {
return;
}
- resource = wl_resource_create(client, &agl_shell_interface,
- 1, id);
+ resource = wl_resource_create(client, &agl_shell_interface, version, id);
if (!resource) {
wl_client_post_no_memory(client);
return;
}
-#if 0
- if (ivi->shell_client.client != client) {
- wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
- "client not authorized to use agl_shell");
- return;
- }
-#endif
-
if (ivi->shell_client.resource) {
- wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell has already been bound");
- return;
+ if (wl_resource_get_version(resource) == 1) {
+ wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell has already been bound");
+ return;
+ }
+
+ agl_shell_send_bound_fail(resource);
+ ivi->shell_client.status = BOUND_FAILED;
}
wl_resource_set_implementation(resource, &agl_shell_implementation,
ivi, unbind_agl_shell);
ivi->shell_client.resource = resource;
+
+ if (ivi->shell_client.status == BOUND_OK &&
+ wl_resource_get_version(resource) >= AGL_SHELL_BOUND_OK_SINCE_VERSION)
+ agl_shell_send_bound_ok(ivi->shell_client.resource);
}
static void
ivi_shell_create_global(struct ivi_compositor *ivi)
{
ivi->agl_shell = wl_global_create(ivi->compositor->wl_display,
- &agl_shell_interface, 1,
+ &agl_shell_interface, 3,
ivi, bind_agl_shell);
if (!ivi->agl_shell) {
weston_log("Failed to create wayland global.\n");
Code Review / src / agl-compositor.git / blobdiff