Merge branch 'rawhide' into f35

epel9
Marc Deop 3 years ago
commit 4fad50c111

1
.gitignore vendored

@ -95,3 +95,4 @@
/kwin-5.24.0.tar.xz
/kwin-5.24.1.tar.xz
/kwin-5.24.2.tar.xz
/kwin-5.24.3.tar.xz

@ -1,59 +0,0 @@
From bac4f4ed62017bb4aeb81078f5ec2cd915af5de4 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Wed, 23 Feb 2022 20:17:28 +0200
Subject: [PATCH] Revert "Remove mysterious s_cursorUpdateBlocking boolean flag
in pointer_input.cpp"
This reverts commit 3d0bdc56a48fe0d5cc0889ab098f6c6c922d20c7.
seat->setFocusedPointerSurface() before notifyPointerMotion() is needed
to prevent sending a motion event that's outside the previously focused
surface.
BUG: 449273
(cherry picked from commit aaa07f0605d605ae2472b1a8f7f4bd07f2138cb2)
---
src/pointer_input.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp
index 88091e88b..a608b50e6 100644
--- a/src/pointer_input.cpp
+++ b/src/pointer_input.cpp
@@ -548,6 +548,8 @@ void PointerInputRedirection::cleanupDecoration(Decoration::DecoratedClientImpl
m_decorationDestroyedConnection = connect(now, &QObject::destroyed, this, &PointerInputRedirection::update, Qt::QueuedConnection);
}
+static bool s_cursorUpdateBlocking = false;
+
void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow)
{
if (AbstractClient *ac = qobject_cast<AbstractClient*>(focusOld)) {
@@ -568,6 +570,11 @@ void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow
return;
}
+ // prevent updating cursor and sending motion event outside the previously focused surface
+ s_cursorUpdateBlocking = true;
+ seat->setFocusedPointerSurface(nullptr);
+ s_cursorUpdateBlocking = false;
+
seat->notifyPointerMotion(m_pos.toPoint());
seat->setFocusedPointerSurface(focusNow->surface(), focusNow->inputTransformation());
@@ -1014,6 +1021,10 @@ void CursorImage::handlePointerChanged()
void CursorImage::handleFocusedSurfaceChanged()
{
+ if (s_cursorUpdateBlocking) {
+ return;
+ }
+
KWaylandServer::PointerInterface *pointer = waylandServer()->seat()->pointer();
disconnect(m_serverCursor.connection);
--
2.35.1

@ -16,7 +16,7 @@
%endif
Name: kwin
Version: 5.24.2
Version: 5.24.3
Release: 2%{?dist}
Summary: KDE Window manager
@ -37,8 +37,6 @@ URL: https://userbase.kde.org/KWin
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
## upstream patches
# https://bugs.kde.org/show_bug.cgi?id=449273
Patch1: 0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch
## proposed patches
@ -370,6 +368,15 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
%changelog
* Thu Mar 10 2022 Marc Deop <marcdeop@fedoraproejct.org> - 5.24.3-2
- Rebuild (qt5)
* Tue Mar 08 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.3-1
- 5.24.3
* Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 5.24.2-3
- Rebuild (qt5)
* Wed Feb 23 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.24.2-2
- pull in upstream fix for https://bugs.kde.org/show_bug.cgi?id=449273

@ -1 +1,3 @@
SHA512 (kwin-5.24.1.tar.xz) = 191fe8d4363ea98adabd75c045b48e10490d8002abe2f0a0c199cb51447b371165a85ed2b98d04128a069661e8ebf4fce0323421c09bddf9372acf6f8d5d2461
SHA512 (kwin-5.24.2.tar.xz) = 6bb536e1d11f02c8d103e3f975d6100eb4a04cf579b209ecdcf9785c91f55e14b563076299c727419cc6553dc82ce02edc8688d09ad71dc87d43f73b9041a138
SHA512 (kwin-5.24.3.tar.xz) = b0a578036b84b457c968f583ba0bb44dacddd04cf0e7a86664a6348df3e44ee77d818347a2cb7d9daf2b8425d81695b996fcf272cee80b88947e230b66639b97

Loading…
Cancel
Save