Merge pull request #1970 from emersion/xdg-shell-stable

Add xdg-shell stable support

include/sway/server.h

@@ -8,6 +8,7 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_layer_shell.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/render/wlr_renderer.h>
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
@@ -33,6 +34,9 @@ struct sway_server {
 	struct wlr_xdg_shell_v6 *xdg_shell_v6;
 	struct wl_listener xdg_shell_v6_surface;
 
+	struct wlr_xdg_shell *xdg_shell;
+	struct wl_listener xdg_shell_surface;
+
 	struct wlr_xwayland *xwayland;
 	struct wlr_xcursor_manager *xcursor_manager;
 	struct wl_listener xwayland_surface;
@@ -52,6 +56,7 @@ void handle_new_output(struct wl_listener *listener, void *data);
 
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
+void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 

include/sway/tree/view.h

@@ -12,6 +12,7 @@ struct sway_container;
 enum sway_view_type {
 	SWAY_VIEW_WL_SHELL,
 	SWAY_VIEW_XDG_SHELL_V6,
+	SWAY_VIEW_XDG_SHELL,
 	SWAY_VIEW_XWAYLAND,
 };
 
@@ -54,6 +55,7 @@ struct sway_view {
 
 	union {
 		struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
+		struct wlr_xdg_surface *wlr_xdg_surface;
 		struct wlr_xwayland_surface *wlr_xwayland_surface;
 		struct wlr_wl_shell_surface *wlr_wl_shell_surface;
 	};
@@ -82,6 +84,22 @@ struct sway_xdg_shell_v6_view {
 	int pending_width, pending_height;
 };
 
+struct sway_xdg_shell_view {
+	struct sway_view view;
+
+	struct wl_listener commit;
+	struct wl_listener request_move;
+	struct wl_listener request_resize;
+	struct wl_listener request_maximize;
+	struct wl_listener request_fullscreen;
+	struct wl_listener new_popup;
+	struct wl_listener map;
+	struct wl_listener unmap;
+	struct wl_listener destroy;
+
+	int pending_width, pending_height;
+};
+
 struct sway_xwayland_view {
 	struct sway_view view;
 
@@ -156,6 +174,15 @@ struct sway_xdg_popup_v6 {
 	struct wl_listener destroy;
 };
 
+struct sway_xdg_popup {
+	struct sway_view_child child;
+
+	struct wlr_xdg_surface *wlr_xdg_surface;
+
+	struct wl_listener new_popup;
+	struct wl_listener destroy;
+};
+
 const char *view_get_title(struct sway_view *view);
 
 const char *view_get_app_id(struct sway_view *view);

protocols/meson.build

@@ -35,6 +35,7 @@ client_protocols = [
 ]
 
 server_protocols = [
+	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
 	['wlr-layer-shell-unstable-v1.xml'],
 	['wlr-input-inhibitor-unstable-v1.xml']

sway/desktop/xdg_shell.c

@@ -0,0 +1,277 @@
+#define _POSIX_C_SOURCE 199309L
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_xdg_shell.h>
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/server.h"
+#include "sway/tree/view.h"
+#include "sway/input/seat.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+static const struct sway_view_child_impl popup_impl;
+
+static void popup_destroy(struct sway_view_child *child) {
+	if (!sway_assert(child->impl == &popup_impl,
+			"Expected an xdg_shell popup")) {
+		return;
+	}
+	struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
+	wl_list_remove(&popup->new_popup.link);
+	wl_list_remove(&popup->destroy.link);
+	free(popup);
+}
+
+static const struct sway_view_child_impl popup_impl = {
+	.destroy = popup_destroy,
+};
+
+static struct sway_xdg_popup *popup_create(
+	struct wlr_xdg_popup *wlr_popup, struct sway_view *view);
+
+static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
+	struct sway_xdg_popup *popup =
+		wl_container_of(listener, popup, new_popup);
+	struct wlr_xdg_popup *wlr_popup = data;
+	popup_create(wlr_popup, popup->child.view);
+}
+
+static void popup_handle_destroy(struct wl_listener *listener, void *data) {
+	struct sway_xdg_popup *popup = wl_container_of(listener, popup, destroy);
+	view_child_destroy(&popup->child);
+}
+
+static struct sway_xdg_popup *popup_create(
+		struct wlr_xdg_popup *wlr_popup, struct sway_view *view) {
+	struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
+
+	struct sway_xdg_popup *popup =
+		calloc(1, sizeof(struct sway_xdg_popup));
+	if (popup == NULL) {
+		return NULL;
+	}
+	view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface);
+
+	wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
+	popup->new_popup.notify = popup_handle_new_popup;
+	wl_signal_add(&xdg_surface->events.destroy, &popup->destroy);
+	popup->destroy.notify = popup_handle_destroy;
+
+	return popup;
+}
+
+
+static struct sway_xdg_shell_view *xdg_shell_view_from_view(
+		struct sway_view *view) {
+	if (!sway_assert(view->type == SWAY_VIEW_XDG_SHELL,
+			"Expected xdg_shell view")) {
+		return NULL;
+	}
+	return (struct sway_xdg_shell_view *)view;
+}
+
+static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
+	if (xdg_shell_view_from_view(view) == NULL) {
+		return NULL;
+	}
+	switch (prop) {
+	case VIEW_PROP_TITLE:
+		return view->wlr_xdg_surface->toplevel->title;
+	case VIEW_PROP_APP_ID:
+		return view->wlr_xdg_surface->toplevel->app_id;
+	default:
+		return NULL;
+	}
+}
+
+static void configure(struct sway_view *view, double ox, double oy, int width,
+		int height) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		xdg_shell_view_from_view(view);
+	if (xdg_shell_view == NULL) {
+		return;
+	}
+
+	xdg_shell_view->pending_width = width;
+	xdg_shell_view->pending_height = height;
+	wlr_xdg_toplevel_set_size(view->wlr_xdg_surface, width, height);
+}
+
+static void set_activated(struct sway_view *view, bool activated) {
+	if (xdg_shell_view_from_view(view) == NULL) {
+		return;
+	}
+	struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+	if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+		wlr_xdg_toplevel_set_activated(surface, activated);
+	}
+}
+
+static void set_fullscreen(struct sway_view *view, bool fullscreen) {
+	if (xdg_shell_view_from_view(view) == NULL) {
+		return;
+	}
+	struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+	wlr_xdg_toplevel_set_fullscreen(surface, fullscreen);
+}
+
+static void for_each_surface(struct sway_view *view,
+		wlr_surface_iterator_func_t iterator, void *user_data) {
+	if (xdg_shell_view_from_view(view) == NULL) {
+		return;
+	}
+	wlr_xdg_surface_for_each_surface(view->wlr_xdg_surface, iterator,
+		user_data);
+}
+
+static void _close(struct sway_view *view) {
+	if (xdg_shell_view_from_view(view) == NULL) {
+		return;
+	}
+	struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+	if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+		wlr_xdg_surface_send_close(surface);
+	}
+}
+
+static void destroy(struct sway_view *view) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		xdg_shell_view_from_view(view);
+	if (xdg_shell_view == NULL) {
+		return;
+	}
+	wl_list_remove(&xdg_shell_view->destroy.link);
+	wl_list_remove(&xdg_shell_view->map.link);
+	wl_list_remove(&xdg_shell_view->unmap.link);
+	wl_list_remove(&xdg_shell_view->request_fullscreen.link);
+	free(xdg_shell_view);
+}
+
+static const struct sway_view_impl view_impl = {
+	.get_prop = get_prop,
+	.configure = configure,
+	.set_activated = set_activated,
+	.set_fullscreen = set_fullscreen,
+	.for_each_surface = for_each_surface,
+	.close = _close,
+	.destroy = destroy,
+};
+
+static void handle_commit(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, commit);
+	struct sway_view *view = &xdg_shell_view->view;
+	// NOTE: We intentionally discard the view's desired width here
+	// TODO: Store this for restoration when moving to floating plane
+	// TODO: Let floating views do whatever
+	view_update_size(view, xdg_shell_view->pending_width,
+		xdg_shell_view->pending_height);
+	view_update_title(view, false);
+	view_damage_from(view);
+}
+
+static void handle_new_popup(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, new_popup);
+	struct wlr_xdg_popup *wlr_popup = data;
+	popup_create(wlr_popup, &xdg_shell_view->view);
+}
+
+static void handle_unmap(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, unmap);
+
+	view_unmap(&xdg_shell_view->view);
+
+	wl_list_remove(&xdg_shell_view->commit.link);
+	wl_list_remove(&xdg_shell_view->new_popup.link);
+}
+
+static void handle_map(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, map);
+	struct sway_view *view = &xdg_shell_view->view;
+	struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
+
+	view_map(view, view->wlr_xdg_surface->surface);
+
+	xdg_shell_view->commit.notify = handle_commit;
+	wl_signal_add(&xdg_surface->surface->events.commit,
+		&xdg_shell_view->commit);
+
+	xdg_shell_view->new_popup.notify = handle_new_popup;
+	wl_signal_add(&xdg_surface->events.new_popup,
+		&xdg_shell_view->new_popup);
+
+	if (xdg_surface->toplevel->client_pending.fullscreen) {
+		view_set_fullscreen(view, true);
+	}
+}
+
+static void handle_destroy(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, destroy);
+	view_destroy(&xdg_shell_view->view);
+}
+
+static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
+	struct sway_xdg_shell_view *xdg_shell_view =
+		wl_container_of(listener, xdg_shell_view, request_fullscreen);
+	struct wlr_xdg_toplevel_set_fullscreen_event *e = data;
+	struct wlr_xdg_surface *xdg_surface =
+		xdg_shell_view->view.wlr_xdg_surface;
+
+	if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL,
+				"xdg_shell requested fullscreen of surface with role %i",
+				xdg_surface->role)) {
+		return;
+	}
+	if (!xdg_surface->mapped) {
+		return;
+	}
+
+	view_set_fullscreen(&xdg_shell_view->view, e->fullscreen);
+}
+
+void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
+	struct sway_server *server = wl_container_of(listener, server,
+		xdg_shell_surface);
+	struct wlr_xdg_surface *xdg_surface = data;
+
+	if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
+		wlr_log(L_DEBUG, "New xdg_shell popup");
+		return;
+	}
+
+	wlr_log(L_DEBUG, "New xdg_shell toplevel title='%s' app_id='%s'",
+		xdg_surface->toplevel->title, xdg_surface->toplevel->app_id);
+	wlr_xdg_surface_ping(xdg_surface);
+	wlr_xdg_toplevel_set_maximized(xdg_surface, true);
+
+	struct sway_xdg_shell_view *xdg_shell_view =
+		calloc(1, sizeof(struct sway_xdg_shell_view));
+	if (!sway_assert(xdg_shell_view, "Failed to allocate view")) {
+		return;
+	}
+
+	view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl);
+	xdg_shell_view->view.wlr_xdg_surface = xdg_surface;
+
+	// TODO:
+	// - Look up pid and open on appropriate workspace
+
+	xdg_shell_view->map.notify = handle_map;
+	wl_signal_add(&xdg_surface->events.map, &xdg_shell_view->map);
+
+	xdg_shell_view->unmap.notify = handle_unmap;
+	wl_signal_add(&xdg_surface->events.unmap, &xdg_shell_view->unmap);
+
+	xdg_shell_view->destroy.notify = handle_destroy;
+	wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy);
+
+	xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen;
+	wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
+			&xdg_shell_view->request_fullscreen);
+}

