diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-26 20:31:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 20:31:32 -0700 |
| commit | 152ccd7fb14dc0f09f9c6f902f727f7addf7657a (patch) | |
| tree | 0c0951e0ec5c36a6de14535903092b539bdbbf9b /include/sway | |
| parent | f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0 (diff) | |
| parent | bf380813829b11d42ff0703630600e5bee06098b (diff) | |
Merge pull request #2145 from emersion/xwayland-wants-float
Automatically float xwayland windows
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/server.h | 9 | ||||
| -rw-r--r-- | include/sway/xwayland.h | 25 |
2 files changed, 28 insertions, 6 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 963d4dc1..b016aba8 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -11,7 +11,7 @@ #include <wlr/types/wlr_xdg_shell.h> #include <wlr/render/wlr_renderer.h> // TODO WLR: make Xwayland optional -#include <wlr/xwayland.h> +#include "sway/xwayland.h" struct sway_server { struct wl_display *wl_display; @@ -37,12 +37,9 @@ struct sway_server { struct wlr_xdg_shell *xdg_shell; struct wl_listener xdg_shell_surface; - struct wlr_xwayland *xwayland; - struct wlr_xcursor_manager *xcursor_manager; + struct sway_xwayland xwayland; struct wl_listener xwayland_surface; - - struct wlr_wl_shell *wl_shell; - struct wl_listener wl_shell_surface; + struct wl_listener xwayland_ready; }; struct sway_server server; diff --git a/include/sway/xwayland.h b/include/sway/xwayland.h new file mode 100644 index 00000000..78d1053b --- /dev/null +++ b/include/sway/xwayland.h @@ -0,0 +1,25 @@ +#ifndef SWAY_XWAYLAND_H +#define SWAY_XWAYLAND_H + +#include <wlr/xwayland.h> +#include <xcb/xproto.h> + +enum atom_name { + NET_WM_WINDOW_TYPE_DIALOG, + NET_WM_WINDOW_TYPE_UTILITY, + NET_WM_WINDOW_TYPE_TOOLBAR, + NET_WM_WINDOW_TYPE_SPLASH, + NET_WM_STATE_MODAL, + ATOM_LAST, +}; + +struct sway_xwayland { + struct wlr_xwayland *wlr_xwayland; + struct wlr_xcursor_manager *xcursor_manager; + + xcb_atom_t atoms[ATOM_LAST]; +}; + +void handle_xwayland_ready(struct wl_listener *listener, void *data); + +#endif |