diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-27 10:10:13 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-27 10:10:13 -0500 |
commit | 2f7e435c6f2c7e4ace4f2566677d8730531985c8 (patch) | |
tree | 0abde2b463904c40eeaf06b7a1b93ec36f276438 /sway/desktop | |
parent | Merge pull request #1505 from acrisci/feature/input (diff) | |
download | sway-2f7e435c6f2c7e4ace4f2566677d8730531985c8.tar.gz sway-2f7e435c6f2c7e4ace4f2566677d8730531985c8.tar.zst sway-2f7e435c6f2c7e4ace4f2566677d8730531985c8.zip |
desktop: use wlr-surface commit
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/wl_shell.c | 4 | ||||
-rw-r--r-- | 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) { | |||
114 | // - Criteria | 114 | // - Criteria |
115 | 115 | ||
116 | sway_surface->commit.notify = handle_commit; | 116 | sway_surface->commit.notify = handle_commit; |
117 | wl_signal_add(&shell_surface->events.commit, &sway_surface->commit); | 117 | wl_signal_add(&shell_surface->surface->events.commit, |
118 | &sway_surface->commit); | ||
119 | |||
118 | sway_surface->destroy.notify = handle_destroy; | 120 | sway_surface->destroy.notify = handle_destroy; |
119 | wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); | 121 | wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); |
120 | 122 | ||
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) { | |||
120 | // - Criteria | 120 | // - Criteria |
121 | 121 | ||
122 | sway_surface->commit.notify = handle_commit; | 122 | sway_surface->commit.notify = handle_commit; |
123 | wl_signal_add(&xdg_surface->events.commit, &sway_surface->commit); | 123 | wl_signal_add(&xdg_surface->surface->events.commit, &sway_surface->commit); |
124 | |||
124 | sway_surface->destroy.notify = handle_destroy; | 125 | sway_surface->destroy.notify = handle_destroy; |
125 | wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy); | 126 | wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy); |
126 | 127 | ||