bool
output_has_black_curtain(struct ivi_output *output)
{
- return (output->fullscreen_view.fs->view &&
+ return (output->fullscreen_view.fs &&
+ output->fullscreen_view.fs->view &&
output->fullscreen_view.fs->view->is_mapped &&
output->fullscreen_view.fs->view->surface->is_mapped);
}
struct ivi_output *output;
struct ivi_surface *surface, *tmp;
- if (ivi->shell_client.status == BOUND_FAILED) {
+ if (wl_resource_get_version(shell_res) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"agl_shell has already been bound. "
struct weston_desktop_surface *dsurface;
struct ivi_surface *surface;
- if (ivi->shell_client.status == BOUND_FAILED ||
- ivi->shell_client.resource_ext == shell_res) {
+ if ((wl_resource_get_version(shell_res) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED) ||
+ ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"agl_shell has already been bound. "
struct ivi_surface **member;
int32_t width = 0, height = 0;
- if (ivi->shell_client.status == BOUND_FAILED ||
+ if ((wl_resource_get_version(shell_res) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED) ||
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
const char *app_id,
struct wl_resource *output_res)
{
- struct weston_head *head = weston_head_from_resource(output_res);
- struct weston_output *woutput = weston_head_get_output(head);
- struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
- struct ivi_output *output = to_ivi_output(woutput);
+ struct weston_head *head;
+ struct weston_output *woutput;
+ struct ivi_compositor *ivi;
+ struct ivi_output *output;
+
+ head = weston_head_from_resource(output_res);
+ if (!head) {
+ weston_log("Invalid output to activate '%s' on\n", app_id);
+ return;
+ }
+
+ woutput = weston_head_get_output(head);
+ ivi = wl_resource_get_user_data(shell_res);
+ output = to_ivi_output(woutput);
- if (ivi->shell_client.status == BOUND_FAILED) {
+ if (wl_resource_get_version(shell_res) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"agl_shell has already been bound. "
ivi_layout_activate(output, app_id);
}
+static void
+shell_new_deactivate_app(struct wl_client *client, struct wl_resource *shell_res,
+ const char *app_id)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
+
+ ivi_layout_deactivate(ivi, app_id);
+}
+
static void
shell_desktop_activate_app(struct wl_client *client,
struct wl_resource *shell_res,
struct ivi_compositor *ivi = wl_resource_get_user_data(res);
/* reset status in case bind_fail was sent */
- if (ivi->shell_client.status == BOUND_FAILED)
+ if (wl_resource_get_version(res) >= AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED)
ivi->shell_client.status = BOUND_OK;
}
.set_panel = shell_set_panel,
.activate_app = shell_activate_app,
.destroy = shell_destroy,
- .set_activate_region = shell_set_activate_region
+ .set_activate_region = shell_set_activate_region,
+ .deactivate_app = shell_new_deactivate_app,
};
static const struct agl_shell_ext_interface agl_shell_ext_implementation = {
ivi = wl_resource_get_user_data(resource);
/* reset status to allow other clients issue legit requests */
- if (ivi->shell_client.status == BOUND_FAILED) {
+ if (wl_resource_get_version(resource) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED) {
ivi->shell_client.status = BOUND_OK;
return;
}
wl_list_for_each(output, &ivi->outputs, link) {
+ struct weston_geometry area = {};
+
/* reset the active surf if there's one present */
if (output->active) {
output->active->view->is_mapped = false;
output->active = NULL;
}
+ output->area_activation = area;
insert_black_curtain(output);
}
but still do the assignment */
ivi->shell_client.status = BOUND_OK;
agl_shell_send_bound_ok(ivi->shell_client.resource);
+ } else {
+ /* fallback for just version 1 of the protocol */
+ wl_resource_set_implementation(resource, &agl_shell_implementation,
+ ivi, unbind_agl_shell);
+ ivi->shell_client.resource = resource;
}
}
ivi_shell_create_global(struct ivi_compositor *ivi)
{
ivi->agl_shell = wl_global_create(ivi->compositor->wl_display,
- &agl_shell_interface, 4,
+ &agl_shell_interface, 5,
ivi, bind_agl_shell);
if (!ivi->agl_shell) {
weston_log("Failed to create wayland global.\n");