struct ivi_surface *surface)
{
struct desktop_client *dclient;
+ static bool display_adv = false;
if (surface->advertised_on_launch)
return;
const char *app_id =
weston_desktop_surface_get_app_id(surface->dsurface);
if (app_id == NULL) {
- weston_log("WARNING app_is is null, unable to advertise\n");
+ if (!display_adv) {
+ weston_log("WARNING app_is is null, unable to advertise\n");
+ display_adv = true;
+ }
return;
}
agl_shell_desktop_send_application(dclient->resource, app_id);
agl_shell_desktop_advertise_application_id(ivi, surface);
}
+#ifdef HAVE_WALTHAM
void
ivi_destroy_waltham_destroy(struct ivi_surface *surface)
{
api->surface_push_to_remote(weston_surface, app_id, trans_remote, NULL);
}
+#else
+void
+ivi_destroy_waltham_destroy(struct ivi_surface *surface)
+{
+}
+static void
+ivi_output_notify_waltham_plugin(struct ivi_surface *surface)
+{
+}
+#endif
+
static void
ivi_set_desktop_surface_remote(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 *p_fullscreen = NULL;
+ struct pending_fullscreen *fullscreen;
- struct pending_fullscreen *fs = zalloc(sizeof(*fs));
+ wl_list_for_each(fullscreen, &ivi->fullscreen_pending_apps, link)
+ if (!strcmp(app_id, fullscreen->app_id))
+ p_fullscreen = fullscreen;
- fs->app_id = zalloc(sizeof(char) * (len_app_id + 1));
- memcpy(fs->app_id, app_id, len_app_id);
-
- 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 = zalloc(sizeof(*remote));
+ struct pending_remote *remote;
+ struct pending_remote *p_remote = NULL;
- remote->app_id = zalloc(sizeof(char) * (len_app_id + 1));
- memcpy(remote->app_id, app_id, len_app_id);
+ wl_list_for_each(remote, &ivi->remote_pending_apps, link)
+ if (!strcmp(app_id, remote->app_id))
+ p_remote = remote;
- 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);
}
free(remote);
}
+static bool
+ivi_compositor_keep_pending_surfaces(struct ivi_surface *surface)
+{
+ return surface->ivi->keep_pending_surfaces;
+}
+
static bool
ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
{
surface->popup.bb.width = p_popup->bb.width;
surface->popup.bb.height = p_popup->bb.height;
- ivi_remove_pending_desktop_surface_popup(p_popup);
+ if (!ivi_compositor_keep_pending_surfaces(surface))
+ ivi_remove_pending_desktop_surface_popup(p_popup);
return true;
}
}
if (!strcmp(_app_id, split_surf->app_id)) {
surface->split.output = split_surf->ioutput;
surface->split.orientation = split_surf->orientation;
- ivi_remove_pending_desktop_surface_split(split_surf);
+ if (!ivi_compositor_keep_pending_surfaces(surface))
+ ivi_remove_pending_desktop_surface_split(split_surf);
return true;
}
}
&ivi->fullscreen_pending_apps, link) {
if (!strcmp(_app_id, fs_surf->app_id)) {
surface->fullscreen.output = fs_surf->ioutput;
- ivi_remove_pending_desktop_surface_fullscreen(fs_surf);
+ if (!ivi_compositor_keep_pending_surfaces(surface))
+ ivi_remove_pending_desktop_surface_fullscreen(fs_surf);
return true;
}
}
&ivi->remote_pending_apps, link) {
if (!strcmp(_app_id, remote_surf->app_id)) {
surface->remote.output = remote_surf->ioutput;
- ivi_remove_pending_desktop_surface_remote(remote_surf);
+ if (!ivi_compositor_keep_pending_surfaces(surface))
+ ivi_remove_pending_desktop_surface_remote(remote_surf);
return true;
}
}
return false;
}
+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;
+ struct pending_popup *p_popup;
+ struct pending_split *p_split;
+ struct pending_fullscreen *p_fullscreen;
+ struct pending_remote *p_remote;
+ const char *app_id =
+ weston_desktop_surface_get_app_id(surface->dsurface);
+
+ if (!app_id) {
+ *role = IVI_SURFACE_ROLE_NONE;
+ return;
+ }
+
+ 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)) {
+ *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)) {
+ *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)) {
+ *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)) {
+ *role = IVI_SURFACE_ROLE_REMOTE;
+ return;
+ }
+ }
+
+ /* else, we are a regular desktop surface */
+ *role = IVI_SURFACE_ROLE_DESKTOP;
+}
void
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;
weston_layer_entry_remove(&view->layer_link);
weston_view_update_transform(view);
- weston_output_damage(output->output);
+ weston_view_damage_below(view);
}
void
view->surface->is_mapped = true;
weston_view_update_transform(view);
- weston_output_damage(output->output);
+ weston_view_damage_below(view);
}
static void
wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
wl_list_remove(&surface->link);
+ wl_list_init(&surface->link);
ivi_check_pending_desktop_surface(surface);
surface->checked_pending = true;
}
}
}
+void
+ivi_compositor_destroy_pending_surfaces(struct ivi_compositor *ivi)
+{
+ struct pending_popup *p_popup, *next_p_popup;
+ struct pending_split *split_surf, *next_split_surf;
+ struct pending_fullscreen *fs_surf, *next_fs_surf;
+ struct pending_remote *remote_surf, *next_remote_surf;
+
+ wl_list_for_each_safe(p_popup, next_p_popup,
+ &ivi->popup_pending_apps, link)
+ ivi_remove_pending_desktop_surface_popup(p_popup);
+
+ wl_list_for_each_safe(split_surf, next_split_surf,
+ &ivi->split_pending_apps, link)
+ ivi_remove_pending_desktop_surface_split(split_surf);
+
+ wl_list_for_each_safe(fs_surf, next_fs_surf,
+ &ivi->fullscreen_pending_apps, link)
+ ivi_remove_pending_desktop_surface_fullscreen(fs_surf);
+
+ wl_list_for_each_safe(remote_surf, next_remote_surf,
+ &ivi->remote_pending_apps, link)
+ ivi_remove_pending_desktop_surface_remote(remote_surf);
+}
+
+static void
+shell_desktop_set_app_property_mode(struct wl_client *client,
+ struct wl_resource *shell_res, uint32_t perm)
+{
+ struct desktop_client *dclient = wl_resource_get_user_data(shell_res);
+ if (perm) {
+ dclient->ivi->keep_pending_surfaces = true;
+ } else {
+ dclient->ivi->keep_pending_surfaces = false;
+ /* remove any previous pending surfaces */
+ ivi_compositor_destroy_pending_surfaces(dclient->ivi);
+ }
+}
+
static const struct agl_shell_desktop_interface agl_shell_desktop_implementation = {
.activate_app = shell_desktop_activate_app,
.set_app_property = shell_desktop_set_app_property,
.deactivate_app = shell_deactivate_app,
+ .set_app_property_mode = shell_desktop_set_app_property_mode,
};
static void
}
ivi->agl_shell_desktop = wl_global_create(ivi->compositor->wl_display,
- &agl_shell_desktop_interface, 1,
+ &agl_shell_desktop_interface, 2,
ivi, bind_agl_shell_desktop);
if (!ivi->agl_shell_desktop) {
weston_log("Failed to create wayland global (agl_shell_desktop).\n");