frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: wl_pointer.axis_v120 is no longer optional 

With Wayland 1.21 being our baseline, we do not need to compile
wl_pointer.axis_v120 conditionally.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Olivier Fourdan 2023-02-09 15:38:26 +01:00 committed by Peter Hutterer
parent f99bd03165
commit 2f8778ca68
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xwayland/xwayland-input.c
View File

@ -845,7 +845,6 @@ pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer,
} }
} }
#ifdef XWL_HAS_WL_POINTER_AXIS_V120
static void static void
pointer_handle_axis_v120(void *data, struct wl_pointer *pointer, pointer_handle_axis_v120(void *data, struct wl_pointer *pointer,
uint32_t axis, int32_t v120) uint32_t axis, int32_t v120)
@ -863,7 +862,6 @@ pointer_handle_axis_v120(void *data, struct wl_pointer *pointer,
break; break;
} }
} }
#endif
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {
pointer_handle_enter, pointer_handle_enter,
@ -875,9 +873,7 @@ static const struct wl_pointer_listener pointer_listener = {
pointer_handle_axis_source, pointer_handle_axis_source,
pointer_handle_axis_stop, pointer_handle_axis_stop,
pointer_handle_axis_discrete, pointer_handle_axis_discrete,
#ifdef XWL_HAS_WL_POINTER_AXIS_V120
pointer_handle_axis_v120, pointer_handle_axis_v120,
#endif
}; };
static void static void
@ -1854,11 +1850,7 @@ static void
create_input_device(struct xwl_screen *xwl_screen, uint32_t id, uint32_t version) create_input_device(struct xwl_screen *xwl_screen, uint32_t id, uint32_t version)
{ {
struct xwl_seat *xwl_seat; struct xwl_seat *xwl_seat;
int seat_version = 5; int seat_version = 8;
#ifdef XWL_HAS_WL_POINTER_AXIS_V120
seat_version = 8;
#endif
xwl_seat = calloc(1, sizeof *xwl_seat); xwl_seat = calloc(1, sizeof *xwl_seat);
if (xwl_seat == NULL) { if (xwl_seat == NULL) {

1
include/meson.build
View File

@ -419,7 +419,6 @@ xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_e
xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false) xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false)
xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false) xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false)
xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false) xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false)
xwayland_data.set('XWL_HAS_WL_POINTER_AXIS_V120', wayland_client_dep.found() and wayland_client_dep.version().version_compare('>= 1.21.0'))
configure_file(output : 'xwayland-config.h', configure_file(output : 'xwayland-config.h',
input : 'xwayland-config.h.meson.in', input : 'xwayland-config.h.meson.in',

3
include/xwayland-config.h.meson.in
View File

@ -15,6 +15,3 @@
/* Build Xwayland with XWAYLAND extension */ /* Build Xwayland with XWAYLAND extension */
#mesondefine XWL_HAS_XWAYLAND_EXTENSION #mesondefine XWL_HAS_XWAYLAND_EXTENSION
/* libwayland has support for wl_pointer.axis_v120 events */
#mesondefine XWL_HAS_WL_POINTER_AXIS_V120

5
meson.build
View File

@ -215,9 +215,8 @@ if (host_machine.system() != 'darwin' and
xwayland_path = join_paths(get_option('prefix'), get_option('bindir')) xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
endif endif
wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
xwayland_dep = [ xwayland_dep = [
wayland_client_dep, dependency('wayland-client', version: wayland_req, required: xwayland_required),
dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required), dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
] ]
@ -234,8 +233,6 @@ if (host_machine.system() != 'darwin' and
build_xwayland = false build_xwayland = false
endif endif
endforeach endforeach
else
wayland_client_dep = dependency('', required: false)
endif endif
build_xnest = false build_xnest = false