diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-09 08:09:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 08:09:03 -0400 |
| commit | d0d6413772a09f385bc16f5fc38eda114695ee16 (patch) | |
| tree | 59ea3b1a314ede560f90f6e8b1058c1b54b90161 /include | |
| parent | 7aa0e949b3849428aad426533e719562d7bb8ef9 (diff) | |
| parent | 9cab66f0f914a0194cdfa178377f6413c33ac515 (diff) | |
Merge pull request #220 from versusvoid/optional-xwayland
Make Xwayland optional
Diffstat (limited to 'include')
| -rw-r--r-- | include/rootston/config.h | 1 | ||||
| -rw-r--r-- | include/rootston/desktop.h | 7 | ||||
| -rw-r--r-- | include/rootston/server.h | 2 | ||||
| -rw-r--r-- | include/rootston/view.h | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h index 545b6742..66347c3c 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -27,6 +27,7 @@ struct binding_config { }; struct roots_config { + bool xwayland; // TODO: Multiple cursors, multiseat struct { char *mapped_output; diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 68fc5b94..1225bdcd 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -35,15 +35,18 @@ struct roots_desktop { struct wlr_compositor *compositor; struct wlr_wl_shell *wl_shell; struct wlr_xdg_shell_v6 *xdg_shell_v6; - struct wlr_xwayland *xwayland; struct wlr_gamma_control_manager *gamma_control_manager; struct wlr_screenshooter *screenshooter; struct wl_listener output_add; struct wl_listener output_remove; struct wl_listener xdg_shell_v6_surface; - struct wl_listener xwayland_surface; struct wl_listener wl_shell_surface; + +#ifdef HAS_XWAYLAND + struct wlr_xwayland *xwayland; + struct wl_listener xwayland_surface; +#endif }; struct roots_server; diff --git a/include/rootston/server.h b/include/rootston/server.h index 15e3a4ee..a4eacb7f 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -5,7 +5,9 @@ #include <wlr/backend/session.h> #include <wlr/types/wlr_data_device_manager.h> #include <wlr/render.h> +#ifdef HAS_XWAYLAND #include <wlr/xwayland.h> +#endif #include "rootston/config.h" #include "rootston/desktop.h" #include "rootston/input.h" diff --git a/include/rootston/view.h b/include/rootston/view.h index 0b68f93f..af087182 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -58,12 +58,16 @@ struct roots_view { union { struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; +#ifdef HAS_XWAYLAND struct wlr_xwayland_surface *xwayland_surface; +#endif }; union { struct roots_wl_shell_surface *roots_wl_shell_surface; struct roots_xdg_surface_v6 *roots_xdg_surface_v6; +#ifdef HAS_XWAYLAND struct roots_xwayland_surface *roots_xwayland_surface; +#endif }; struct wlr_surface *wlr_surface; // TODO: This would probably be better as a field that's updated on a |