Merge branch 'wlroots' into feature/xwayland

This commit is contained in:
Tony Crisci 2017-12-04 07:32:25 -05:00
commit 0896b68675
5 changed files with 141 additions and 1 deletions

View file

@ -33,6 +33,9 @@ struct sway_server {
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct wlr_wl_shell *wl_shell;
struct wl_listener wl_shell_surface;
};
struct sway_server server;
@ -46,5 +49,6 @@ void output_remove_notify(struct wl_listener *listener, void *data);
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
void handle_xwayland_surface(struct wl_listener *listener, void *data);
void handle_wl_shell_surface(struct wl_listener *listener, void *data);
#endif