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);
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,
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 */
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);
+
+ /* 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;
}