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);
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);
+
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, enum ivi_surface_role role)
+{
+ int count = 0;
+ struct ivi_surface *surf;
+
+ wl_list_for_each(surf, &ivi->surfaces, link)
+ if (surf->role == role)
+ count++;
+
+ return (count == 1);
+}
+
static void
desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
{
weston_layer_entry_remove(&output->active->view->layer_link);
output->active = NULL;
}
+
+ /* 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))
+ 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);
+
if (weston_surface_is_mapped(wsurface)) {
weston_desktop_surface_unlink_view(surface->view);
weston_view_destroy(surface->view);
output->background = NULL;
}
+ 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);
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;
}