aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rootston/wl_shell.c7
-rw-r--r--rootston/xwayland.c44
2 files changed, 29 insertions, 22 deletions
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index 1991d332..55ffd2eb 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -17,6 +17,12 @@ static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
height);
}
+static void close(struct roots_view *view) {
+ assert(view->type == ROOTS_WL_SHELL_VIEW);
+ struct wlr_wl_shell_surface *surf = view->wl_shell_surface;
+ wl_client_destroy(surf->client);
+}
+
static void handle_request_move(struct wl_listener *listener, void *data) {
struct roots_wl_shell_surface *roots_surface =
wl_container_of(listener, roots_surface, request_move);
@@ -88,6 +94,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
view->roots_wl_shell_surface = roots_surface;
view->wlr_surface = surface->surface;
view->resize = resize;
+ view->close = close;
view->desktop = desktop;
roots_surface->view = view;
list_add(desktop->views, view);
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 4b833ef1..c32ee15b 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -9,28 +9,6 @@
#include "rootston/desktop.h"
#include "rootston/server.h"
-static void handle_destroy(struct wl_listener *listener, void *data) {
- struct roots_xwayland_surface *roots_surface =
- wl_container_of(listener, roots_surface, destroy);
- wl_list_remove(&roots_surface->destroy.link);
- view_destroy(roots_surface->view);
- free(roots_surface);
-}
-
-static void handle_request_configure(struct wl_listener *listener, void *data) {
- struct roots_xwayland_surface *roots_surface =
- wl_container_of(listener, roots_surface, request_configure);
- struct wlr_xwayland_surface *xwayland_surface =
- roots_surface->view->xwayland_surface;
- struct wlr_xwayland_surface_configure_event *event = data;
-
- roots_surface->view->x = (double)event->x;
- roots_surface->view->y = (double)event->y;
-
- wlr_xwayland_surface_configure(roots_surface->view->desktop->xwayland,
- xwayland_surface, event->x, event->y, event->width, event->height);
-}
-
static void activate(struct roots_view *view, bool active) {
assert(view->type == ROOTS_XWAYLAND_VIEW);
if (active) {
@@ -53,6 +31,28 @@ static void close(struct roots_view *view) {
wlr_xwayland_surface_close(view->desktop->xwayland, view->xwayland_surface);
}
+static void handle_destroy(struct wl_listener *listener, void *data) {
+ struct roots_xwayland_surface *roots_surface =
+ wl_container_of(listener, roots_surface, destroy);
+ wl_list_remove(&roots_surface->destroy.link);
+ view_destroy(roots_surface->view);
+ free(roots_surface);
+}
+
+static void handle_request_configure(struct wl_listener *listener, void *data) {
+ struct roots_xwayland_surface *roots_surface =
+ wl_container_of(listener, roots_surface, request_configure);
+ struct wlr_xwayland_surface *xwayland_surface =
+ roots_surface->view->xwayland_surface;
+ struct wlr_xwayland_surface_configure_event *event = data;
+
+ roots_surface->view->x = (double)event->x;
+ roots_surface->view->y = (double)event->y;
+
+ wlr_xwayland_surface_configure(roots_surface->view->desktop->xwayland,
+ xwayland_surface, event->x, event->y, event->width, event->height);
+}
+
void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct roots_desktop *desktop =
wl_container_of(listener, desktop, xwayland_surface);