diff options
Diffstat (limited to 'source/x')
-rw-r--r-- | source/x/xorg-server-xwayland/987.patch | 50 | ||||
-rwxr-xr-x | source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild | 4 |
2 files changed, 1 insertions, 53 deletions
diff --git a/source/x/xorg-server-xwayland/987.patch b/source/x/xorg-server-xwayland/987.patch deleted file mode 100644 index 2133ee171..000000000 --- a/source/x/xorg-server-xwayland/987.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 914e2276df86b7e93ca37e4e87346d38cb80db05 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <ofourdan@redhat.com> -Date: Mon, 24 Oct 2022 09:24:01 +0200 -Subject: [PATCH] xwayland/input: Do not ignore leave events - -Commit 8a5f3ddb2 ("set tag on our surface") introduced the use of tags -to differentiate our own surfaces, and commit a1d14aa8c ("Clear the -"xwl-window" tag on unrealize") removed the tags before the surfaces are -actually destroyed. - -Xwayland would then rely on these tags on the surface to decide whether -to ignore or to process the Wayland event in various places. - -However, in doing so, it also checked for the tag on keyboard leave -events. - -As a result, if the keyboard leave events is received after the X11 -window is unrealized, keyboard_handle_leave() would not queue the -LeaveNotify events for the DIX to proceed, and the key repeat would -kick in and repeat the key event indefinitely. - -To avoid the issue, process events regardless of the tag as before -in keyboard_handle_leave(). - -Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> -Fixes: 8a5f3ddb2 - "xwayland: set tag on our surface" -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1395 -Tested-by: Renan Guilherme Lebre Ramos <japareaggae@gmail.com> -Tested-by: Stefan Dirsch <sndirsch@suse.de> ---- - hw/xwayland/xwayland-input.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c -index 240eb0139..9eda1ef71 100644 ---- a/hw/xwayland/xwayland-input.c -+++ b/hw/xwayland/xwayland-input.c -@@ -1147,9 +1147,6 @@ keyboard_handle_leave(void *data, struct wl_keyboard *keyboard, - struct xwl_seat *xwl_seat = data; - uint32_t *k; - -- if (surface != NULL && !is_surface_from_xwl_window(surface)) -- return; -- - xwl_seat->xwl_screen->serial = serial; - - wl_array_for_each(k, &xwl_seat->keys) --- -GitLab - diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild index 10fe3585e..06948306c 100755 --- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xorg-server-xwayland SRCNAM=xwayland VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Default font paths to be used by the X server: DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" @@ -80,8 +80,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/987.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" |