mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-02 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

style fixes, exclude sway/desctop/xwayland.c when enable_xwayland: false

Browse source
This commit is contained in:
Pascal Pascher 2018-07-24 23:37:41 +02:00
parent 24ad1c3983
commit 2bf893248a
17 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/sway/criteria.h
View file

@ -25,9 +25,9 @@ struct criteria {
pcre *instance;
pcre *con_mark;
uint32_t con_id; // internal ID
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
uint32_t id; // X11 window ID
#endif
#endif
pcre *window_role;
uint32_t window_type;
bool floating;

4
include/sway/server.h
View file

@ -41,11 +41,11 @@ struct sway_server {
struct wlr_xdg_shell *xdg_shell;
struct wl_listener xdg_shell_surface;
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
struct sway_xwayland xwayland;
struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
#endif
#endif
bool debug_txn_timings;
list_t *transactions;

4
include/sway/tree/layout.h
View file

@ -27,9 +27,9 @@ struct sway_root {
struct wlr_output_layout *output_layout;
struct wl_listener output_layout_change;
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
#endif
#endif
struct wl_list drag_icons; // sway_drag_icon::link
struct wlr_texture *debug_tree;

12
include/sway/tree/view.h
View file

@ -14,9 +14,9 @@ struct sway_container;
enum sway_view_type {
SWAY_VIEW_XDG_SHELL_V6,
SWAY_VIEW_XDG_SHELL,
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
SWAY_VIEW_XWAYLAND,
#endif
#endif
};
enum sway_view_prop {
@ -26,9 +26,9 @@ enum sway_view_prop {
VIEW_PROP_INSTANCE,
VIEW_PROP_WINDOW_TYPE,
VIEW_PROP_WINDOW_ROLE,
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
VIEW_PROP_X11_WINDOW_ID,
#endif
#endif
};
struct sway_view_impl {
@ -96,9 +96,9 @@ struct sway_view {
union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
struct wlr_xdg_surface *wlr_xdg_surface;
#ifdef HAVE_XWAYLAND
#ifdef HAVE_XWAYLAND
struct wlr_xwayland_surface *wlr_xwayland_surface;
#endif
#endif
struct wlr_wl_shell_surface *wlr_wl_shell_surface;
};