hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwayland: use HAVE_ prefix for xcb_xfixes_set_client_disconnect_mode

Browse source 
86fc2199f8 ("build: unify naming for HAVE_* defines") has
switched over all other feature defines from HAS_* to HAVE_*, but
missed this one.
This commit is contained in:
Simon Ser 2022-12-08 02:04:58 +01:00
parent 1ed5137720
commit 9b7ee63774
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwayland/meson.build
View file

@ -82,4 +82,4 @@ wlr_deps += xwayland_libs
features += { 'xwayland': true } features += { 'xwayland': true }
have = cc.has_function('xcb_xfixes_set_client_disconnect_mode', dependencies: xwayland_libs) have = cc.has_function('xcb_xfixes_set_client_disconnect_mode', dependencies: xwayland_libs)
internal_config.set10('HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE', have) internal_config.set10('HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE', have)

2
xwayland/xwayland.c
View file

@ -102,7 +102,7 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
struct wlr_xwayland_server_options options = { struct wlr_xwayland_server_options options = {
.lazy = lazy, .lazy = lazy,
.enable_wm = true, .enable_wm = true,
#if HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE #if HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
.terminate_delay = lazy ? 10 : 0, .terminate_delay = lazy ? 10 : 0,
#endif #endif
}; };

2
xwayland/xwm.c
View file

@ -2130,7 +2130,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
sizeof(supported)/sizeof(*supported), sizeof(supported)/sizeof(*supported),
supported); supported);
#if HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE #if HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
if (xwm->xwayland->server->options.terminate_delay > 0 && if (xwm->xwayland->server->options.terminate_delay > 0 &&
xwm->xfixes_major_version >= 6) { xwm->xfixes_major_version >= 6) {
xcb_xfixes_set_client_disconnect_mode(xwm->xcb_conn, xcb_xfixes_set_client_disconnect_mode(xwm->xcb_conn,