static void
create_black_surface_view(struct ivi_output *output);
-void
-ivi_set_desktop_surface(struct ivi_surface *surface)
+static void
+agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
+ struct ivi_surface *surface)
{
struct desktop_client *dclient;
- struct ivi_compositor *ivi = surface->ivi;
- assert(surface->role == IVI_SURFACE_ROLE_NONE);
-
- surface->role = IVI_SURFACE_ROLE_DESKTOP;
- wl_list_insert(&surface->ivi->surfaces, &surface->link);
/* advertise to all desktop clients the new surface */
wl_list_for_each(dclient, &ivi->desktop_clients, link) {
}
}
+void
+ivi_set_desktop_surface(struct ivi_surface *surface)
+{
+ struct ivi_compositor *ivi = surface->ivi;
+ assert(surface->role == IVI_SURFACE_ROLE_NONE);
+
+ surface->role = IVI_SURFACE_ROLE_DESKTOP;
+ wl_list_insert(&surface->ivi->surfaces, &surface->link);
+
+ agl_shell_desktop_advertise_application_id(ivi, surface);
+}
+
static void
ivi_set_desktop_surface_popup(struct ivi_surface *surface)
{
surface->role = IVI_SURFACE_ROLE_POPUP;
wl_list_insert(&ivi->surfaces, &surface->link);
+
+ agl_shell_desktop_advertise_application_id(ivi, surface);
}
static void
surface->role = IVI_SURFACE_ROLE_FULLSCREEN;
wl_list_insert(&ivi->surfaces, &surface->link);
+
+ agl_shell_desktop_advertise_application_id(ivi, surface);
}
static void
surface->role = IVI_SURFACE_ROLE_SPLIT_H;
wl_list_insert(&ivi->surfaces, &surface->link);
+
+ agl_shell_desktop_advertise_application_id(ivi, surface);
}
static void
ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
- int x, int y, const char *app_id)
+ int x, int y, int bx, int by, int width, int height,
+ const char *app_id)
{
struct ivi_compositor *ivi = ioutput->ivi;
size_t len_app_id = strlen(app_id);
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;
+
wl_list_insert(&ivi->popup_pending_apps, &p_popup->link);
}
wl_list_insert(&ivi->split_pending_apps, &split->link);
}
-static void
+void
ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
const char *app_id)
{
surface->popup.output = p_popup->ioutput;
surface->popup.x = p_popup->x;
surface->popup.y = p_popup->y;
+
+ surface->popup.bb.x = p_popup->bb.x;
+ surface->popup.bb.y = p_popup->bb.y;
+ surface->popup.bb.width = p_popup->bb.width;
+ surface->popup.bb.height = p_popup->bb.height;
+
ivi_remove_pending_desktop_surface_popup(p_popup);
return true;
}
void
remove_black_surface(struct ivi_output *output)
{
- struct weston_view *view = output->fullscreen_view.fs->view;
+ struct weston_view *view;
+ if (!output &&
+ !output->fullscreen_view.fs &&
+ !output->fullscreen_view.fs->view) {
+ weston_log("Output %s doesn't have a surface installed!\n", output->name);
+ return;
+ }
+
+ view = output->fullscreen_view.fs->view;
assert(view->is_mapped == true ||
view->surface->is_mapped == true);
void
insert_black_surface(struct ivi_output *output)
{
- struct weston_view *view = output->fullscreen_view.fs->view;
+ struct weston_view *view;
+ if (!output &&
+ !output->fullscreen_view.fs &&
+ !output->fullscreen_view.fs->view) {
+ weston_log("Output %s doesn't have a surface installed!\n", output->name);
+ return;
+ }
+
+ view = output->fullscreen_view.fs->view;
if (view->is_mapped || view->surface->is_mapped)
return;
shell_desktop_set_app_property(struct wl_client *client,
struct wl_resource *shell_res,
const char *app_id, uint32_t role,
- int x, int y, struct wl_resource *output_res)
+ int x, int y, int bx, int by,
+ int width, int height,
+ struct wl_resource *output_res)
{
struct weston_head *head = weston_head_from_resource(output_res);
struct weston_output *woutput = weston_head_get_output(head);
switch (role) {
case AGL_SHELL_DESKTOP_APP_ROLE_POPUP:
- ivi_set_pending_desktop_surface_popup(output, x, y, app_id);
+ ivi_set_pending_desktop_surface_popup(output, x, y, bx, by,
+ width, height, app_id);
break;
case AGL_SHELL_DESKTOP_APP_ROLE_FULLSCREEN:
ivi_set_pending_desktop_surface_fullscreen(output, app_id);