diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
| commit | 0896b6867536e7c12e5345ca5df94b9467c8bf24 (patch) | |
| tree | 2240f512d2e55102b2ad16b4ff13a6c8124947d9 /include/sway/server.h | |
| parent | xwayland shell (diff) | |
| parent | Merge pull request #1493 from acrisci/feature/wl-shell (diff) | |
| download | sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.gz sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.zst sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.zip | |
Merge branch 'wlroots' into feature/xwayland
Diffstat (limited to 'include/sway/server.h')
| -rw-r--r-- | include/sway/server.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 30b15e75..3fa72e84 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
| @@ -33,6 +33,9 @@ struct sway_server { | |||
| 33 | 33 | ||
| 34 | struct wlr_xwayland *xwayland; | 34 | struct wlr_xwayland *xwayland; |
| 35 | struct wl_listener xwayland_surface; | 35 | struct wl_listener xwayland_surface; |
| 36 | |||
| 37 | struct wlr_wl_shell *wl_shell; | ||
| 38 | struct wl_listener wl_shell_surface; | ||
| 36 | }; | 39 | }; |
| 37 | 40 | ||
| 38 | struct sway_server server; | 41 | struct sway_server server; |
| @@ -46,5 +49,6 @@ void output_remove_notify(struct wl_listener *listener, void *data); | |||
| 46 | 49 | ||
| 47 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 50 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
| 48 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 51 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
| 52 | void handle_wl_shell_surface(struct wl_listener *listener, void *data); | ||
| 49 | 53 | ||
| 50 | #endif | 54 | #endif |