diff --git a/configure.ac b/configure.ac index 4ee43d2d0..8ef201709 100644 --- a/configure.ac +++ b/configure.ac @@ -2355,7 +2355,7 @@ AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) dnl Xwayland DDX -XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 $LIBDRM epoxy" +XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.5 $LIBDRM epoxy" if test "x$XF86VIDMODE" = xyes; then XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO" fi diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am index 770e87f9b..7eda9be34 100644 --- a/hw/xwayland/Makefile.am +++ b/hw/xwayland/Makefile.am @@ -55,7 +55,9 @@ Xwayland_built_sources += \ relative-pointer-unstable-v1-client-protocol.h \ relative-pointer-unstable-v1-protocol.c \ pointer-constraints-unstable-v1-client-protocol.h \ - pointer-constraints-unstable-v1-protocol.c + pointer-constraints-unstable-v1-protocol.c \ + tablet-unstable-v2-client-protocol.h \ + tablet-unstable-v2-protocol.c nodist_Xwayland_SOURCES = $(Xwayland_built_sources) CLEANFILES = $(Xwayland_built_sources) @@ -78,6 +80,11 @@ pointer-constraints-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstab pointer-constraints-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ +tablet-unstable-v2-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ +tablet-unstable-v2-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ + %-protocol.c : %.xml $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build index fbbd213c3..d2791fe14 100644 --- a/hw/xwayland/meson.build +++ b/hw/xwayland/meson.build @@ -17,6 +17,7 @@ protodir = protocols_dep.get_pkgconfig_variable('pkgdatadir') pointer_xml = join_paths(protodir, 'unstable', 'pointer-constraints', 'pointer-constraints-unstable-v1.xml') relative_xml = join_paths(protodir, 'unstable', 'relative-pointer', 'relative-pointer-unstable-v1.xml') +tablet_xml = join_paths(protodir, 'unstable', 'tablet', 'tablet-unstable-v2.xml') client_header = generator(scanner, output : '@BASENAME@-client-protocol.h', @@ -28,8 +29,10 @@ code = generator(scanner, ) srcs += client_header.process(relative_xml) srcs += client_header.process(pointer_xml) +srcs += client_header.process(tablet_xml) srcs += code.process(relative_xml) srcs += code.process(pointer_xml) +srcs += code.process(tablet_xml) xwayland_glamor = [] if gbm_dep.found() diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index 1f5d32324..7298658f7 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -34,6 +34,7 @@ #include #include #include +#include "tablet-unstable-v2-client-protocol.h" struct sync_pending { struct xorg_list l; diff --git a/meson.build b/meson.build index 2b2b43092..c05249ae9 100644 --- a/meson.build +++ b/meson.build @@ -100,7 +100,7 @@ if (host_machine.system() != 'darwin' and xwayland_dep = [ dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required), - dependency('wayland-protocols', version: '>= 1.1.0', required: xwayland_required), + dependency('wayland-protocols', version: '>= 1.5.0', required: xwayland_required), dependency('libdrm', version: '>= 2.3.1', required: xwayland_required), dependency('epoxy', required: xwayland_required), ]