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->role = IVI_SURFACE_ROLE_NONE;
surface->activated_by_default = false;
+ weston_desktop_surface_set_user_data(dsurface, surface);
+
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);
+
+ /* reset any caps to make sure we apply the new caps */
+ ivi_seat_reset_caps_sent(ivi);
if (ivi->shell_client.ready) {
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)
+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 == IVI_SURFACE_ROLE_REMOTE)
+ if (surf->role == role)
count++;
return (count == 1);
weston_desktop_surface_get_surface(dsurface);
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;
+ *
+ * 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 */
/* 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))
+ 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);
output->background = NULL;
}
- wl_list_remove(&surface->link);
+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));
+
+ /* we weren't added to any list if we are still with 'none' as role */
+ if (surface->role != IVI_SURFACE_ROLE_NONE)
+ wl_list_remove(&surface->link);
+
free(surface);
}
case IVI_SURFACE_ROLE_REMOTE:
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;
break;
case IVI_SURFACE_ROLE_NONE:
case IVI_SURFACE_ROLE_BACKGROUND:
+ case IVI_SURFACE_ROLE_PANEL:
default: /* fall through */
break;
}