sway/meson.build

@@ -10,10 +10,11 @@ sway_sources = files(
 	'security.c',
 
 	'desktop/desktop.c',
-	'desktop/output.c',
 	'desktop/layer_shell.c',
+	'desktop/output.c',
 	'desktop/wl_shell.c',
 	'desktop/xdg_shell_v6.c',
+	'desktop/xdg_shell.c',
 	'desktop/xwayland.c',
 
 	'input/input-manager.c',

sway/server.c

@@ -83,6 +83,11 @@ bool server_init(struct sway_server *server) {
 		&server->xdg_shell_v6_surface);
 	server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface;
 
+	server->xdg_shell = wlr_xdg_shell_create(server->wl_display);
+	wl_signal_add(&server->xdg_shell->events.new_surface,
+		&server->xdg_shell_surface);
+	server->xdg_shell_surface.notify = handle_xdg_shell_surface;
+
 	server->wl_shell = wlr_wl_shell_create(server->wl_display);
 	wl_signal_add(&server->wl_shell->events.new_surface,
 		&server->wl_shell_surface);

sway/tree/container.c

@@ -7,6 +7,8 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_wl_shell.h>
+#include <wlr/types/wlr_xdg_shell_v6.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "cairo.h"
 #include "pango.h"
 #include "sway/config.h"
@@ -459,6 +461,16 @@ struct sway_container *container_at(struct sway_container *parent,
 					sview->wlr_xdg_surface_v6,
 					view_sx, view_sy, &_sx, &_sy);
 				break;
+			case SWAY_VIEW_XDG_SHELL:
+				// the top left corner of the sway container is the
+				// coordinate of the top left corner of the window geometry
+				view_sx += sview->wlr_xdg_surface->geometry.x;
+				view_sy += sview->wlr_xdg_surface->geometry.y;
+
+				_surface = wlr_xdg_surface_surface_at(
+					sview->wlr_xdg_surface,
+					view_sx, view_sy, &_sx, &_sy);
+				break;
 			}
 			if (_surface) {
 				*sx = _sx;

sway/tree/view.c

@@ -76,6 +76,8 @@ const char *view_get_type(struct sway_view *view) {
 		return "wl_shell";
 	case SWAY_VIEW_XDG_SHELL_V6:
 		return "xdg_shell_v6";
+	case SWAY_VIEW_XDG_SHELL:
+		return "xdg_shell";
 	case SWAY_VIEW_XWAYLAND:
 		return "xwayland";
 	}