[PATCH weston] libweston-desktop/xdg-shell-v5: Drop xdg-shell v5 support
Alexandros Frantzis
alexandros.frantzis at collabora.com
Tue Feb 13 14:20:56 UTC 2018
Drop support for the obsolete xdg-shell v5 protocol. This clears the
path to properly support xdg-shell stable, since xdg-shell stable and
xdg-shell v5 can't currently co-exist in the same compositor, as both
define structures with the same name (such as struct
xdg_surface_interface).
Signed-off-by: Alexandros Frantzis <alexandros.frantzis at collabora.com>
---
Makefile.am | 6 +-
libweston-desktop/internal.h | 3 -
libweston-desktop/libweston-desktop.c | 10 -
libweston-desktop/xdg-shell-v5.c | 911 ----------------------------------
4 files changed, 1 insertion(+), 929 deletions(-)
delete mode 100644 libweston-desktop/xdg-shell-v5.c
diff --git a/Makefile.am b/Makefile.am
index 32c9a0f2..189e7d8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,19 +132,15 @@ libweston_desktop_ at LIBWESTON_MAJOR@_la_SOURCES = \
libweston-desktop/surface.c \
libweston-desktop/wl-shell.c \
libweston-desktop/xdg-shell-v6.c \
- libweston-desktop/xdg-shell-v5.c \
libweston-desktop/xwayland.c
nodist_libweston_desktop_ at LIBWESTON_MAJOR@_la_SOURCES = \
protocol/xdg-shell-unstable-v6-protocol.c \
- protocol/xdg-shell-unstable-v6-server-protocol.h \
- protocol/xdg-shell-unstable-v5-protocol.c \
- protocol/xdg-shell-unstable-v5-server-protocol.h
+ protocol/xdg-shell-unstable-v6-server-protocol.h
BUILT_SOURCES += $(nodist_libweston_desktop_ at LIBWESTON_MAJOR@_la_SOURCES)
libweston-desktop- at LIBWESTON_MAJOR@.la libweston-desktop/libweston_desktop_ at LIBWESTON_MAJOR@_la-xdg-shell-v6.lo: protocol/xdg-shell-unstable-v6-server-protocol.h
-libweston-desktop- at LIBWESTON_MAJOR@.la libweston-desktop/libweston_desktop_ at LIBWESTON_MAJOR@_la-xdg-shell-v5.lo: protocol/xdg-shell-unstable-v5-server-protocol.h
if SYSTEMD_NOTIFY_SUPPORT
module_LTLIBRARIES += systemd-notify.la
diff --git a/libweston-desktop/internal.h b/libweston-desktop/internal.h
index 763355bf..564f7b3c 100644
--- a/libweston-desktop/internal.h
+++ b/libweston-desktop/internal.h
@@ -230,9 +230,6 @@ struct wl_global *
weston_desktop_xdg_shell_v6_create(struct weston_desktop *desktop,
struct wl_display *display);
struct wl_global *
-weston_desktop_xdg_shell_v5_create(struct weston_desktop *desktop,
- struct wl_display *display);
-struct wl_global *
weston_desktop_wl_shell_create(struct weston_desktop *desktop,
struct wl_display *display);
void
diff --git a/libweston-desktop/libweston-desktop.c b/libweston-desktop/libweston-desktop.c
index 48e90009..c840a8a9 100644
--- a/libweston-desktop/libweston-desktop.c
+++ b/libweston-desktop/libweston-desktop.c
@@ -41,7 +41,6 @@ struct weston_desktop {
struct weston_desktop_api api;
void *user_data;
struct wl_global *xdg_shell_v6;
- struct wl_global *xdg_shell_v5;
struct wl_global *wl_shell;
};
@@ -77,13 +76,6 @@ weston_desktop_create(struct weston_compositor *compositor,
return NULL;
}
- desktop->xdg_shell_v5 =
- weston_desktop_xdg_shell_v5_create(desktop, display);
- if (desktop->xdg_shell_v5 == NULL) {
- weston_desktop_destroy(desktop);
- return NULL;
- }
-
desktop->wl_shell =
weston_desktop_wl_shell_create(desktop, display);
if (desktop->wl_shell == NULL) {
@@ -104,8 +96,6 @@ weston_desktop_destroy(struct weston_desktop *desktop)
if (desktop->wl_shell != NULL)
wl_global_destroy(desktop->wl_shell);
- if (desktop->xdg_shell_v5 != NULL)
- wl_global_destroy(desktop->xdg_shell_v5);
if (desktop->xdg_shell_v6 != NULL)
wl_global_destroy(desktop->xdg_shell_v6);
diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
deleted file mode 100644
index ebe7940e..00000000
--- a/libweston-desktop/xdg-shell-v5.c
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright © 2010-2012 Intel Corporation
- * Copyright © 2011-2012 Collabora, Ltd.
- * Copyright © 2013 Raspberry Pi Foundation
- * Copyright © 2016 Quentin "Sardem FF7" Glidic
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "config.h"
-
-#include <stdbool.h>
-
-#include <wayland-server.h>
-
-#include "compositor.h"
-#include "zalloc.h"
-#include "xdg-shell-unstable-v5-server-protocol.h"
-
-#include "libweston-desktop.h"
-#include "internal.h"
-
-#define WD_XDG_SHELL_PROTOCOL_VERSION 1
-
-struct weston_desktop_xdg_surface_state {
- bool maximized;
- bool fullscreen;
- bool resizing;
- bool activated;
-};
-
-struct weston_desktop_xdg_surface_configure {
- struct wl_list link; /* weston_desktop_xdg_surface::configure_list */
- uint32_t serial;
- struct weston_desktop_xdg_surface_state state;
- struct weston_size size;
-};
-
-struct weston_desktop_xdg_surface {
- struct wl_resource *resource;
- struct weston_desktop_surface *surface;
- struct weston_desktop *desktop;
- bool added;
- struct wl_event_source *add_idle;
- struct wl_event_source *configure_idle;
- struct wl_list configure_list; /* weston_desktop_xdg_surface_configure::link */
- struct {
- struct weston_desktop_xdg_surface_state state;
- struct weston_size size;
- } pending;
- struct {
- struct weston_desktop_xdg_surface_state state;
- struct weston_size size;
- } next;
- struct {
- struct weston_desktop_xdg_surface_state state;
- } current;
- bool has_next_geometry;
- struct weston_geometry next_geometry;
-};
-
-struct weston_desktop_xdg_popup {
- struct wl_resource *resource;
- struct weston_desktop_surface *popup;
- struct weston_desktop *desktop;
- struct weston_desktop_seat *seat;
- struct wl_display *display;
-};
-
-static void
-weston_desktop_xdg_surface_ensure_added(struct weston_desktop_xdg_surface *surface)
-{
- if (surface->added)
- return;
-
- if (surface->add_idle != NULL)
- wl_event_source_remove(surface->add_idle);
- surface->add_idle = NULL;
- weston_desktop_api_surface_added(surface->desktop, surface->surface);
- surface->added = true;
-}
-
-static void
-weston_desktop_xdg_surface_send_configure(void *data)
-{
- struct weston_desktop_xdg_surface *surface = data;
- struct weston_desktop_xdg_surface_configure *configure;
- uint32_t *s;
- struct wl_array states;
-
- surface->configure_idle = NULL;
-
- configure = zalloc(sizeof(struct weston_desktop_xdg_surface_configure));
- if (configure == NULL) {
- struct weston_desktop_client *client =
- weston_desktop_surface_get_client(surface->surface);
- struct wl_client *wl_client =
- weston_desktop_client_get_client(client);
- wl_client_post_no_memory(wl_client);
- return;
- }
- wl_list_insert(surface->configure_list.prev, &configure->link);
- configure->serial =
- wl_display_next_serial(weston_desktop_get_display(surface->desktop));
- configure->state = surface->pending.state;
- configure->size = surface->pending.size;
-
- wl_array_init(&states);
- if (surface->pending.state.maximized) {
- s = wl_array_add(&states, sizeof(uint32_t));
- *s = XDG_SURFACE_STATE_MAXIMIZED;
- }
- if (surface->pending.state.fullscreen) {
- s = wl_array_add(&states, sizeof(uint32_t));
- *s = XDG_SURFACE_STATE_FULLSCREEN;
- }
- if (surface->pending.state.resizing) {
- s = wl_array_add(&states, sizeof(uint32_t));
- *s = XDG_SURFACE_STATE_RESIZING;
- }
- if (surface->pending.state.activated) {
- s = wl_array_add(&states, sizeof(uint32_t));
- *s = XDG_SURFACE_STATE_ACTIVATED;
- }
-
- xdg_surface_send_configure(surface->resource,
- surface->pending.size.width,
- surface->pending.size.height,
- &states,
- configure->serial);
-
- wl_array_release(&states);
-};
-
-static bool
-weston_desktop_xdg_surface_state_compare(struct weston_desktop_xdg_surface *surface)
-{
- struct weston_surface *wsurface =
- weston_desktop_surface_get_surface(surface->surface);
-
- if (surface->pending.state.activated != surface->current.state.activated)
- return false;
- if (surface->pending.state.fullscreen != surface->current.state.fullscreen)
- return false;
- if (surface->pending.state.maximized != surface->current.state.maximized)
- return false;
- if (surface->pending.state.resizing != surface->current.state.resizing)
- return false;
-
- if (wsurface->width == surface->pending.size.width &&
- wsurface->height == surface->pending.size.height)
- return true;
-
- if (surface->pending.size.width == 0 &&
- surface->pending.size.height == 0)
- return true;
-
- return false;
-}
-
-static void
-weston_desktop_xdg_surface_schedule_configure(struct weston_desktop_xdg_surface *surface,
- bool force)
-{
- struct wl_display *display = weston_desktop_get_display(surface->desktop);
- struct wl_event_loop *loop = wl_display_get_event_loop(display);
- bool pending_same =
- !force && weston_desktop_xdg_surface_state_compare(surface);
-
- if (surface->configure_idle != NULL) {
- if (!pending_same)
- return;
-
- wl_event_source_remove(surface->configure_idle);
- surface->configure_idle = NULL;
- } else {
- if (pending_same)
- return;
-
- surface->configure_idle =
- wl_event_loop_add_idle(loop,
- weston_desktop_xdg_surface_send_configure,
- surface);
- }
-}
-
-static void
-weston_desktop_xdg_surface_set_maximized(struct weston_desktop_surface *dsurface,
- void *user_data, bool maximized)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->pending.state.maximized = maximized;
- weston_desktop_xdg_surface_schedule_configure(surface, false);
-}
-
-static void
-weston_desktop_xdg_surface_set_fullscreen(struct weston_desktop_surface *dsurface,
- void *user_data, bool fullscreen)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->pending.state.fullscreen = fullscreen;
- weston_desktop_xdg_surface_schedule_configure(surface, false);
-}
-
-static void
-weston_desktop_xdg_surface_set_resizing(struct weston_desktop_surface *dsurface,
- void *user_data, bool resizing)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->pending.state.resizing = resizing;
- weston_desktop_xdg_surface_schedule_configure(surface, false);
-}
-
-static void
-weston_desktop_xdg_surface_set_activated(struct weston_desktop_surface *dsurface,
- void *user_data, bool activated)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->pending.state.activated = activated;
- weston_desktop_xdg_surface_schedule_configure(surface, false);
-}
-
-static void
-weston_desktop_xdg_surface_set_size(struct weston_desktop_surface *dsurface,
- void *user_data,
- int32_t width, int32_t height)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->pending.size.width = width;
- surface->pending.size.height = height;
-
- weston_desktop_xdg_surface_schedule_configure(surface, false);
-}
-
-static void
-weston_desktop_xdg_surface_committed(struct weston_desktop_surface *dsurface,
- void *user_data,
- int32_t sx, int32_t sy)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
- struct weston_surface *wsurface =
- weston_desktop_surface_get_surface(surface->surface);
- bool reconfigure = false;
-
- /* TODO: use the window geometry and not the surface size here
- * We need to check the next geometry if there is one, but not accept it
- * until we checked it, maybe.
- */
- if (surface->next.state.maximized || surface->next.state.fullscreen)
- reconfigure = surface->next.size.width != wsurface->width ||
- surface->next.size.height != wsurface->height;
-
- if (reconfigure) {
- weston_desktop_xdg_surface_schedule_configure(surface, true);
- } else {
- surface->current.state = surface->next.state;
- if (surface->has_next_geometry) {
- surface->has_next_geometry = false;
- weston_desktop_surface_set_geometry(surface->surface,
- surface->next_geometry);
- }
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_committed(surface->desktop, surface->surface,
- sx, sy);
- }
-}
-
-static void
-weston_desktop_xdg_surface_ping(struct weston_desktop_surface *dsurface,
- uint32_t serial, void *user_data)
-{
- struct weston_desktop_client *client =
- weston_desktop_surface_get_client(dsurface);
-
- xdg_shell_send_ping(weston_desktop_client_get_resource(client),
- serial);
-}
-
-static void
-weston_desktop_xdg_surface_close(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- xdg_surface_send_close(surface->resource);
-}
-
-static bool
-weston_desktop_xdg_surface_get_maximized(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- return surface->current.state.maximized;
-}
-
-static bool
-weston_desktop_xdg_surface_get_fullscreen(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- return surface->current.state.fullscreen;
-}
-
-static bool
-weston_desktop_xdg_surface_get_resizing(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- return surface->current.state.resizing;
-}
-
-static bool
-weston_desktop_xdg_surface_get_activated(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- return surface->current.state.activated;
-}
-
-static void
-weston_desktop_xdg_surface_destroy(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
- struct weston_desktop_xdg_surface_configure *configure, *temp;
-
- if (surface->added)
- weston_desktop_api_surface_removed(surface->desktop,
- surface->surface);
-
- if (surface->add_idle != NULL)
- wl_event_source_remove(surface->add_idle);
-
- if (surface->configure_idle != NULL)
- wl_event_source_remove(surface->configure_idle);
-
- wl_list_for_each_safe(configure, temp, &surface->configure_list, link)
- free(configure);
-
- free(surface);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_parent(struct wl_client *wl_client,
- struct wl_resource *resource,
- struct wl_resource *parent_resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
- struct weston_desktop_surface *parent = NULL;
-
- if (parent_resource != NULL)
- parent = wl_resource_get_user_data(parent_resource);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_set_parent(surface->desktop, dsurface, parent);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_title(struct wl_client *wl_client,
- struct wl_resource *resource,
- const char *title)
-{
- struct weston_desktop_surface *surface =
- wl_resource_get_user_data(resource);
-
- weston_desktop_surface_set_title(surface, title);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_app_id(struct wl_client *wl_client,
- struct wl_resource *resource,
- const char *app_id)
-{
- struct weston_desktop_surface *surface =
- wl_resource_get_user_data(resource);
-
- weston_desktop_surface_set_app_id(surface, app_id);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_show_window_menu(struct wl_client *wl_client,
- struct wl_resource *resource,
- struct wl_resource *seat_resource,
- uint32_t serial,
- int32_t x, int32_t y)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_seat *seat =
- wl_resource_get_user_data(seat_resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_show_window_menu(surface->desktop, dsurface, seat, x, y);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_move(struct wl_client *wl_client,
- struct wl_resource *resource,
- struct wl_resource *seat_resource,
- uint32_t serial)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_seat *seat =
- wl_resource_get_user_data(seat_resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_move(surface->desktop, dsurface, seat, serial);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_resize(struct wl_client *wl_client,
- struct wl_resource *resource,
- struct wl_resource *seat_resource,
- uint32_t serial,
- enum xdg_surface_resize_edge edges)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_seat *seat =
- wl_resource_get_user_data(seat_resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
- enum weston_desktop_surface_edge surf_edges =
- (enum weston_desktop_surface_edge) edges;
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, surf_edges);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_ack_configure(struct wl_client *wl_client,
- struct wl_resource *resource,
- uint32_t serial)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
- struct weston_desktop_xdg_surface_configure *configure, *temp;
- bool found = false;
-
- wl_list_for_each_safe(configure, temp, &surface->configure_list, link) {
- if (configure->serial < serial) {
- wl_list_remove(&configure->link);
- free(configure);
- } else if (configure->serial == serial) {
- wl_list_remove(&configure->link);
- found = true;
- break;
- } else {
- break;
- }
- }
- if (!found) {
- struct weston_desktop_client *client =
- weston_desktop_surface_get_client(dsurface);
- struct wl_resource *client_resource =
- weston_desktop_client_get_resource(client);
- wl_resource_post_error(client_resource,
- XDG_SHELL_ERROR_DEFUNCT_SURFACES,
- "Wrong configure serial: %u", serial);
- return;
- }
-
- surface->next.state = configure->state;
- surface->next.size = configure->size;
-
- free(configure);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_window_geometry(struct wl_client *wl_client,
- struct wl_resource *resource,
- int32_t x, int32_t y,
- int32_t width, int32_t height)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- surface->has_next_geometry = true;
- surface->next_geometry.x = x;
- surface->next_geometry.y = y;
- surface->next_geometry.width = width;
- surface->next_geometry.height = height;
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_maximized(struct wl_client *wl_client,
- struct wl_resource *resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_maximized_requested(surface->desktop, dsurface, true);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_unset_maximized(struct wl_client *wl_client,
- struct wl_resource *resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_maximized_requested(surface->desktop, dsurface, false);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_fullscreen(struct wl_client *wl_client,
- struct wl_resource *resource,
- struct wl_resource *output_resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
- struct weston_output *output = NULL;
-
- if (output_resource != NULL)
- output = weston_output_from_resource(output_resource);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_fullscreen_requested(surface->desktop, dsurface,
- true, output);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_unset_fullscreen(struct wl_client *wl_client,
- struct wl_resource *resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_fullscreen_requested(surface->desktop, dsurface,
- false, NULL);
-}
-
-static void
-weston_desktop_xdg_surface_protocol_set_minimized(struct wl_client *wl_client,
- struct wl_resource *resource)
-{
- struct weston_desktop_surface *dsurface =
- wl_resource_get_user_data(resource);
- struct weston_desktop_xdg_surface *surface =
- weston_desktop_surface_get_implementation_data(dsurface);
-
- weston_desktop_xdg_surface_ensure_added(surface);
- weston_desktop_api_minimized_requested(surface->desktop, dsurface);
-}
-
-static const struct xdg_surface_interface weston_desktop_xdg_surface_implementation = {
- .destroy = weston_desktop_destroy_request,
- .set_parent = weston_desktop_xdg_surface_protocol_set_parent,
- .set_title = weston_desktop_xdg_surface_protocol_set_title,
- .set_app_id = weston_desktop_xdg_surface_protocol_set_app_id,
- .show_window_menu = weston_desktop_xdg_surface_protocol_show_window_menu,
- .move = weston_desktop_xdg_surface_protocol_move,
- .resize = weston_desktop_xdg_surface_protocol_resize,
- .ack_configure = weston_desktop_xdg_surface_protocol_ack_configure,
- .set_window_geometry = weston_desktop_xdg_surface_protocol_set_window_geometry,
- .set_maximized = weston_desktop_xdg_surface_protocol_set_maximized,
- .unset_maximized = weston_desktop_xdg_surface_protocol_unset_maximized,
- .set_fullscreen = weston_desktop_xdg_surface_protocol_set_fullscreen,
- .unset_fullscreen = weston_desktop_xdg_surface_protocol_unset_fullscreen,
- .set_minimized = weston_desktop_xdg_surface_protocol_set_minimized,
-};
-
-static const struct weston_desktop_surface_implementation weston_desktop_xdg_surface_internal_implementation = {
- .set_maximized = weston_desktop_xdg_surface_set_maximized,
- .set_fullscreen = weston_desktop_xdg_surface_set_fullscreen,
- .set_resizing = weston_desktop_xdg_surface_set_resizing,
- .set_activated = weston_desktop_xdg_surface_set_activated,
- .set_size = weston_desktop_xdg_surface_set_size,
- .committed = weston_desktop_xdg_surface_committed,
- .ping = weston_desktop_xdg_surface_ping,
- .close = weston_desktop_xdg_surface_close,
-
- .get_maximized = weston_desktop_xdg_surface_get_maximized,
- .get_fullscreen = weston_desktop_xdg_surface_get_fullscreen,
- .get_resizing = weston_desktop_xdg_surface_get_resizing,
- .get_activated = weston_desktop_xdg_surface_get_activated,
-
- .destroy = weston_desktop_xdg_surface_destroy,
-};
-
-static void
-weston_desktop_xdg_popup_close(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_popup *popup = user_data;
-
- xdg_popup_send_popup_done(popup->resource);
-}
-
-static void
-weston_desktop_xdg_popup_destroy(struct weston_desktop_surface *dsurface,
- void *user_data)
-{
- struct weston_desktop_xdg_popup *popup = user_data;
- struct weston_desktop_surface *topmost;
- struct weston_desktop_client *client =
- weston_desktop_surface_get_client(popup->popup);
-
- if (!weston_desktop_surface_get_grab(popup->popup))
- goto end;
-
- topmost = weston_desktop_seat_popup_grab_get_topmost_surface(popup->seat);
- if (topmost != popup->popup) {
- struct wl_resource *client_resource =
- weston_desktop_client_get_resource(client);
-
- wl_resource_post_error(client_resource,
- XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
- "xdg_popup was destroyed while it was not the topmost popup.");
- }
-
- weston_desktop_surface_popup_ungrab(popup->popup, popup->seat);
-
-end:
- free(popup);
-}
-
-static const struct xdg_popup_interface weston_desktop_xdg_popup_implementation = {
- .destroy = weston_desktop_destroy_request,
-};
-
-static const struct weston_desktop_surface_implementation weston_desktop_xdg_popup_internal_implementation = {
- .close = weston_desktop_xdg_popup_close,
-
- .destroy = weston_desktop_xdg_popup_destroy,
-};
-
-static void
-weston_desktop_xdg_shell_protocol_use_unstable_version(struct wl_client *wl_client,
- struct wl_resource *resource,
- int32_t version)
-{
- if (version > 1) {
- wl_resource_post_error(resource,
- 1, "xdg_shell version not supported");
- return;
- }
-}
-
-static void
-weston_desktop_xdg_surface_add_idle_callback(void *user_data)
-{
- struct weston_desktop_xdg_surface *surface = user_data;
-
- surface->add_idle = NULL;
- weston_desktop_xdg_surface_ensure_added(surface);
-}
-
-static void
-weston_desktop_xdg_shell_protocol_get_xdg_surface(struct wl_client *wl_client,
- struct wl_resource *resource,
- uint32_t id,
- struct wl_resource *surface_resource)
-{
- struct weston_desktop_client *client =
- wl_resource_get_user_data(resource);
- struct weston_desktop *desktop =
- weston_desktop_client_get_desktop(client);
- struct weston_surface *wsurface =
- wl_resource_get_user_data(surface_resource);
- struct weston_desktop_xdg_surface *surface;
- struct wl_display *display = weston_desktop_get_display(desktop);
- struct wl_event_loop *loop = wl_display_get_event_loop(display);
-
- if (weston_surface_set_role(wsurface, "xdg_surface", resource, XDG_SHELL_ERROR_ROLE) < 0)
- return;
-
- surface = zalloc(sizeof(struct weston_desktop_xdg_surface));
- if (surface == NULL) {
- wl_client_post_no_memory(wl_client);
- return;
- }
-
- surface->desktop = desktop;
-
- surface->surface =
- weston_desktop_surface_create(surface->desktop, client,
- wsurface,
- &weston_desktop_xdg_surface_internal_implementation,
- surface);
- if (surface->surface == NULL) {
- free(surface);
- return;
- }
-
- surface->resource =
- weston_desktop_surface_add_resource(surface->surface,
- &xdg_surface_interface,
- &weston_desktop_xdg_surface_implementation,
- id, NULL);
- if (surface->resource == NULL)
- return;
-
- surface->add_idle =
- wl_event_loop_add_idle(loop,
- weston_desktop_xdg_surface_add_idle_callback,
- surface);
-
- wl_list_init(&surface->configure_list);
-}
-
-static void
-weston_desktop_xdg_shell_protocol_get_xdg_popup(struct wl_client *wl_client,
- struct wl_resource *resource,
- uint32_t id,
- struct wl_resource *surface_resource,
- struct wl_resource *parent_resource,
- struct wl_resource *seat_resource,
- uint32_t serial,
- int32_t x, int32_t y)
-{
- struct weston_desktop_client *client =
- wl_resource_get_user_data(resource);
- struct weston_surface *wsurface =
- wl_resource_get_user_data(surface_resource);
- struct weston_surface *wparent =
- wl_resource_get_user_data(parent_resource);
- struct weston_seat *wseat = wl_resource_get_user_data(seat_resource);
- struct weston_desktop_seat *seat = weston_desktop_seat_from_seat(wseat);
- struct weston_desktop_surface *parent, *topmost;
- bool parent_is_popup, parent_is_xdg;
- struct weston_desktop_xdg_popup *popup;
-
- if (weston_surface_set_role(wsurface, "xdg_popup", resource, XDG_SHELL_ERROR_ROLE) < 0)
- return;
-
- if (!weston_surface_is_desktop_surface(wparent)) {
- wl_resource_post_error(resource,
- XDG_SHELL_ERROR_INVALID_POPUP_PARENT,
- "xdg_popup parent was invalid");
- return;
- }
-
- parent = weston_surface_get_desktop_surface(wparent);
- parent_is_xdg =
- weston_desktop_surface_has_implementation(parent,
- &weston_desktop_xdg_surface_internal_implementation);
- parent_is_popup =
- weston_desktop_surface_has_implementation(parent,
- &weston_desktop_xdg_popup_internal_implementation);
-
- if (!parent_is_xdg && !parent_is_popup) {
- wl_resource_post_error(resource,
- XDG_SHELL_ERROR_INVALID_POPUP_PARENT,
- "xdg_popup parent was invalid");
- return;
- }
-
- topmost = weston_desktop_seat_popup_grab_get_topmost_surface(seat);
- if ((topmost == NULL && parent_is_popup) ||
- (topmost != NULL && topmost != parent)) {
- wl_resource_post_error(resource,
- XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
- "xdg_popup was not created on the topmost popup");
- return;
- }
-
- popup = zalloc(sizeof(struct weston_desktop_xdg_popup));
- if (popup == NULL) {
- wl_client_post_no_memory(wl_client);
- return;
- }
-
- popup->desktop = weston_desktop_client_get_desktop(client);
- popup->display = weston_desktop_get_display(popup->desktop);
- popup->seat = seat;
-
- popup->popup =
- weston_desktop_surface_create(popup->desktop, client, wsurface,
- &weston_desktop_xdg_popup_internal_implementation,
- popup);
- if (popup->popup == NULL) {
- free(popup);
- return;
- }
-
- popup->resource =
- weston_desktop_surface_add_resource(popup->popup,
- &xdg_popup_interface,
- &weston_desktop_xdg_popup_implementation,
- id, NULL);
- if (popup->resource == NULL)
- return;
-
- weston_desktop_surface_set_relative_to(popup->popup, parent, x, y, false);
- weston_desktop_surface_popup_grab(popup->popup, popup->seat, serial);
-}
-
-static void
-weston_desktop_xdg_shell_protocol_pong(struct wl_client *wl_client,
- struct wl_resource *resource,
- uint32_t serial)
-{
- struct weston_desktop_client *client =
- wl_resource_get_user_data(resource);
-
- weston_desktop_client_pong(client, serial);
-}
-
-static const struct xdg_shell_interface weston_desktop_xdg_shell_implementation = {
- .destroy = weston_desktop_destroy_request,
- .use_unstable_version = weston_desktop_xdg_shell_protocol_use_unstable_version,
- .get_xdg_surface = weston_desktop_xdg_shell_protocol_get_xdg_surface,
- .get_xdg_popup = weston_desktop_xdg_shell_protocol_get_xdg_popup,
- .pong = weston_desktop_xdg_shell_protocol_pong,
-};
-
-static int
-xdg_shell_unversioned_dispatch(const void *implementation,
- void *_target, uint32_t opcode,
- const struct wl_message *message,
- union wl_argument *args)
-{
- struct wl_resource *resource = _target;
- struct weston_desktop_client *client =
- wl_resource_get_user_data(resource);
-
- if (opcode != 1 /* XDG_SHELL_USE_UNSTABLE_VERSION */) {
- wl_resource_post_error(resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "must call use_unstable_version first");
- return 0;
- }
-
-#define XDG_SERVER_VERSION 5
-
- if (args[0].i != XDG_SERVER_VERSION) {
- wl_resource_post_error(resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "incompatible version, server is %d " "client wants %d",
- XDG_SERVER_VERSION, args[0].i);
- return 0;
- }
-
- wl_resource_set_implementation(resource,
- &weston_desktop_xdg_shell_implementation,
- client, implementation);
-
- return 1;
-}
-
-static void
-weston_desktop_xdg_shell_bind(struct wl_client *client, void *data,
- uint32_t version, uint32_t id)
-{
- struct weston_desktop *desktop = data;
-
- weston_desktop_client_create(desktop, client,
- xdg_shell_unversioned_dispatch,
- &xdg_shell_interface, NULL, version, id);
-}
-
-struct wl_global *
-weston_desktop_xdg_shell_v5_create(struct weston_desktop *desktop,
- struct wl_display *display)
-{
- return wl_global_create(display,
- &xdg_shell_interface,
- WD_XDG_SHELL_PROTOCOL_VERSION,
- desktop, weston_desktop_xdg_shell_bind);
-}
--
2.14.1
More information about the wayland-devel
mailing list