aboutsummaryrefslogtreecommitdiff
path: root/rootston/xwayland.c
diff options
context:
space:
mode:
Diffstat (limited to 'rootston/xwayland.c')
-rw-r--r--rootston/xwayland.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index f9ad2a22..88965f0d 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -10,7 +10,7 @@
#include "rootston/server.h"
static void handle_destroy(struct wl_listener *listener, void *data) {
- struct roots_wl_shell_surface *roots_surface =
+ 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);
@@ -18,19 +18,20 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
}
static void x11_activate(struct roots_view *view, bool active) {
- wlr_x11_window_activate(view->desktop->xwayland, view->x11_window);
+ wlr_xwayland_surface_activate(view->desktop->xwayland,
+ view->xwayland_surface);
}
void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct roots_desktop *desktop =
wl_container_of(listener, desktop, xwayland_surface);
- struct wlr_x11_window *surface = data;
+ struct wlr_xwayland_surface *surface = data;
// TODO: get and log title, class, etc
wlr_log(L_DEBUG, "new xwayland surface");
- struct roots_x11_surface *roots_surface =
- calloc(1, sizeof(struct roots_wl_shell_surface));
+ struct roots_xwayland_surface *roots_surface =
+ calloc(1, sizeof(struct roots_xwayland_surface));
wl_list_init(&roots_surface->destroy.link);
roots_surface->destroy.notify = handle_destroy;
wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
@@ -38,8 +39,8 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct roots_view *view = calloc(1, sizeof(struct roots_view));
view->type = ROOTS_XWAYLAND_VIEW;
view->x = view->y = 200;
- view->x11_window = surface;
- view->roots_x11_surface = roots_surface;
+ view->xwayland_surface = surface;
+ view->roots_xwayland_surface = roots_surface;
view->wlr_surface = surface->surface;
view->desktop = desktop;
view->activate = x11_activate;