From 2f7e435c6f2c7e4ace4f2566677d8730531985c8 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 27 Dec 2017 10:10:13 -0500 Subject: [PATCH] desktop: use wlr-surface commit --- sway/desktop/wl_shell.c | 4 +++- sway/desktop/xdg_shell_v6.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c index e7150bf3..a7bb8eb5 100644 --- a/sway/desktop/wl_shell.c +++ b/sway/desktop/wl_shell.c @@ -114,7 +114,9 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { // - Criteria sway_surface->commit.notify = handle_commit; - wl_signal_add(&shell_surface->events.commit, &sway_surface->commit); + wl_signal_add(&shell_surface->surface->events.commit, + &sway_surface->commit); + sway_surface->destroy.notify = handle_destroy; wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 015cc9d0..5ff19f7e 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -120,7 +120,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { // - Criteria sway_surface->commit.notify = handle_commit; - wl_signal_add(&xdg_surface->events.commit, &sway_surface->commit); + wl_signal_add(&xdg_surface->surface->events.commit, &sway_surface->commit); + sway_surface->destroy.notify = handle_destroy; wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy);