/*
- * Copyright © 2019 Collabora, Ltd.
+ * Copyright © 2019, 2022 Collabora, Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
#include <libweston/libweston.h>
#include <libweston/config-parser.h>
-#include <weston/weston.h>
+#include <weston.h>
#include "shared/os-compatibility.h"
#include "shared/helpers.h"
#include "shared/process-util.h"
weston_layer_fini(&ivi->popup);
wl_list_for_each(output, &ivi->outputs, link) {
- if (output->fullscreen_view.fs->view) {
+ if (output->fullscreen_view.fs &&
+ output->fullscreen_view.fs->view) {
weston_surface_destroy(output->fullscreen_view.fs->view->surface);
output->fullscreen_view.fs->view = NULL;
}
}
int
-ivi_launch_shell_client(struct ivi_compositor *ivi)
+ivi_launch_shell_client(struct ivi_compositor *ivi, const char *cmd_section,
+ struct wl_client **client)
{
struct process_info *pinfo;
struct weston_config_section *section;
char *command = NULL;
- section = weston_config_get_section(ivi->config, "shell-client",
- NULL, NULL);
+ section = weston_config_get_section(ivi->config, cmd_section, NULL, NULL);
if (section)
- weston_config_section_get_string(section, "command",
- &command, NULL);
+ weston_config_section_get_string(section, "command", &command, NULL);
if (!command)
return -1;
if (!pinfo->path)
goto out_free;
- ivi->shell_client.client = client_launch(ivi->compositor, &pinfo->proc,
- command, process_handle_sigchld);
- if (!ivi->shell_client.client)
+ *client = client_launch(ivi->compositor, &pinfo->proc, command, process_handle_sigchld);
+ if (!*client)
goto out_str;
return 0;
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 weston_view *view;
- if (!output &&
+ if ((!output &&
!output->fullscreen_view.fs &&
- !output->fullscreen_view.fs->view) {
+ !output->fullscreen_view.fs->view) ||
+ !output->fullscreen_view.fs) {
weston_log("Output %s doesn't have a surface installed!\n", output->name);
return;
}
if ((!output &&
!output->fullscreen_view.fs &&
- !output->fullscreen_view.fs->view) || !output->output) {
+ !output->fullscreen_view.fs->view) || !output->output ||
+ !output->fullscreen_view.fs) {
weston_log("Output %s doesn't have a surface installed!\n", output->name);
return;
}
weston_log("Added black curtain to output %s\n", output->output->name);
}
+void
+shell_send_app_state(struct ivi_compositor *ivi, const char *app_id,
+ enum agl_shell_app_state state)
+{
+ if (app_id && wl_resource_get_version(ivi->shell_client.resource) >=
+ AGL_SHELL_APP_STATE_SINCE_VERSION) {
+
+ agl_shell_send_app_state(ivi->shell_client.resource,
+ app_id, state);
+
+ if (ivi->shell_client.resource_ext)
+ agl_shell_send_app_state(ivi->shell_client.resource_ext,
+ app_id, state);
+ }
+}
+
static void
shell_ready(struct wl_client *client, struct wl_resource *shell_res)
{
struct ivi_output *output;
struct ivi_surface *surface, *tmp;
- if (ivi->shell_client.resource &&
+ 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,
surface->checked_pending = true;
app_id = weston_desktop_surface_get_app_id(surface->dsurface);
- if (app_id &&
- wl_resource_get_version(ivi->shell_client.resource) >=
- AGL_SHELL_APP_STATE_SINCE_VERSION)
- agl_shell_send_app_state(ivi->shell_client.resource,
- app_id, AGL_SHELL_APP_STATE_STARTED);
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
}
}
struct weston_desktop_surface *dsurface;
struct ivi_surface *surface;
- if (ivi->shell_client.resource &&
- 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,
"agl_shell has already been bound. "
struct ivi_surface **member;
int32_t width = 0, height = 0;
- if (ivi->shell_client.resource &&
- 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,
"agl_shell has already been bound. "
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.resource &&
+ 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,
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_set_app_float(struct wl_client *client, struct wl_resource *shell_res,
+ const char *app_id, int32_t x_pos, int32_t y_pos)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
+ struct weston_output *output = get_focused_output(ivi->compositor);
+ struct ivi_output *ivi_output;
+ struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+
+ if (!output)
+ output = get_default_output(ivi->compositor);
+
+ ivi_output = to_ivi_output(output);
+
+ /* verify if already mapped as desktop role, regular, unmap it, so we
+ * can make it float */
+ if (surf && surf->role == IVI_SURFACE_ROLE_DESKTOP) {
+ struct weston_view *ev = surf->view;
+ struct weston_desktop_surface *dsurf = surf->dsurface;
+ struct ivi_bounding_box bb = {};
+ const char *prev_activate_app_id = NULL;
+
+ /* XXX: if this is useful we could bring it as active then make
+ * it float, but avoid doing it for the moment */
+ if (surf != ivi_output->active)
+ return;
+
+ if (ivi_output->previous_active)
+ prev_activate_app_id =
+ weston_desktop_surface_get_app_id(ivi_output->previous_active->dsurface);
+
+ /* only deactivate if previous_active is different, otherwise
+ * this will blow up, because we're trying to activate the same
+ * app_id as the this one! */
+ if (prev_activate_app_id && strcmp(app_id, prev_activate_app_id)) {
+ ivi_layout_deactivate(ivi, app_id);
+ } else if (prev_activate_app_id) {
+ weston_layer_entry_remove(&ev->layer_link);
+ weston_view_geometry_dirty(ev);
+ weston_surface_damage(ev->surface);
+ }
+
+ surf->hidden_layer_output = ivi_output;
+
+ /* set attributes */
+ surf->popup.output = ivi_output;
+
+ surf->popup.x = x_pos;
+ surf->popup.y = y_pos;
+ surf->popup.bb = bb;
+
+
+ /* change the role */
+ surf->role = IVI_SURFACE_ROLE_NONE;
+
+ wl_list_remove(&surf->link);
+ wl_list_init(&surf->link);
+
+ ivi_set_desktop_surface_popup(surf);
+
+ weston_desktop_surface_set_maximized(dsurf, false);
+ weston_desktop_surface_set_size(dsurf, 0, 0);
+
+ /* add to hidden layer */
+ weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
+ weston_compositor_schedule_repaint(ivi->compositor);
+
+ } else if (!surf || (surf && surf->role != IVI_SURFACE_ROLE_POPUP)) {
+ ivi_set_pending_desktop_surface_popup(ivi_output, x_pos, y_pos,
+ 0, 0, 0, 0, app_id);
+ }
+}
+
+static void
+shell_set_app_fullscreen(struct wl_client *client,
+ struct wl_resource *shell_res, const char *app_id)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
+ struct weston_output *output = get_focused_output(ivi->compositor);
+ struct ivi_output *ivi_output;
+ struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+
+ if (!output)
+ output = get_default_output(ivi->compositor);
+
+ ivi_output = to_ivi_output(output);
+
+ if (surf && surf->role == IVI_SURFACE_ROLE_DESKTOP) {
+ struct weston_view *ev = surf->view;
+ struct weston_desktop_surface *dsurf = surf->dsurface;
+
+ if (surf != ivi_output->active)
+ return;
+
+ weston_layer_entry_remove(&surf->view->layer_link);
+ weston_view_geometry_dirty(surf->view);
+ weston_surface_damage(surf->view->surface);
+
+ surf->hidden_layer_output = ivi_output;
+
+ /* set attributes */
+ surf->fullscreen.output = ivi_output;
+
+ /* change the role */
+ surf->role = IVI_SURFACE_ROLE_NONE;
+
+ wl_list_remove(&surf->link);
+ wl_list_init(&surf->link);
+
+ ivi_set_desktop_surface_fullscreen(surf);
+
+ weston_desktop_surface_set_maximized(dsurf, false);
+ weston_desktop_surface_set_fullscreen(dsurf, true);
+ weston_desktop_surface_set_size(dsurf,
+ ivi_output->output->width,
+ ivi_output->output->height);
+
+ /* add to hidden layer */
+ weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
+ weston_compositor_schedule_repaint(ivi->compositor);
+ } else if (!surf || (surf && surf->role != IVI_SURFACE_ROLE_FULLSCREEN)) {
+ ivi_set_pending_desktop_surface_fullscreen(ivi_output, app_id);
+ }
+}
+
+
+static void
+shell_set_app_normal(struct wl_client *client, struct wl_resource *shell_res,
+ const char *app_id)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res);
+ struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+ struct weston_output *output = get_focused_output(ivi->compositor);
+ struct ivi_output *ivi_output;
+ struct weston_desktop_surface *dsurf;
+ struct weston_geometry area = {};
+
+
+ if (!surf || (surf && surf->role == IVI_SURFACE_ROLE_DESKTOP))
+ return;
+
+ if (!output)
+ output = get_default_output(ivi->compositor);
+
+ dsurf = surf->dsurface;
+ ivi_output = to_ivi_output(output);
+
+ weston_layer_entry_remove(&surf->view->layer_link);
+ weston_view_geometry_dirty(surf->view);
+ weston_surface_damage(surf->view->surface);
+
+ /* change the role */
+ surf->role = IVI_SURFACE_ROLE_NONE;
+ surf->state = NORMAL;
+ surf->desktop.pending_output = ivi_output;
+
+ wl_list_remove(&surf->link);
+ wl_list_init(&surf->link);
+
+ ivi_set_desktop_surface(surf);
+
+ if (ivi_output->area_activation.width ||
+ ivi_output->area_activation.height)
+ area = ivi_output->area_activation;
+ else
+ area = ivi_output->area;
+
+ if (weston_desktop_surface_get_fullscreen(dsurf))
+ weston_desktop_surface_set_fullscreen(dsurf, false);
+
+ weston_desktop_surface_set_maximized(dsurf, true);
+ weston_desktop_surface_set_size(dsurf, area.width, area.height);
+
+ /* add to hidden layer */
+ weston_layer_entry_insert(&ivi->hidden.view_list,
+ &surf->view->layer_link);
+ weston_compositor_schedule_repaint(ivi->compositor);
+
+}
+
static void
shell_desktop_activate_app(struct wl_client *client,
struct wl_resource *shell_res,
NULL, AGL_SHELL_DESKTOP_APP_STATE_DEACTIVATED);
}
-/* stub, no usage for the time being */
static void
shell_destroy(struct wl_client *client, struct wl_resource *res)
{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+
+ /* reset status in case bind_fail was sent */
+ if (wl_resource_get_version(res) >= AGL_SHELL_BOUND_OK_SINCE_VERSION &&
+ ivi->shell_client.status == BOUND_FAILED)
+ ivi->shell_client.status = BOUND_OK;
}
static void
ioutput->area_activation = area;
}
+static void
+shell_ext_destroy(struct wl_client *client, struct wl_resource *res)
+{
+ wl_resource_destroy(res);
+}
+
+static void
+shell_ext_doas(struct wl_client *client, struct wl_resource *res)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+
+ ivi->shell_client_ext.doas_requested = true;
+ agl_shell_ext_send_doas_done(ivi->shell_client_ext.resource,
+ AGL_SHELL_EXT_DOAS_SHELL_CLIENT_STATUS_SUCCESS);
+}
static const struct agl_shell_interface agl_shell_implementation = {
.ready = shell_ready,
.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,
+ .set_app_float = shell_set_app_float,
+ .set_app_normal = shell_set_app_normal,
+ .set_app_fullscreen = shell_set_app_fullscreen,
+};
+
+static const struct agl_shell_ext_interface agl_shell_ext_implementation = {
+ .destroy = shell_ext_destroy,
+ .doas_shell_client = shell_ext_doas,
};
static void
ivi = wl_resource_get_user_data(resource);
/* reset status to allow other clients issue legit requests */
- if (ivi->shell_client.resource &&
+ 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);
}
ivi->shell_client.client = NULL;
}
+static void
+unbind_agl_shell_ext(struct wl_resource *resource)
+{
+ struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
+
+ ivi->shell_client_ext.resource = NULL;
+}
+
static void
bind_agl_shell(struct wl_client *client,
void *data, uint32_t version, uint32_t id)
return;
}
- agl_shell_send_bound_fail(resource);
- ivi->shell_client.status = BOUND_FAILED;
+ if (ivi->shell_client_ext.resource &&
+ ivi->shell_client_ext.doas_requested) {
+
+ /* reset status in case client-ext doesn't send an
+ * explicit agl_shell_destroy request, see
+ * shell_destroy() */
+ if (ivi->shell_client.status == BOUND_FAILED)
+ ivi->shell_client.status = BOUND_OK;
+
+ wl_resource_set_implementation(resource, &agl_shell_implementation,
+ ivi, NULL);
+ ivi->shell_client.resource_ext = resource;
+
+ ivi->shell_client_ext.status = BOUND_OK;
+ agl_shell_send_bound_ok(ivi->shell_client.resource_ext);
+
+ return;
+ } else {
+ wl_resource_set_implementation(resource, &agl_shell_implementation,
+ ivi, NULL);
+ agl_shell_send_bound_fail(resource);
+ ivi->shell_client.status = BOUND_FAILED;
+ return;
+ }
}
- wl_resource_set_implementation(resource, &agl_shell_implementation,
- ivi, unbind_agl_shell);
- ivi->shell_client.resource = resource;
- if (ivi->shell_client.status == BOUND_OK &&
- wl_resource_get_version(resource) >= AGL_SHELL_BOUND_OK_SINCE_VERSION)
+ if (wl_resource_get_version(resource) >=
+ AGL_SHELL_BOUND_OK_SINCE_VERSION) {
+ wl_resource_set_implementation(resource, &agl_shell_implementation,
+ ivi, unbind_agl_shell);
+ ivi->shell_client.resource = resource;
+ /* if we land here we'll have BOUND_OK by default,
+ 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;
+ }
+}
+
+static void
+bind_agl_shell_ext(struct wl_client *client,
+ void *data, uint32_t version, uint32_t id)
+{
+ struct ivi_compositor *ivi = data;
+ struct wl_resource *resource;
+
+ resource = wl_resource_create(client, &agl_shell_ext_interface, version, id);
+ if (!resource) {
+ wl_client_post_no_memory(client);
+ return;
+ }
+
+ if (ivi->shell_client_ext.resource) {
+ wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
+ "agl_shell_ext has already been bound");
+ return;
+ }
+
+ wl_resource_set_implementation(resource, &agl_shell_ext_implementation,
+ ivi, unbind_agl_shell_ext);
+ ivi->shell_client_ext.resource = resource;
}
static void
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, 7,
ivi, bind_agl_shell);
if (!ivi->agl_shell) {
weston_log("Failed to create wayland global.\n");
return -1;
}
+ ivi->agl_shell_ext = wl_global_create(ivi->compositor->wl_display,
+ &agl_shell_ext_interface, 1,
+ ivi, bind_agl_shell_ext);
+ if (!ivi->agl_shell_ext) {
+ weston_log("Failed to create agl_shell_ext global.\n");
+ return -1;
+ }
+
ivi->agl_shell_desktop = wl_global_create(ivi->compositor->wl_display,
&agl_shell_desktop_interface, 2,
ivi, bind_agl_shell_desktop);
Code Review / src / agl-compositor.git / blobdiff