alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson_options.txt
View file

@ -1,4 +1,4 @@
option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.')
option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
option('enable-xwayland', type: 'boolean', value: false, description: 'Enable support X11 applications') option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications')

2
sway/desktop/xwayland.c
View file

@ -1,5 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 199309L
#ifdef HAVE_XWAYLAND
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server.h>
@ -592,4 +591,3 @@ void handle_xwayland_ready(struct wl_listener *listener, void *data) {
xcb_disconnect(xcb_conn); xcb_disconnect(xcb_conn);
} }
#endif

5
sway/meson.build
View file

@ -18,7 +18,6 @@ sway_sources = files(
'desktop/transaction.c', 'desktop/transaction.c',
'desktop/xdg_shell_v6.c', 'desktop/xdg_shell_v6.c',
'desktop/xdg_shell.c', 'desktop/xdg_shell.c',
'desktop/xwayland.c',
'input/input-manager.c', 'input/input-manager.c',
'input/seat.c', 'input/seat.c',
@ -152,6 +151,10 @@ sway_sources = files(
'tree/output.c', 'tree/output.c',
) )
if get_option('enable-xwayland')
sway_sources += 'desktop/xwayland.c'
endif
sway_deps = [ sway_deps = [
cairo, cairo,
gdk_pixbuf, gdk_pixbuf,