From 68b8bc64ee4c7533da24e19182b095d240506cb7 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 22 Oct 2021 14:25:42 +0200 Subject: [PATCH] Disable Xwayland touch pointer emulation Depends on https://github.com/swaywm/wlroots/pull/3289 --- .gitmodules | 2 +- src/wlserver.cpp | 4 ++++ subprojects/wlroots | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dcdc8b8ea6..3bece0dce3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "subprojects/wlroots"] path = subprojects/wlroots - url = https://github.com/swaywm/wlroots.git + url = https://gitlab.freedesktop.org/wlroots/wlroots.git [submodule "subprojects/libliftoff"] path = subprojects/libliftoff url = https://github.com/emersion/libliftoff.git diff --git a/src/wlserver.cpp b/src/wlserver.cpp index ac8161243c..d405b475ee 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp @@ -110,6 +110,9 @@ const struct wlr_surface_role xwayland_surface_role = { static void xwayland_ready(struct wl_listener *listener, void *data) { bXwaylandReady = true; + + if (!wlserver.wlr.xwayland_server->options.no_touch_pointer_emulation) + wl_log.infof("Xwayland doesn't support -noTouchPointerEmulation, touch events might get duplicated"); } struct wl_listener xwayland_ready_listener = { .notify = xwayland_ready }; @@ -734,6 +737,7 @@ bool wlserver_init( void ) { struct wlr_xwayland_server_options xwayland_options = { .lazy = false, .enable_wm = false, + .no_touch_pointer_emulation = true, }; wlserver.wlr.xwayland_server = wlr_xwayland_server_create(wlserver.display, &xwayland_options); wl_signal_add(&wlserver.wlr.xwayland_server->events.ready, &xwayland_ready_listener); diff --git a/subprojects/wlroots b/subprojects/wlroots index 9579d62a16..3e801d68f2 160000 --- a/subprojects/wlroots +++ b/subprojects/wlroots @@ -1 +1 @@ -Subproject commit 9579d62a160821a107763325a515d3aee0a1e158 +Subproject commit 3e801d68f2c6c64567b1f24c6d03893f32c81197